28 files changed, 85 insertions, 84 deletions
diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml
index 39f62fedc..6e0e0c010 100644
--- a/app/views/public_body/show.rhtml
+++ b/app/views/public_body/show.rhtml
@@ -32,14 +32,14 @@
             <% end %>
         <% end %>
         <%= link_to _('View FOI email address'), view_public_body_email_url(@public_body.url_name) %><br>
-    </div> 
+    </div>
 
     <div id="header_left">
         <p class="public-body-name-prefix"><%= _("Freedom of information requests to") %></p>
         <h1><%=h(@public_body.name)%></h1>
 
         <p class="subtitle">
-        <%=@public_body.type_of_authority(true)%><% if not @public_body.short_name.empty? %>, 
+        <%=@public_body.type_of_authority(true)%><% if not @public_body.short_name.empty? %>,
         <%= _('also called {{public_body_short_name}}', :public_body_short_name =>  h(@public_body.short_name))%><% end %>
         <% if !@user.nil? && @user.admin_page_links? %>
         (<%= link_to _("admin"), public_body_admin_url(@public_body) %>)
@@ -96,7 +96,7 @@
                     <%= pluralize(@public_body.info_requests.size, "Environmental Information Regulations request made using this site") %>
                 <% else %>
                <% if  @public_body.info_requests.size > 4 %>
-                <%= n_('Search within the %d Freedom of Information requests to %s', 'Search within the %d Freedom of Information requests made to %s', @public_body.info_requests.size) % [@public_body.info_requests.size, @public_body.name] %>
+                <%= n_('Search within the {{count}} Freedom of Information requests to {{public_body_name}}', 'Search within the {{count}} Freedom of Information requests made to {{public_body_name}}', @public_body.info_requests.size, :count => @public_body.info_requests.size, :public_body_name => @public_body.name) %>
                    <% else %>
                   <%= n_('{{count}} Freedom of Information request to {{public_body_name}}',
                         '{{count}} Freedom of Information requests to {{public_body_name}}',
@@ -108,7 +108,7 @@
                 <%= @page_desc %>
             </h2>
             <a name="results"></a>
-    
+
             <% if  @public_body.info_requests.size > 4 %>
                 <%= render :partial => 'request/request_filter_form' %>
             <% end %>
@@ -129,7 +129,7 @@
                   <p> <%= _('Only requests made using {{site_name}} are shown.', :site_name => site_name) %></p>
             <% end %>
 
-        <% else %> 
+        <% else %>
             <% if @public_body.eir_only? %>
                 <h2><%= _('Environmental Information Regulations requests made') %></h2>
             <% else %>
diff --git a/locale/aln/app.po b/locale/aln/app.po
index ab356c4f0..70bc88aa1 100644
--- a/locale/aln/app.po
+++ b/locale/aln/app.po
@@ -1834,8 +1834,8 @@ msgstr ""
 msgid "Search the site to find what you were looking for."
 msgstr ""
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/app.pot b/locale/app.pot
index ab407ebd4..0cd2bdba7 100644
--- a/locale/app.pot
+++ b/locale/app.pot
@@ -1832,8 +1832,8 @@ msgstr ""
 msgid "Search the site to find what you were looking for."
 msgstr ""
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/ar/app.po b/locale/ar/app.po
index d4a2ea753..d2e88dd5e 100644
--- a/locale/ar/app.po
+++ b/locale/ar/app.po
@@ -1854,8 +1854,8 @@ msgstr ""
 msgid "Search the site to find what you were looking for."
 msgstr ""
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/bs/app.po b/locale/bs/app.po
index 39c222c0e..392684fbc 100644
--- a/locale/bs/app.po
+++ b/locale/bs/app.po
@@ -1947,8 +1947,8 @@ msgstr "Rezultati pretrage"
 msgid "Search the site to find what you were looking for."
 msgstr "Pretražite web stranicu da pronađete što ste tražili."
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/ca/app.po b/locale/ca/app.po
index 0daf1c6c5..b36844cd3 100644
--- a/locale/ca/app.po
+++ b/locale/ca/app.po
@@ -1966,10 +1966,10 @@ msgstr "Resultados de la búsqueda"
 msgid "Search the site to find what you were looking for."
 msgstr "Buscar en esta web para encontrar lo que busca."
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
-msgstr[0] "Busque en la %d solicitud de información hecha a %s"
-msgstr[1] "Busque entre las %d solicitudes de información hechas a %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[0] "Busque en la {{count}} solicitud de información hecha a {{public_body_name}}"
+msgstr[1] "Busque entre las {{count}} solicitudes de información hechas a {{public_body_name}}"
 
 msgid "Search your contributions"
 msgstr "Busca tus aportaciones"
diff --git a/locale/cs/app.po b/locale/cs/app.po
index fddc4e4fc..f5708242b 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -1946,11 +1946,11 @@ msgstr "Výsledky vyhledávání"
 msgid "Search the site to find what you were looking for."
 msgstr "Najděte, co hledáte"
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
-msgstr[0] "Prohlížet %d dotaz vznesený na %s"
-msgstr[1] "Prohlížet %d dotazy vznesené na %s"
-msgstr[2] "Prohlížet %d dotazů vznesené na %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[0] "Prohlížet {{count}} dotaz vznesený na {{public_body_name}}"
+msgstr[1] "Prohlížet {{count}} dotazy vznesené na {{public_body_name}}"
+msgstr[2] "Prohlížet {{count}} dotazů vznesené na {{public_body_name}}"
 
 msgid "Search your contributions"
 msgstr "Prohledávat vlastní příspěvky"
diff --git a/locale/cy/app.po b/locale/cy/app.po
index 669e07494..4530b1709 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -1845,8 +1845,8 @@ msgstr ""
 msgid "Search the site to find what you were looking for."
 msgstr ""
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/de/app.po b/locale/de/app.po
index 84fe3c650..d84be7f95 100644
--- a/locale/de/app.po
+++ b/locale/de/app.po
@@ -1893,10 +1893,10 @@ msgstr ""
 msgid "Search the site to find what you were looking for."
 msgstr "Duchsuchen Sie die Seite, um die von Ihnen gewünschten Informationen zu finden. "
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
-msgstr[0] "Suchen Sie in den %d an %s gestellten IFG-Anfragen"
-msgstr[1] "Suchen Sie in den %d an %s gestellten IFG-Anfragen"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[0] "Suchen Sie in den {{count}} an {{public_body_name}} gestellten IFG-Anfragen"
+msgstr[1] "Suchen Sie in den {{count}} an {{public_body_name}} gestellten IFG-Anfragen"
 
 msgid "Search your contributions"
 msgstr "Suchen Sie Ihre Beiträge"
diff --git a/locale/en/app.po b/locale/en/app.po
index bdfdcefd5..102e95bc7 100644
--- a/locale/en/app.po
+++ b/locale/en/app.po
@@ -1833,8 +1833,8 @@ msgstr ""
 msgid "Search the site to find what you were looking for."
 msgstr ""
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po
index beaf94fd6..9adf6d65e 100644
--- a/locale/en_IE/app.po
+++ b/locale/en_IE/app.po
@@ -1835,8 +1835,8 @@ msgstr ""
 msgid "Search the site to find what you were looking for."
 msgstr ""
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/es/app.po b/locale/es/app.po
index 378871742..f5688a473 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -1996,10 +1996,10 @@ msgstr "Resultados de la búsqueda"
 msgid "Search the site to find what you were looking for."
 msgstr "Buscar en esta web para encontrar lo que busca."
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
-msgstr[0] "Busca en la %d solicitud de información hecha a %s"
-msgstr[1] "Busca en las %d solicitudes de información hechas a %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[0] "Busca en la {{count}} solicitud de información hecha a {{public_body_name}}"
+msgstr[1] "Busca en las {{count}} solicitudes de información hechas a {{public_body_name}}"
 
 msgid "Search your contributions"
 msgstr "Busca tus aportaciones"
diff --git a/locale/eu/app.po b/locale/eu/app.po
index 6da6d150d..e0fdb53f5 100644
--- a/locale/eu/app.po
+++ b/locale/eu/app.po
@@ -1884,10 +1884,10 @@ msgstr "Bilaketaren emaitzak"
 msgid "Search the site to find what you were looking for."
 msgstr "Bilatu web honetan bilatzen ari zarena aurkitzeko."
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
-msgstr[0] "Bilatu ______-ri egindako %d informazio eskabidean %s"
-msgstr[1] "Bilatu ______-ri egindako %d informazio eskabideetan %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[0] "Bilatu ______-ri egindako {{count}} informazio eskabidean {{public_body_name}}"
+msgstr[1] "Bilatu ______-ri egindako {{count}} informazio eskabideetan {{public_body_name}}"
 
 msgid "Search your contributions"
 msgstr "Bilatu zure ekarpenak"
diff --git a/locale/fr/app.po b/locale/fr/app.po
index e90d161a3..8906fe529 100644
--- a/locale/fr/app.po
+++ b/locale/fr/app.po
@@ -1843,8 +1843,8 @@ msgstr ""
 msgid "Search the site to find what you were looking for."
 msgstr ""
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/gl/app.po b/locale/gl/app.po
index 067ceff3c..4e8d5a87b 100644
--- a/locale/gl/app.po
+++ b/locale/gl/app.po
@@ -1967,10 +1967,10 @@ msgstr "Resultados de la búsqueda"
 msgid "Search the site to find what you were looking for."
 msgstr "Buscar en esta web para encontrar lo que busca."
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
-msgstr[0] "Busque en la %d solicitud de información hecha a %s"
-msgstr[1] "Busque entre las %d solicitudes de información hechas a %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[0] "Busque en la {{count}} solicitud de información hecha a {{public_body_name}}"
+msgstr[1] "Busque entre las {{count}} solicitudes de información hechas a {{public_body_name}}"
 
 msgid "Search your contributions"
 msgstr "Busca tus aportaciones"
diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po
index 59220933a..087c35f91 100644
--- a/locale/hu_HU/app.po
+++ b/locale/hu_HU/app.po
@@ -1965,10 +1965,10 @@ msgstr "A keresés eredménye"
 msgid "Search the site to find what you were looking for."
 msgstr "Keresse a weboldalon a kívánt információkat. "
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
-msgstr[0] "Eddig még senki sem nyújtott be %s számára adatigénylést"
-msgstr[1] "Keresés a %d %s-t érintő adatigénylésben"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[0] "Eddig még senki sem nyújtott be {{public_body_name}} számára adatigénylést"
+msgstr[1] "Keresés a {{count}} {{public_body_name}}-t érintő adatigénylésben"
 
 msgid "Search your contributions"
 msgstr "Keresés az adatigényléseimben"
diff --git a/locale/id/app.po b/locale/id/app.po
index 22588c210..55b7b8e43 100644
--- a/locale/id/app.po
+++ b/locale/id/app.po
@@ -1985,9 +1985,9 @@ msgstr "Hasil pencarian"
 msgid "Search the site to find what you were looking for."
 msgstr "Cari situs ini untuk menemukan apa yang Anda cari."
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
-msgstr[0] "Cari di dalam  %d permintaan Freedom of Information yang dibuat kepada %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[0] "Cari di dalam  {{count}} permintaan Freedom of Information yang dibuat kepada {{public_body_name}}"
 
 msgid "Search your contributions"
 msgstr "Cari kontribusi Anda"
diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po
index 5bc5f9192..57ef72c97 100644
--- a/locale/nb_NO/app.po
+++ b/locale/nb_NO/app.po
@@ -1833,8 +1833,8 @@ msgstr ""
 msgid "Search the site to find what you were looking for."
 msgstr ""
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po
index 598f77971..c5607e90a 100644
--- a/locale/pt_BR/app.po
+++ b/locale/pt_BR/app.po
@@ -1881,10 +1881,10 @@ msgstr "Resultados da busca"
 msgid "Search the site to find what you were looking for."
 msgstr "Pesquise no site para encontrar o que você está procurando."
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
-msgstr[0] "Pesquisar %d Pedidos de Acesso à Informação para %s"
-msgstr[1] "Pesquisar %d Pedidos de Acesso à Informação feitos a %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[0] "Pesquisar {{count}} Pedidos de Acesso à Informação para {{public_body_name}}"
+msgstr[1] "Pesquisar {{count}} Pedidos de Acesso à Informação feitos a {{public_body_name}}"
 
 msgid "Search your contributions"
 msgstr "Buscar suas contribuições"
diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po
index ba8f0540e..8c17570f0 100644
--- a/locale/ro_RO/app.po
+++ b/locale/ro_RO/app.po
@@ -1840,8 +1840,8 @@ msgstr ""
 msgid "Search the site to find what you were looking for."
 msgstr ""
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/sl/app.po b/locale/sl/app.po
index 837cbc97b..cb850b8e1 100644
--- a/locale/sl/app.po
+++ b/locale/sl/app.po
@@ -1843,8 +1843,8 @@ msgstr ""
 msgid "Search the site to find what you were looking for."
 msgstr ""
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/sq/app.po b/locale/sq/app.po
index 84de5ada4..51d60ac70 100644
--- a/locale/sq/app.po
+++ b/locale/sq/app.po
@@ -1940,10 +1940,10 @@ msgstr "Rezultatet e kërkimit"
 msgid "Search the site to find what you were looking for."
 msgstr "Kërko në këtë ueb sajt për të gjetur atë që ti po kërkon."
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
-msgstr[0] "Kërko brenda %d kërkesave për informata zyrtare në %s"
-msgstr[1] "Kërko brenda %d kërkesave për informata zyrtare të bëra në %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[0] "Kërko brenda {{count}} kërkesave për informata zyrtare në {{public_body_name}}"
+msgstr[1] "Kërko brenda {{count}} kërkesave për informata zyrtare të bëra në {{public_body_name}}"
 
 msgid "Search your contributions"
 msgstr "Kërko në kontributet tua"
diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po
index e71b76a96..392237e59 100644
--- a/locale/sr@latin/app.po
+++ b/locale/sr@latin/app.po
@@ -1946,8 +1946,8 @@ msgstr "Rezultati pretrage"
 msgid "Search the site to find what you were looking for."
 msgstr "Pretražite web stranicu da pronađete što ste tražili."
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/tr/app.po b/locale/tr/app.po
index 6d32db6bd..ca0097cef 100644
--- a/locale/tr/app.po
+++ b/locale/tr/app.po
@@ -1829,8 +1829,8 @@ msgstr ""
 msgid "Search the site to find what you were looking for."
 msgstr ""
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 
 msgid "Search your contributions"
diff --git a/locale/uk/app.po b/locale/uk/app.po
index a745fbf76..1de0039f2 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -1949,11 +1949,11 @@ msgstr "Результати пошуку"
 msgid "Search the site to find what you were looking for."
 msgstr "Шукайте на сайті те, що вам потрібною."
 
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
-msgstr[0] "Шукати серед %d запитів зроблених до %s"
-msgstr[1] "Шукати серед %d запитів зроблених до %s"
-msgstr[2] "Шукати серед %d запитів зроблених до %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[0] "Шукати серед {{count}} запитів зроблених до {{public_body_name}}"
+msgstr[1] "Шукати серед {{count}} запитів зроблених до {{public_body_name}}"
+msgstr[2] "Шукати серед {{count}} запитів зроблених до {{public_body_name}}"
 
 msgid "Search your contributions"
 msgstr "Пошук у вашій діяльності на сайті"
diff --git a/spec/fixtures/locale/en/app.po b/spec/fixtures/locale/en/app.po
index 915d80df8..f8ac163f1 100644
--- a/spec/fixtures/locale/en/app.po
+++ b/spec/fixtures/locale/en/app.po
@@ -2331,8 +2331,9 @@ msgid "Search the site to find what you were looking for."
 msgstr ""
 
 #: app/views/public_body/show.rhtml:85
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/spec/fixtures/locale/en_GB/app.po b/spec/fixtures/locale/en_GB/app.po
index 915d80df8..6d665e27a 100644
--- a/spec/fixtures/locale/en_GB/app.po
+++ b/spec/fixtures/locale/en_GB/app.po
@@ -2331,8 +2331,8 @@ msgid "Search the site to find what you were looking for."
 msgstr ""
 
 #: app/views/public_body/show.rhtml:85
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/spec/fixtures/locale/es/app.po b/spec/fixtures/locale/es/app.po
index bb49e0ff6..80439a59b 100644
--- a/spec/fixtures/locale/es/app.po
+++ b/spec/fixtures/locale/es/app.po
@@ -2511,10 +2511,10 @@ msgid "Search the site to find what you were looking for."
 msgstr "Buscar en esta web para encontrar lo que busca."
 
 #: app/views/public_body/show.rhtml:85
-msgid "Search within the %d Freedom of Information requests to %s"
-msgid_plural "Search within the %d Freedom of Information requests made to %s"
-msgstr[0] "Busca en la %d solicitud de información hecha a %s"
-msgstr[1] "Busca en las %d solicitudes de información hechas a %s"
+msgid "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgid_plural "Search within the {{count}} Freedom of Information requests to {{public_body_name}}"
+msgstr[0] "Busca en la {{count}} solicitud de información hecha a {{public_body_name}}"
+msgstr[1] "Busca en las {{count}} solicitudes de información hechas a {{public_body_name}}"
 
 #: app/views/user/show.rhtml:132
 msgid "Search your contributions"