Download as
Browse Code »

Commit 8cecb78f2bf9db1d00350dc2048f944493a077ca

Authored by Marcos Pereira
2 parents 688cc083 9576d055
Exists in ratings_minor_fixes and in 3 other branches fix_sign_up_form, organization_ratings_improvements, profile_api_improvements

Merge branch 'search_hint_translation' into 'master' 

Translates model name in search hint

The text field hint in search page was  not fully translated

See merge request !945
Showing 5 changed files with 7 additions and 3 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @8cecb78
... ... @@ -29,6 +29,8 @@ class Article < ApplicationRecord
29 29 :display => %w[full]
30 30 }
31 31  
  32 + N_('article')
  33 +
32 34 def initialize(*params)
33 35 super
34 36 if params.present? && params.first.present?
... ...
app/models/community.rb
  Diff comments   View file @8cecb78
... ... @@ -9,7 +9,7 @@ class Community < Organization
9 9 _('Community')
10 10 end
11 11  
12   - N_('Community')
  12 + N_('community')
13 13 N_('Language')
14 14  
15 15 settings_items :language
... ...
app/models/enterprise.rb
  Diff comments   View file @8cecb78
... ... @@ -12,7 +12,7 @@ class Enterprise < Organization
12 12 _('Enterprise')
13 13 end
14 14  
15   - N_('Enterprise')
  15 + N_('enterprise')
16 16  
17 17 acts_as_trackable after_add: proc{ |p, t| notify_activity t }
18 18  
... ...
app/models/person.rb
  Diff comments   View file @8cecb78
... ... @@ -13,6 +13,8 @@ class Person < Profile
13 13 _('Person')
14 14 end
15 15  
  16 + N_('person')
  17 +
16 18 acts_as_trackable :after_add => Proc.new {|p,t| notify_activity(t)}
17 19 acts_as_accessor
18 20  
... ...
app/views/search/search_page.html.erb
  Diff comments   View file @8cecb78
1   -<%= render :partial => 'search_form', :locals => { :hint => _("Type words about the %s you're looking for") % @asset.to_s.singularize } %>
  1 +<%= render :partial => 'search_form', :locals => { :hint => _("Type words about the %s you're looking for") % _(@asset.to_s.singularize) } %>
2 2 <%= render :partial => 'search_content' %>
3 3  
4 4 <div style="clear: both"></div>
... ...