25 files changed, 67 insertions, 62 deletions
diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml
index 563beb383..39f62fedc 100644
--- a/app/views/public_body/show.rhtml
+++ b/app/views/public_body/show.rhtml
@@ -4,7 +4,12 @@
       <h2><%= _('Follow this authority')%></h2>
 
       <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %>
-      <p><%= raw(n_("<span id='follow_count'>%d</span> person is following this authority", "<span id='follow_count'>%d</span> people are following this authority", follower_count) % follower_count) %></p>
+      <p>
+        <%= n_("{{count}} person is following this authority",
+                "{{count}} people are following this authority",
+                follower_count,
+                :count => content_tag(:span, follower_count, :id => "follow_count")) %>
+      </p>
 
         <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %>
         <h2><%= _('More about this authority')%></h2>
diff --git a/locale/aln/app.po b/locale/aln/app.po
index 8d9839740..463d5c232 100644
--- a/locale/aln/app.po
+++ b/locale/aln/app.po
@@ -213,8 +213,8 @@ msgstr ""
 msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
 msgstr ""
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/app.pot b/locale/app.pot
index 972bc55dd..e2554cfc6 100644
--- a/locale/app.pot
+++ b/locale/app.pot
@@ -211,8 +211,8 @@ msgstr ""
 msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
 msgstr ""
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/ar/app.po b/locale/ar/app.po
index d7354d63c..ce78a39e8 100644
--- a/locale/ar/app.po
+++ b/locale/ar/app.po
@@ -225,8 +225,8 @@ msgstr "<p>{{site_name}}حاليا في الصيانة. يمكنك فقط عرض
 msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
 msgstr ""
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/bs/app.po b/locale/bs/app.po
index c1c211ebb..e8801fe99 100644
--- a/locale/bs/app.po
+++ b/locale/bs/app.po
@@ -240,8 +240,8 @@ msgstr ""
 "<small>Ako koristite neke od web mail servisa ili imate filtere za \"junk mail\", provjerite u Vašim bulk/spam folderima. Ponekad su naše poruke označene tako</small>\n"
 "</p>"
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/ca/app.po b/locale/ca/app.po
index 3af09d4fa..26c442104 100644
--- a/locale/ca/app.po
+++ b/locale/ca/app.po
@@ -240,8 +240,8 @@ msgstr ""
 "<small>Si utilitzes correu web o tens filtres \"anti spam\", si us plau comprova les teves carpetes d'spam. A vegades, els nostres missatges es marquen així per error.</small>\n"
 "</p>"
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/cs/app.po b/locale/cs/app.po
index 6c53fc0a4..10d68e9e5 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -244,11 +244,11 @@ msgstr ""
 "<small>Pokud používáte prohlížeč ke čtení a posílání e-mailů nebo máte nastavený filtr pro nevyžádanou poštu, zkontrolujte také tuto složku. Může se stát, že váš filtr označil zprávu ze stránek Informace pro všechny za nevyžádanou.</small>\n"
 "</p>"
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
-msgstr[0] "<span id='follow_count'>%d</span> člověk sleduje tuto instituci"
-msgstr[1] "<span id='follow_count'>%d</span> lidí sledují tuto instituci"
-msgstr[2] "<span id='follow_count'>%d</span> lidí sleduje tuto instituci"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
+msgstr[0] "{{count}} člověk sleduje tuto instituci"
+msgstr[1] "{{count}} lidí sledují tuto instituci"
+msgstr[2] "{{count}} lidí sleduje tuto instituci"
 
 msgid "<strong> Can I request information about myself?</strong>\\n\t\t\t<a href=\"%s\">No! (Click here for details)</a>"
 msgstr ""
diff --git a/locale/cy/app.po b/locale/cy/app.po
index 6508210bc..caedbc107 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -220,8 +220,8 @@ msgstr ""
 msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
 msgstr ""
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/de/app.po b/locale/de/app.po
index 9834db8d9..265189da0 100644
--- a/locale/de/app.po
+++ b/locale/de/app.po
@@ -231,8 +231,8 @@ msgstr "<p>{{site_name}} wird gerade überarbeitet. Sie können ausschließlich
 msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
 msgstr "Sollten Sie eine webbasierten Emailanbieter oder ´Junk-mail´ Filter nutzen, prüfen Sie Ihren Spamordner. Es kommt vor, dass unsere Nachrichten dort landen. "
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/en/app.po b/locale/en/app.po
index d6e4ddc9d..f1f2a4d48 100644
--- a/locale/en/app.po
+++ b/locale/en/app.po
@@ -212,8 +212,8 @@ msgstr ""
 msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
 msgstr ""
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po
index 8a193b47f..d3b2f116a 100644
--- a/locale/en_IE/app.po
+++ b/locale/en_IE/app.po
@@ -214,8 +214,8 @@ msgstr ""
 msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
 msgstr ""
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/es/app.po b/locale/es/app.po
index 13fdcff5c..f2a26660c 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -260,10 +260,10 @@ msgstr ""
 "tus carpetas de spam. A veces, nuestros mensajes se marcan así por error.</small>\n"
 "</p>"
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
-msgstr[0] "<span id='follow_count'>%d</span> persona esta siguiendo este organismo"
-msgstr[1] "<span id='follow_count'>%d</span> personas estan siguiendo este organismo"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
+msgstr[0] "{{count}} persona esta siguiendo este organismo"
+msgstr[1] "{{count}} personas estan siguiendo este organismo"
 
 msgid "<strong> Can I request information about myself?</strong>\\n\t\t\t<a href=\"%s\">No! (Click here for details)</a>"
 msgstr ""
diff --git a/locale/eu/app.po b/locale/eu/app.po
index 183bd5708..337d3bf65 100644
--- a/locale/eu/app.po
+++ b/locale/eu/app.po
@@ -235,8 +235,8 @@ msgstr ""
 "<small>Web posta erabiltzen baduzu eta \"anti spam\" iragazkiak baldin badizutu, mesedez begira ezazu zure spam zorroan. Batzuetan, gure mezuak honela markatzen dira, akatsez.</small>\n"
 "</p>"
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/fr/app.po b/locale/fr/app.po
index 2e1e6e4b6..fd5ff3cb2 100644
--- a/locale/fr/app.po
+++ b/locale/fr/app.po
@@ -222,8 +222,8 @@ msgstr ""
 msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
 msgstr ""
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/gl/app.po b/locale/gl/app.po
index ab2ff2a2d..76cde4f4e 100644
--- a/locale/gl/app.po
+++ b/locale/gl/app.po
@@ -241,8 +241,8 @@ msgstr ""
 "tus carpetas de spam. A veces, nuestros mensajes se marcan así por error.</small>\n"
 "</p>"
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/hu_HU/app.po b/locale/hu_HU/app.po
index 8ed7b8be2..139bc95f0 100644
--- a/locale/hu_HU/app.po
+++ b/locale/hu_HU/app.po
@@ -237,8 +237,8 @@ msgstr ""
 "levélszemetet tartalmazó mappákat is. Előfordulhat, hogy üzeneteink ide kerülnek.</small>\n"
 "</p> "
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/id/app.po b/locale/id/app.po
index 53b3e3757..0056330ed 100644
--- a/locale/id/app.po
+++ b/locale/id/app.po
@@ -255,9 +255,9 @@ msgstr ""
 "bulk/spam Anda. Terkadang, pesan-pesan kami ditandai seperti demikian.</small>\n"
 "</p>"
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
-msgstr[0] "<span id='follow_count'>%d</span> orang mengikuti otoritas ini"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
+msgstr[0] "{{count}} orang mengikuti otoritas ini"
 
 msgid "<strong> Can I request information about myself?</strong>\\n\t\t\t<a href=\"%s\">No! (Click here for details)</a>"
 msgstr ""
diff --git a/locale/nb_NO/app.po b/locale/nb_NO/app.po
index 1c710068f..1d652648a 100644
--- a/locale/nb_NO/app.po
+++ b/locale/nb_NO/app.po
@@ -212,8 +212,8 @@ msgstr ""
 msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
 msgstr ""
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po
index 15f977460..713417173 100644
--- a/locale/pt_BR/app.po
+++ b/locale/pt_BR/app.po
@@ -244,10 +244,10 @@ msgstr "<p>{{site_name}} está em manutenção. Você pode apenas visualizar ped
 msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
 msgstr "<small>Se você acessa seu e-mail por algum site da web, ou se tiver filtros para conteúdo indesejado, verifique também suas caixas de spam. Às vezes, nossas mensagens podem ser marcadas dessa forma pelo seu provedor.</small> </p>"
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
-msgstr[0] "<span id='follow_count'>%d</span> pessoa está acompanhando esta autoridade"
-msgstr[1] "<span id='follow_count'>%d</span> pessoas estão acompanhando esta autoridade"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
+msgstr[0] "{{count}} pessoa está acompanhando esta autoridade"
+msgstr[1] "{{count}} pessoas estão acompanhando esta autoridade"
 
 msgid "<strong> Can I request information about myself?</strong>\\n\t\t\t<a href=\"%s\">No! (Click here for details)</a>"
 msgstr "<strong>Posso pedir informações sobre mim?</strong> <span class=\"whitespace other\" title=\"Aba\">»» »</span> <a href=\"%s\">Não! (Clique aqui para mais detalhes)</a>"
diff --git a/locale/ro_RO/app.po b/locale/ro_RO/app.po
index da1ffb35a..da0e747bf 100644
--- a/locale/ro_RO/app.po
+++ b/locale/ro_RO/app.po
@@ -217,8 +217,8 @@ msgstr "<p>{{site_name}} este in reparatie momentan. Puteti vedea odar cererile
 msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
 msgstr ""
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/sl/app.po b/locale/sl/app.po
index 7879be536..af7d7ad76 100644
--- a/locale/sl/app.po
+++ b/locale/sl/app.po
@@ -218,8 +218,8 @@ msgstr ""
 msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
 msgstr ""
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/sq/app.po b/locale/sq/app.po
index aad398a42..1893211e6 100644
--- a/locale/sq/app.po
+++ b/locale/sq/app.po
@@ -240,10 +240,10 @@ msgstr "<p>{{site_name}} është aktualisht në mirëmbajtje teknike. Ti vetëm
 msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
 msgstr "<small>Nëse ti përdor \"web-based\" email klient (p.sh. hotmail.com) ose ke \"junk mail\" filtra, kontrollo edhe bulk/spam folderët. Ndonjëherë, mesazhet tona janë të shenjuara në këtë mënyrë.</small> </p>"
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
-msgstr[0] "<span id='follow_count'>%d</span>person po përcjell këtë autoritet"
-msgstr[1] "<span id='follow_count'>%d</span>persona po përcjellin këtë autoritet"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
+msgstr[0] "{{count}}person po përcjell këtë autoritet"
+msgstr[1] "{{count}}persona po përcjellin këtë autoritet"
 
 msgid "<strong> Can I request information about myself?</strong>\\n\t\t\t<a href=\"%s\">No! (Click here for details)</a>"
 msgstr ""
diff --git a/locale/sr@latin/app.po b/locale/sr@latin/app.po
index 219c7598c..441595520 100644
--- a/locale/sr@latin/app.po
+++ b/locale/sr@latin/app.po
@@ -236,8 +236,8 @@ msgstr ""
 "<small>Ako koristite neke od web mail servisa ili imate filtere za \"junk mail\", provjerite u Vašim bulk/spam folderima. Ponekad su naše poruke označene tako</small>\n"
 "</p>"
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
diff --git a/locale/tr/app.po b/locale/tr/app.po
index cbf52eb18..dbba7be16 100644
--- a/locale/tr/app.po
+++ b/locale/tr/app.po
@@ -210,8 +210,8 @@ msgstr ""
 msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
 msgstr ""
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
 msgstr[0] ""
 
 msgid "<strong> Can I request information about myself?</strong>\\n\t\t\t<a href=\"%s\">No! (Click here for details)</a>"
diff --git a/locale/uk/app.po b/locale/uk/app.po
index a2f9aa138..3f0d10aba 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -249,11 +249,11 @@ msgstr ""
 "<small>Перевірте, чи не потрапило наше повідомлення в спам. Іноді таке трапляється.</small>\n"
 "</p>"
 
-msgid "<span id='follow_count'>%d</span> person is following this authority"
-msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
-msgstr[0] "<span id='follow_count'>%d</span> осіб відслідковує цього розпорядника"
-msgstr[1] "<span id='follow_count'>%d</span> особа відслідковує цього розпорядника"
-msgstr[2] "<span id='follow_count'>%d</span> особи (осіб) відслідковують цього розпорядника"
+msgid "{{count}} person is following this authority"
+msgid_plural "{{count}} people are following this authority"
+msgstr[0] "{{count}} осіб відслідковує цього розпорядника"
+msgstr[1] "{{count}} особа відслідковує цього розпорядника"
+msgstr[2] "{{count}} особи (осіб) відслідковують цього розпорядника"
 
 msgid "<strong> Can I request information about myself?</strong>\\n\t\t\t<a href=\"%s\">No! (Click here for details)</a>"
 msgstr ""