diff options
| -rw-r--r-- | app/views/general/search.rhtml | 12 | ||||
| -rw-r--r-- | locale/app.pot | 12 | ||||
| -rw-r--r-- | locale/en/app.po | 14 | ||||
| -rw-r--r-- | locale/es/app.po | 12 |
4 files changed, 25 insertions, 25 deletions
diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index 40f8942ae..2f0f5fe04 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -4,7 +4,7 @@ <% @title = _("Search Freedom of Information requests, public authorities and users") %> <h1><%=@title%></h1> <% elsif @total_hits == 0 %> - <%= _("Nothing found for ‘{{search_terms}}’", :search_terms => h(@query)) %> + <%= _("Nothing found for ‘{{search_terms}}’", :search_terms => h(@query)) %> <% else %> <% @title = _("Results page {{page_number}}", :page_number => @page.to_s) %> <% end%> @@ -68,7 +68,7 @@ <% if @xapian_bodies.results.size > 0 %> <% if @xapian_bodies.results.size == 1 && @page == 1 %> - <h1><%= _('One public authority matching ‘{{user_search_query}}’', :user_search_query => h(@query)) %></h1> + <h1><%= _('One public authority matching ‘{{user_search_query}}’', :user_search_query => h(@query)) %></h1> <% else %> <h1><%= _('Public authorities {{start_count}} to {{end_count}} of {{total_count}} for {{user_search_query}}', :start_count => ((@page-1)*@bodies_per_page+1).to_s, :end_count => [@page*@bodies_per_page, @xapian_bodies.matches_estimated].min.to_s, :total_count => @xapian_bodies.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> <% end %> @@ -82,9 +82,9 @@ <% if @xapian_users.results.size > 0 %> <% if @xapian_users.results.size == 1 && @page == 1 %> - <h1><%= _("One person matching ‘{{user_search_query}}’", :user_search_query => h(@query)) %></h1> + <h1><%= _("One person matching ‘{{user_search_query}}’", :user_search_query => h(@query)) %></h1> <% else %> - <h1><%= _("People {{start_count}} to {{end_count}} of {{total_count}} for ‘{{user_search_query}}’", :start_count => ((@page-1)*@users_per_page+1).to_s, :end_count => [@page*@users_per_page, @xapian_users.matches_estimated].min.to_s, :total_count => @xapian_users.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> + <h1><%= _("People {{start_count}} to {{end_count}} of {{total_count}} for ‘{{user_search_query}}’", :start_count => ((@page-1)*@users_per_page+1).to_s, :end_count => [@page*@users_per_page, @xapian_users.matches_estimated].min.to_s, :total_count => @xapian_users.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> <% end %> <% for result in @xapian_users.results %> @@ -96,9 +96,9 @@ <% if @xapian_requests.results.size > 0 %> <% if @xapian_requests.results.size == 1 && @page == 1 %> - <h1><%= _("One FOI request matching ‘{{user_search_query}}’", :user_search_query => h(@query)) %></h1> + <h1><%= _("One FOI request matching ‘{{user_search_query}}’", :user_search_query => h(@query)) %></h1> <% else %> - <h1><%= _("FOI requests {{start_count}} to {{end_count}} of {{total_count}} for ‘{{user_search_query}}’", :start_count => ((@page-1)*@requests_per_page+1).to_s, :end_count => [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s, :total_count => @xapian_requests.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> + <h1><%= _("FOI requests {{start_count}} to {{end_count}} of {{total_count}} for ‘{{user_search_query}}’", :start_count => ((@page-1)*@requests_per_page+1).to_s, :end_count => [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s, :total_count => @xapian_requests.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> <% end %> <% if @track_thing %> diff --git a/locale/app.pot b/locale/app.pot index 3e14bbf1d..5be2c364d 100644 --- a/locale/app.pot +++ b/locale/app.pot @@ -189,7 +189,7 @@ msgstr "" #: app/views/general/search.rhtml:101 msgid "" "FOI requests {{start_count}} to {{end_count}} of {{total_count}} for " -"‘{{user_search_query}}’" +"‘{{user_search_query}}’" msgstr "" #: app/models/profile_photo.rb:101 @@ -378,7 +378,7 @@ msgid "" msgstr "" #: app/views/general/search.rhtml:7 -msgid "Nothing found for ‘{{search_terms}}’" +msgid "Nothing found for ‘{{search_terms}}’" msgstr "" #: app/views/general/frontpage.rhtml:25 @@ -388,15 +388,15 @@ msgid "" msgstr "" #: app/views/general/search.rhtml:99 -msgid "One FOI request matching ‘{{user_search_query}}’" +msgid "One FOI request matching ‘{{user_search_query}}’" msgstr "" #: app/views/general/search.rhtml:85 -msgid "One person matching ‘{{user_search_query}}’" +msgid "One person matching ‘{{user_search_query}}’" msgstr "" #: app/views/general/search.rhtml:71 -msgid "One public authority matching ‘{{user_search_query}}’" +msgid "One public authority matching ‘{{user_search_query}}’" msgstr "" #: app/views/public_body/show.rhtml:90 @@ -426,7 +426,7 @@ msgstr "" #: app/views/general/search.rhtml:87 msgid "" "People {{start_count}} to {{end_count}} of {{total_count}} for " -"‘{{user_search_query}}’" +"‘{{user_search_query}}’" msgstr "" #: app/models/profile_photo.rb:91 diff --git a/locale/en/app.po b/locale/en/app.po index 91b90b4a7..191270700 100644 --- a/locale/en/app.po +++ b/locale/en/app.po @@ -189,7 +189,7 @@ msgstr "" #: app/views/general/search.rhtml:101 msgid "" "FOI requests {{start_count}} to {{end_count}} of {{total_count}} for " -"‘{{user_search_query}}’" +"‘{{user_search_query}}’" msgstr "" #: app/models/profile_photo.rb:101 @@ -378,7 +378,7 @@ msgid "" msgstr "" #: app/views/general/search.rhtml:7 -msgid "Nothing found for ‘{{search_terms}}’" +msgid "Nothing found for ‘{{search_terms}}’" msgstr "" #: app/views/general/frontpage.rhtml:25 @@ -388,15 +388,15 @@ msgid "" msgstr "" #: app/views/general/search.rhtml:99 -msgid "One FOI request matching ‘{{user_search_query}}’" +msgid "One FOI request matching ‘{{user_search_query}}’" msgstr "" #: app/views/general/search.rhtml:85 -msgid "One person matching ‘{{user_search_query}}’" +msgid "One person matching ‘{{user_search_query}}’" msgstr "" #: app/views/general/search.rhtml:71 -msgid "One public authority matching ‘{{user_search_query}}’" +msgid "One public authority matching ‘{{user_search_query}}’" msgstr "" #: app/views/public_body/show.rhtml:90 @@ -426,7 +426,7 @@ msgstr "" #: app/views/general/search.rhtml:87 msgid "" "People {{start_count}} to {{end_count}} of {{total_count}} for " -"‘{{user_search_query}}’" +"‘{{user_search_query}}’" msgstr "" #: app/models/profile_photo.rb:91 @@ -583,7 +583,7 @@ msgid "" "{{user_search_query}}" msgstr "" "Public authorities {{start_count}} to {{end_count}} of {{total_count}} for " -"‘{{user_search_query}}’" +"‘{{user_search_query}}’" #: locale/model_attributes.rb:12 msgid "PublicBody|First letter" diff --git a/locale/es/app.po b/locale/es/app.po index 3bba8873b..4a30d199b 100644 --- a/locale/es/app.po +++ b/locale/es/app.po @@ -198,7 +198,7 @@ msgstr "" #: app/views/general/search.rhtml:101 msgid "" "FOI requests {{start_count}} to {{end_count}} of {{total_count}} for " -"‘{{user_search_query}}’" +"‘{{user_search_query}}’" msgstr "" "Peuples {{start_count}} a {{end_count}} de {{total_count}} pour " "{{user_search_query}}" @@ -394,7 +394,7 @@ msgstr "" "con esto sita" #: app/views/general/search.rhtml:7 -msgid "Nothing found for ‘{{search_terms}}’" +msgid "Nothing found for ‘{{search_terms}}’" msgstr "Rien por {{search_terms}}" #: app/views/general/frontpage.rhtml:25 @@ -405,15 +405,15 @@ msgstr "" "Ou <strong>busqar</strong> per infos los autros requesta com {{site_name}}" #: app/views/general/search.rhtml:99 -msgid "One FOI request matching ‘{{user_search_query}}’" +msgid "One FOI request matching ‘{{user_search_query}}’" msgstr "" #: app/views/general/search.rhtml:85 -msgid "One person matching ‘{{user_search_query}}’" +msgid "One person matching ‘{{user_search_query}}’" msgstr "" #: app/views/general/search.rhtml:71 -msgid "One public authority matching ‘{{user_search_query}}’" +msgid "One public authority matching ‘{{user_search_query}}’" msgstr "" #: app/views/public_body/show.rhtml:90 @@ -443,7 +443,7 @@ msgstr "" #: app/views/general/search.rhtml:87 msgid "" "People {{start_count}} to {{end_count}} of {{total_count}} for " -"‘{{user_search_query}}’" +"‘{{user_search_query}}’" msgstr "" "Peuples {{start_count}} a {{end_count}} de {{total_count}} pour " "{{user_search_query}}" |