Download as
Browse Code »

Commit af8ef285f6185439e5ecd206f474ad5cc4740e06

Authored by Daniela Feitosa
1 parent 7dbd367d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Removed capital from second word on filters

Showing 2 changed files with 14 additions and 14 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @af8ef28
@@ -1089,24 +1089,24 @@ module ApplicationHelper @@ -1089,24 +1089,24 @@ module ApplicationHelper
1089 1089
1090 def search_contents_menu 1090 def search_contents_menu
1091 links = [ 1091 links = [
1092 - {s_('contents|More Recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}},  
1093 - {s_('contents|More Viewed') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}},  
1094 - {s_('contents|Most Commented') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_comments'})}} 1092 + {s_('contents|More recent') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_recent'})}},
  1093 + {s_('contents|More viewed') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_popular'})}},
  1094 + {s_('contents|Most commented') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_comments'})}}
1095 ] 1095 ]
1096 if logged_in? 1096 if logged_in?
1097 - links.push(_('New Content') => lightbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})})) 1097 + links.push(_('New content') => lightbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
1098 end 1098 end
1099 1099
1100 link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-articles'), {:controller => "search", :action => 'contents', :category_path => ''}, :id => 'submenu-contents') + 1100 link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-articles'), {:controller => "search", :action => 'contents', :category_path => ''}, :id => 'submenu-contents') +
1101 - link_to(content_tag(:span, _('Contents Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger') 1101 + link_to(content_tag(:span, _('Contents menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-contents-trigger')
1102 end 1102 end
1103 alias :browse_contents_menu :search_contents_menu 1103 alias :browse_contents_menu :search_contents_menu
1104 1104
1105 def search_people_menu 1105 def search_people_menu
1106 links = [ 1106 links = [
1107 - {s_('people|More Recent') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_recent'})}},  
1108 - {s_('people|More Active') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_active'})}},  
1109 - {s_('people|More Popular') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_popular'})}} 1107 + {s_('people|More recent') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_recent'})}},
  1108 + {s_('people|More active') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_active'})}},
  1109 + {s_('people|More popular') => {:href => url_for({:controller => 'search', :action => 'people', :filter => 'more_popular'})}}
1110 ] 1110 ]
1111 if logged_in? 1111 if logged_in?
1112 links.push(_('My friends') => {:href => url_for({:profile => current_user.login, :controller => 'friends'})}) 1112 links.push(_('My friends') => {:href => url_for({:profile => current_user.login, :controller => 'friends'})})
@@ -1114,15 +1114,15 @@ module ApplicationHelper @@ -1114,15 +1114,15 @@ module ApplicationHelper
1114 end 1114 end
1115 1115
1116 link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "search", :action => 'people', :category_path => ''}, :id => 'submenu-people') + 1116 link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "search", :action => 'people', :category_path => ''}, :id => 'submenu-people') +
1117 - link_to(content_tag(:span, _('People Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger') 1117 + link_to(content_tag(:span, _('People menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-people-trigger')
1118 end 1118 end
1119 alias :browse_people_menu :search_people_menu 1119 alias :browse_people_menu :search_people_menu
1120 1120
1121 def search_communities_menu 1121 def search_communities_menu
1122 links = [ 1122 links = [
1123 - {s_('communities|More Recent') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_recent'})}},  
1124 - {s_('communities|More Active') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_active'})}},  
1125 - {s_('communities|More Popular') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_popular'})}} 1123 + {s_('communities|More recent') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_recent'})}},
  1124 + {s_('communities|More active') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_active'})}},
  1125 + {s_('communities|More popular') => {:href => url_for({:controller => 'search', :action => 'communities', :filter => 'more_popular'})}}
1126 ] 1126 ]
1127 if logged_in? 1127 if logged_in?
1128 links.push(_('My communities') => {:href => url_for({:profile => current_user.login, :controller => 'memberships'})}) 1128 links.push(_('My communities') => {:href => url_for({:profile => current_user.login, :controller => 'memberships'})})
@@ -1130,7 +1130,7 @@ module ApplicationHelper @@ -1130,7 +1130,7 @@ module ApplicationHelper
1130 end 1130 end
1131 1131
1132 link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "search", :action => 'communities'}, :id => 'submenu-communities') + 1132 link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "search", :action => 'communities'}, :id => 'submenu-communities') +
1133 - link_to(content_tag(:span, _('Communities Menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger') 1133 + link_to(content_tag(:span, _('Communities menu')), '#', :onclick => "toggleSubmenu(this,'',#{links.to_json}); return false", :class => 'menu-submenu-trigger up', :id => 'submenu-communities-trigger')
1134 end 1134 end
1135 alias :browse_communities_menu :search_communities_menu 1135 alias :browse_communities_menu :search_communities_menu
1136 1136
app/helpers/search_helper.rb
  Diff comments   View file @af8ef28
@@ -18,7 +18,7 @@ module SearchHelper @@ -18,7 +18,7 @@ module SearchHelper
18 18
19 SortOptions = { 19 SortOptions = {
20 :products => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')}, 20 :products => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
21 - :more_recent, {:label => _('More Recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}}, 21 + :more_recent, {:label => _('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
22 :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}}, 22 :name, {:label => _('Name'), :solr_opts => {:sort => 'name_sortable asc'}},
23 :closest, {:label => _('Closest to me'), :if => proc{ logged_in? && (profile=current_user.person).lat && profile.lng }, 23 :closest, {:label => _('Closest to me'), :if => proc{ logged_in? && (profile=current_user.person).lat && profile.lng },
24 :solr_opts => {:sort => "geodist() asc", 24 :solr_opts => {:sort => "geodist() asc",