Rewrite support template for i18n (fixex #354).

6 files changed, 61 insertions, 56 deletions

diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po
index ad196c194..887830d82 100644
--- a/locale/FixMyStreet.po
+++ b/locale/FixMyStreet.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2013-02-21 12:36+0000\n"
+"POT-Creation-Date: 2013-02-21 15:57+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <team@fixmystreet.com>\n"
@@ -53,10 +53,6 @@ msgstr ""
 msgid "%d questionnaires sent &ndash; %d answered (%s%%)"
 msgstr ""
 
-#: templates/web/default/report/_support.html:3
-msgid "%d supporters"
-msgstr ""
-
 #: templates/web/default/pagination.html:10
 msgid "%d to %d of %d"
 msgstr ""
@@ -145,10 +141,6 @@ msgstr ""
 msgid "-- Pick a property type --"
 msgstr ""
 
-#: templates/web/default/report/_support.html:3
-msgid "1 supporter"
-msgstr ""
-
 #: templates/web/default/questionnaire/completed.html:20
 msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it&rsquo;s been fixed.</p>"
 msgstr ""
@@ -1291,7 +1283,7 @@ msgstr ""
 msgid "No result returned"
 msgstr ""
 
-#: templates/web/default/report/_support.html:3
+#: templates/web/default/report/_support.html:2 templates/web/default/report/_support.html:4
 msgid "No supporters"
 msgstr ""
 
@@ -3101,6 +3093,13 @@ msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
+#: templates/web/default/report/_support.html:6
+#, perl-format
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] ""
+msgstr[1] ""
+
 #: perllib/Utils.pm:284
 #, perl-format
 msgid "%d minute"
diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
index 5ce9871be..dc7723cfe 100644
--- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
+++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2013-02-21 12:36+0000\n"
+"POT-Creation-Date: 2013-02-21 15:57+0000\n"
 "PO-Revision-Date: 2009-07-10 14:20-0000\n"
 "Last-Translator: Mark Smith <Mark.Smith@trosol.co.uk>\n"
 "Language-Team: mySociety\n"
@@ -70,10 +70,6 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost"
 msgid "%d questionnaires sent &ndash; %d answered (%s%%)"
 msgstr ""
 
-#: templates/web/default/report/_support.html:3
-msgid "%d supporters"
-msgstr ""
-
 #: templates/web/default/pagination.html:10
 msgid "%d to %d of %d"
 msgstr ""
@@ -197,10 +193,6 @@ msgstr "-- Dewiswch fath o eiddo --"
 msgid "-- Pick a property type --"
 msgstr "-- Dewiswch fath o eiddo --"
 
-#: templates/web/default/report/_support.html:3
-msgid "1 supporter"
-msgstr ""
-
 #: templates/web/default/questionnaire/completed.html:20
 #, fuzzy
 msgid ""
@@ -2087,7 +2079,8 @@ msgstr "Ni roddwyd gwybod eto am unrhyw eiddo gwag."
 msgid "No result returned"
 msgstr ""
 
-#: templates/web/default/report/_support.html:3
+#: templates/web/default/report/_support.html:2
+#: templates/web/default/report/_support.html:4
 msgid "No supporters"
 msgstr ""
 
@@ -5022,6 +5015,13 @@ msgid_plural "%d hours"
 msgstr[0] "awr"
 msgstr[1] "awr"
 
+#: templates/web/default/report/_support.html:6
+#, perl-format
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] ""
+msgstr[1] ""
+
 #: perllib/Utils.pm:284
 #, fuzzy, perl-format
 msgid "%d minute"
diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
index a01a2819d..cb5f27c90 100644
--- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2013-02-21 12:36+0000\n"
+"POT-Creation-Date: 2013-02-21 15:57+0000\n"
 "PO-Revision-Date: 2013-02-04 12:02+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <team@fixmystreet.com>\n"
@@ -63,10 +63,6 @@ msgstr ""
 msgid "%d questionnaires sent &ndash; %d answered (%s%%)"
 msgstr ""
 
-#: templates/web/default/report/_support.html:3
-msgid "%d supporters"
-msgstr ""
-
 #: templates/web/default/pagination.html:10
 msgid "%d to %d of %d"
 msgstr ""
@@ -180,10 +176,6 @@ msgstr "-- Wählen Sie eine Kategorie --"
 msgid "-- Pick a property type --"
 msgstr ""
 
-#: templates/web/default/report/_support.html:3
-msgid "1 supporter"
-msgstr ""
-
 #: templates/web/default/questionnaire/completed.html:20
 msgid ""
 "<p style=\"font-size:150%\">Thank you very much for filling in our "
@@ -1849,7 +1841,8 @@ msgstr "Bisher wurden noch keine Meldungen erfasst."
 msgid "No result returned"
 msgstr ""
 
-#: templates/web/default/report/_support.html:3
+#: templates/web/default/report/_support.html:2
+#: templates/web/default/report/_support.html:4
 msgid "No supporters"
 msgstr ""
 
@@ -4532,6 +4525,13 @@ msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
+#: templates/web/default/report/_support.html:6
+#, perl-format
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] ""
+msgstr[1] ""
+
 #: perllib/Utils.pm:284
 #, perl-format
 msgid "%d minute"
diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 14d23abdb..de9746425 100644
--- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FixMyStreet\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2013-02-21 12:36+0000\n"
+"POT-Creation-Date: 2013-02-21 15:57+0000\n"
 "PO-Revision-Date: 2012-09-14 00:22+0100\n"
 "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -69,10 +69,6 @@ msgstr "%d aktive oppdateringer"
 msgid "%d questionnaires sent &ndash; %d answered (%s%%)"
 msgstr "%d spørreskjema sendt &ndash; %d besvart (%s%%)"
 
-#: templates/web/default/report/_support.html:3
-msgid "%d supporters"
-msgstr ""
-
 #: templates/web/default/pagination.html:10
 msgid "%d to %d of %d"
 msgstr ""
@@ -190,10 +186,6 @@ msgstr "-- Velg en kategori --"
 msgid "-- Pick a property type --"
 msgstr "-- Velg en eiendomsstype --"
 
-#: templates/web/default/report/_support.html:3
-msgid "1 supporter"
-msgstr ""
-
 #: templates/web/default/questionnaire/completed.html:20
 msgid ""
 "<p style=\"font-size:150%\">Thank you very much for filling in our "
@@ -1957,7 +1949,8 @@ msgstr "Ingen problemer er rapportert"
 msgid "No result returned"
 msgstr ""
 
-#: templates/web/default/report/_support.html:3
+#: templates/web/default/report/_support.html:2
+#: templates/web/default/report/_support.html:4
 msgid "No supporters"
 msgstr ""
 
@@ -4810,6 +4803,13 @@ msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timer"
 
+#: templates/web/default/report/_support.html:6
+#, perl-format
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] ""
+msgstr[1] ""
+
 #: perllib/Utils.pm:284
 #, perl-format
 msgid "%d minute"
diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 7e4515000..c790fecf6 100644
--- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2013-02-21 12:36+0000\n"
+"POT-Creation-Date: 2013-02-21 15:57+0000\n"
 "PO-Revision-Date: 2011-12-08 10:56+0100\n"
 "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -68,10 +68,6 @@ msgstr "%d aktive oppdateringar"
 msgid "%d questionnaires sent &ndash; %d answered (%s%%)"
 msgstr "%d spørjeskjema sendt &ndash; %d svart (%s%%)"
 
-#: templates/web/default/report/_support.html:3
-msgid "%d supporters"
-msgstr ""
-
 #: templates/web/default/pagination.html:10
 msgid "%d to %d of %d"
 msgstr ""
@@ -189,10 +185,6 @@ msgstr "-- Vel ein kategori --"
 msgid "-- Pick a property type --"
 msgstr "-- Vel ein eigedomstype --"
 
-#: templates/web/default/report/_support.html:3
-msgid "1 supporter"
-msgstr ""
-
 #: templates/web/default/questionnaire/completed.html:20
 msgid ""
 "<p style=\"font-size:150%\">Thank you very much for filling in our "
@@ -1978,7 +1970,8 @@ msgstr "Ingen problem er rapporterte"
 msgid "No result returned"
 msgstr ""
 
-#: templates/web/default/report/_support.html:3
+#: templates/web/default/report/_support.html:2
+#: templates/web/default/report/_support.html:4
 msgid "No supporters"
 msgstr ""
 
@@ -4877,6 +4870,13 @@ msgid_plural "%d hours"
 msgstr[0] "%d time"
 msgstr[1] "%d timar"
 
+#: templates/web/default/report/_support.html:6
+#, perl-format
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] ""
+msgstr[1] ""
+
 #: perllib/Utils.pm:284
 #, perl-format
 msgid "%d minute"
diff --git a/templates/web/default/report/_support.html b/templates/web/default/report/_support.html
index f4bdb8c20..3e372ba69 100644
--- a/templates/web/default/report/_support.html
+++ b/templates/web/default/report/_support.html
@@ -1,11 +1,17 @@
 [% IF c.cobrand.can_support_problems %]
-<p id="supporter"><small>
-    [% IF !problem.interest_count %][% text=loc('No supporters') %][% ELSIF problem.interest_count == 1 %][% text = loc('1 supporter') %][% ELSE %][% text = tprintf( loc('%d supporters' ), problem.interest_count ) %][% END %]
-    [% IF c.user && c.user.from_body %]<form action="[% c.uri_for( '/report/support' ) %]">
-        [% text %] <input type="hidden" name="id" value="[% problem.id %]"><input type="submit" class="green-btn" value="Add support">
+[%
+    IF !problem.interest_count;
+        SET text = loc('No supporters');
+    ELSE;
+        SET text = tprintf( nget( "%d supporter", "%d supporters", problem.interest_count ), problem.interest_count );
+    END;
+%]
+
+    [% IF c.user AND c.user.from_body %]
+    <form action="[% c.uri_for( '/report/support' ) %]">
+        <p id="supporter"><small>[% text %] <input type="hidden" name="id" value="[% problem.id %]"><input type="submit" class="green-btn" value="Add support"></small></p>
     </form>
     [% ELSE %]
-        [% text %]
+        <p id="supporter"><small>[% text %]</small></p>
     [% END %]
-</small></p>
 [% END %]