aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2013-01-16 12:55:45 +0000
committerMatthew Somerville <matthew@mysociety.org>2013-01-16 12:55:45 +0000
commit060ec03f03abbe879ef0463c93a80ed21e24f810 (patch)
tree5e6f89ee2010778c205193327ac9a2feb58d7507
parent84021a8fb660661d60c68b4ee75906062dfb7f73 (diff)
Start of Zurich front end report display.
-rw-r--r--locale/FixMyStreet.po26
-rw-r--r--locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po33
-rw-r--r--locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po33
-rw-r--r--locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po34
-rw-r--r--locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po33
-rw-r--r--templates/web/zurich/report/_main.html19
-rw-r--r--web/cobrands/zurich/base.scss9
7 files changed, 93 insertions, 94 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po
index ee07e60e9..69708b225 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-01-16 11:55+0000\n"
+"POT-Creation-Date: 2013-01-16 12:43+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"
@@ -21,7 +21,7 @@ msgstr ""
msgid " and "
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:18
+#: templates/web/default/tokens/confirm_problem.html:14 templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
msgstr ""
@@ -1331,7 +1331,7 @@ msgstr ""
msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1023 perllib/FixMyStreet/App/Controller/Report/New.pm:663 perllib/FixMyStreet/App/Controller/Report/New.pm:664 perllib/FixMyStreet/DB/Result/Problem.pm:509 perllib/FixMyStreet/DB/Result/Problem.pm:519 perllib/FixMyStreet/DB/Result/Problem.pm:529 perllib/FixMyStreet/DB/Result/Problem.pm:541 perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 templates/web/zurich/report/_main.html:8
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1023 perllib/FixMyStreet/App/Controller/Report/New.pm:663 perllib/FixMyStreet/App/Controller/Report/New.pm:664 perllib/FixMyStreet/DB/Result/Problem.pm:509 perllib/FixMyStreet/DB/Result/Problem.pm:519 perllib/FixMyStreet/DB/Result/Problem.pm:529 perllib/FixMyStreet/DB/Result/Problem.pm:541 perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 perllib/FixMyStreet/DB/ResultSet/Problem.pm:340
msgid "Other"
msgstr ""
@@ -1851,10 +1851,6 @@ msgstr ""
msgid "Reported anonymously at %s"
msgstr ""
-#: templates/web/zurich/report/_main.html:11
-msgid "Reported at %s"
-msgstr ""
-
#: templates/web/default/admin/questionnaire.html:5 templates/web/default/questionnaire/index.html:77 templates/web/fixmystreet/questionnaire/index.html:71
msgid "Reported before"
msgstr ""
@@ -1879,12 +1875,12 @@ msgstr ""
msgid "Reported by %s in the %s category by %s at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:520
-msgid "Reported in the %s category anonymously at %s"
+#: templates/web/zurich/report/_main.html:2
+msgid "Reported in the %s category"
msgstr ""
-#: templates/web/zurich/report/_main.html:9
-msgid "Reported in the %s category at %s"
+#: perllib/FixMyStreet/DB/Result/Problem.pm:520
+msgid "Reported in the %s category anonymously at %s"
msgstr ""
#: perllib/FixMyStreet/DB/Result/Problem.pm:542
@@ -2407,7 +2403,7 @@ msgstr ""
msgid "This problem is old and of unknown status."
msgstr ""
-#: templates/web/zurich/report/_main.html:23
+#: templates/web/zurich/report/_main.html:15
msgid "This report is awaiting moderation."
msgstr ""
@@ -2683,7 +2679,7 @@ msgstr ""
msgid "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/reports\">show all councils</a>."
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:22 templates/web/zurich/tokens/confirm_problem.html:5 templates/web/zurich/tokens/confirm_problem.html:8
+#: templates/web/default/tokens/confirm_problem.html:19 templates/web/default/tokens/confirm_problem.html:21 templates/web/zurich/tokens/confirm_problem.html:5 templates/web/zurich/tokens/confirm_problem.html:8
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
msgstr ""
@@ -2723,7 +2719,7 @@ msgstr ""
msgid "You have successfully confirmed your email address."
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:15
+#: templates/web/default/tokens/confirm_problem.html:14 templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your problem"
msgstr ""
@@ -2887,7 +2883,7 @@ msgstr ""
msgid "the local council"
msgstr ""
-#: templates/web/default/report/_main.html:6 templates/web/zurich/report/_main.html:14
+#: templates/web/default/report/_main.html:6 templates/web/zurich/report/_main.html:6
msgid "there is no pin shown as the user did not use the map"
msgstr ""
diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
index fc29e40b0..367f32095 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-01-16 11:55+0000\n"
+"POT-Creation-Date: 2013-01-16 12:43+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"
@@ -25,7 +25,8 @@ msgstr ""
msgid " and "
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:18
+#: templates/web/default/tokens/confirm_problem.html:14
+#: templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
msgstr " a <strong>byddwn nawr yn ei anfon at y cyngor</strong>"
@@ -2133,7 +2134,6 @@ msgstr ""
#: perllib/FixMyStreet/DB/Result/Problem.pm:541
#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331
#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340
-#: templates/web/zurich/report/_main.html:8
msgid "Other"
msgstr "Arall"
@@ -2932,11 +2932,6 @@ msgstr "Adroddwyd gan %s am %s"
msgid "Reported anonymously at %s"
msgstr "Adroddwyd yn ddi-enw am %s"
-#: templates/web/zurich/report/_main.html:11
-#, fuzzy
-msgid "Reported at %s"
-msgstr "Adroddiadau"
-
#: templates/web/default/admin/questionnaire.html:5
#: templates/web/default/questionnaire/index.html:77
#: templates/web/fixmystreet/questionnaire/index.html:71
@@ -2965,15 +2960,15 @@ msgstr "Adroddwyd am hyn gan %s yn y categori %s yn ddi-enw, am %s"
msgid "Reported by %s in the %s category by %s at %s"
msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s"
+#: templates/web/zurich/report/_main.html:2
+#, fuzzy
+msgid "Reported in the %s category"
+msgstr "Adroddwyd yn y categori %s gan %s am %s"
+
#: perllib/FixMyStreet/DB/Result/Problem.pm:520
msgid "Reported in the %s category anonymously at %s"
msgstr "Adroddiwyd yn y categori %s yn ddi-enw am %s"
-#: templates/web/zurich/report/_main.html:9
-#, fuzzy
-msgid "Reported in the %s category at %s"
-msgstr "Adroddwyd yn y categori %s gan %s am %s"
-
#: perllib/FixMyStreet/DB/Result/Problem.pm:542
msgid "Reported in the %s category by %s at %s"
msgstr "Adroddwyd yn y categori %s gan %s am %s"
@@ -3852,7 +3847,7 @@ msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio"
msgid "This empty property is old and of unknown status."
msgstr "Mae'r eiddo gwag hwn yn hen ac nid yw ei statws yn hysbys."
-#: templates/web/zurich/report/_main.html:23
+#: templates/web/zurich/report/_main.html:15
msgid "This report is awaiting moderation."
msgstr ""
@@ -4309,7 +4304,8 @@ msgstr ""
"Gallwch <a href=\"%s\">weld llai o fanylion</a> neu fynd yn ôl a <a href=\"/"
"reports\">dangos pob cyngor</a>."
-#: templates/web/default/tokens/confirm_problem.html:22
+#: templates/web/default/tokens/confirm_problem.html:19
+#: templates/web/default/tokens/confirm_problem.html:21
#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:8
msgid "You can <a href=\"%s%s\">view the empty property on this site</a>."
@@ -4386,6 +4382,7 @@ msgstr "Rydych wedi cadarnhau'ch hysbysiad yn llwyddiannus."
msgid "You have successfully confirmed your email address."
msgstr "Rydych wedi cadarnhau'ch hysbysiad yn llwyddiannus."
+#: templates/web/default/tokens/confirm_problem.html:14
#: templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your empty property"
msgstr "Rydych wedi cadarnhau eich eiddo gwag yn llwyddiannus"
@@ -4647,7 +4644,7 @@ msgid "the local council"
msgstr "Ni roddwyd gwybod i'r cyngor am hyn"
#: templates/web/default/report/_main.html:6
-#: templates/web/zurich/report/_main.html:14
+#: templates/web/zurich/report/_main.html:6
msgid "there is no pin shown as the user did not use the map"
msgstr ""
@@ -4791,6 +4788,10 @@ msgstr[0] "diwrnod"
msgstr[1] "diwrnod"
#, fuzzy
+#~ msgid "Reported at %s"
+#~ msgstr "Adroddiadau"
+
+#, fuzzy
#~ msgid "Empty property ID"
#~ msgstr "Eiddo gwag"
diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
index ac9b6b2a1..7b483d90d 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-01-16 11:55+0000\n"
+"POT-Creation-Date: 2013-01-16 12:43+0000\n"
"PO-Revision-Date: 2013-01-15 17:55+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <team@fixmystreet.com>\n"
@@ -21,7 +21,8 @@ msgstr ""
msgid " and "
msgstr "und"
-#: templates/web/default/tokens/confirm_problem.html:18
+#: templates/web/default/tokens/confirm_problem.html:14
+#: templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
msgstr ""
@@ -1885,7 +1886,6 @@ msgstr ""
#: perllib/FixMyStreet/DB/Result/Problem.pm:541
#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331
#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340
-#: templates/web/zurich/report/_main.html:8
msgid "Other"
msgstr ""
@@ -2635,11 +2635,6 @@ msgstr ""
msgid "Reported anonymously at %s"
msgstr "Anonym gemeldet um"
-#: templates/web/zurich/report/_main.html:11
-#, fuzzy
-msgid "Reported at %s"
-msgstr "Gemeldet von %s um %s"
-
#: templates/web/default/admin/questionnaire.html:5
#: templates/web/default/questionnaire/index.html:77
#: templates/web/fixmystreet/questionnaire/index.html:71
@@ -2668,13 +2663,13 @@ msgstr ""
msgid "Reported by %s in the %s category by %s at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:520
-msgid "Reported in the %s category anonymously at %s"
+#: templates/web/zurich/report/_main.html:2
+#, fuzzy
+msgid "Reported in the %s category"
msgstr "In der Kategorie %s um %s gemeldet"
-#: templates/web/zurich/report/_main.html:9
-#, fuzzy
-msgid "Reported in the %s category at %s"
+#: perllib/FixMyStreet/DB/Result/Problem.pm:520
+msgid "Reported in the %s category anonymously at %s"
msgstr "In der Kategorie %s um %s gemeldet"
#: perllib/FixMyStreet/DB/Result/Problem.pm:542
@@ -3427,7 +3422,7 @@ msgstr "Dieser Mangel ist in Bearbeitung"
msgid "This problem is old and of unknown status."
msgstr "Dieses Problem ist alt und hat einen unbekannten Status"
-#: templates/web/zurich/report/_main.html:23
+#: templates/web/zurich/report/_main.html:15
msgid "This report is awaiting moderation."
msgstr ""
@@ -3839,7 +3834,8 @@ msgid ""
"reports\">show all councils</a>."
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:22
+#: templates/web/default/tokens/confirm_problem.html:19
+#: templates/web/default/tokens/confirm_problem.html:21
#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:8
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
@@ -3911,6 +3907,7 @@ msgstr ""
msgid "You have successfully confirmed your email address."
msgstr "Sie haben Ihre Meldung erfolgreich best&auml;tigt"
+#: templates/web/default/tokens/confirm_problem.html:14
#: templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your problem"
msgstr "Sie haben Ihre Meldung erfolgreich best&auml;tigt"
@@ -4161,7 +4158,7 @@ msgid "the local council"
msgstr ""
#: templates/web/default/report/_main.html:6
-#: templates/web/zurich/report/_main.html:14
+#: templates/web/zurich/report/_main.html:6
msgid "there is no pin shown as the user did not use the map"
msgstr ""
@@ -4298,6 +4295,10 @@ msgid_plural "%d days"
msgstr[0] "%d Tag"
msgstr[1] "%d Tage"
+#, fuzzy
+#~ msgid "Reported at %s"
+#~ msgstr "Gemeldet von %s um %s"
+
#~ msgid "*unknown*"
#~ msgstr "*unbekannt*"
diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 8027e1881..51904afaa 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-01-16 11:55+0000\n"
+"POT-Creation-Date: 2013-01-16 12:43+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"
@@ -27,7 +27,8 @@ msgstr ""
msgid " and "
msgstr " og "
-#: templates/web/default/tokens/confirm_problem.html:18
+#: templates/web/default/tokens/confirm_problem.html:14
+#: templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
msgstr " og <strong>vi sender det nå til administrasjonen</strong>"
@@ -1991,7 +1992,6 @@ msgstr ""
#: perllib/FixMyStreet/DB/Result/Problem.pm:541
#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331
#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340
-#: templates/web/zurich/report/_main.html:8
msgid "Other"
msgstr "Annet"
@@ -2777,11 +2777,6 @@ msgstr "Rapportert %s, til %s"
msgid "Reported anonymously at %s"
msgstr "Rapportert anonymt %s"
-#: templates/web/zurich/report/_main.html:11
-#, fuzzy
-msgid "Reported at %s"
-msgstr "Rapportert %s"
-
#: templates/web/default/admin/questionnaire.html:5
#: templates/web/default/questionnaire/index.html:77
#: templates/web/fixmystreet/questionnaire/index.html:71
@@ -2810,15 +2805,15 @@ msgstr "Rapportert av %s i kategorien %s anonymt %s"
msgid "Reported by %s in the %s category by %s at %s"
msgstr "Rapportert av %s i kategorien %s av %s %s"
+#: templates/web/zurich/report/_main.html:2
+#, fuzzy
+msgid "Reported in the %s category"
+msgstr "Rapportert i kategorien %s av %s %s"
+
#: perllib/FixMyStreet/DB/Result/Problem.pm:520
msgid "Reported in the %s category anonymously at %s"
msgstr "Rapportert i kategorien %s anonymt %s"
-#: templates/web/zurich/report/_main.html:9
-#, fuzzy
-msgid "Reported in the %s category at %s"
-msgstr "Rapportert i kategorien %s av %s %s"
-
#: perllib/FixMyStreet/DB/Result/Problem.pm:542
msgid "Reported in the %s category by %s at %s"
msgstr "Rapportert i kategorien %s av %s %s"
@@ -3647,7 +3642,7 @@ msgstr "Dette problemet er under arbeid"
msgid "This problem is old and of unknown status."
msgstr "Dette problemet er gammel og med ukjent status."
-#: templates/web/zurich/report/_main.html:23
+#: templates/web/zurich/report/_main.html:15
#, fuzzy
msgid "This report is awaiting moderation."
msgstr "Denne rapporten er for tiden markert som åpen."
@@ -4092,7 +4087,8 @@ msgstr ""
"href=\"/reports\">se alle administrasjonene</a>."
# Trenger kontekst for bedre oversettelse
-#: templates/web/default/tokens/confirm_problem.html:22
+#: templates/web/default/tokens/confirm_problem.html:19
+#: templates/web/default/tokens/confirm_problem.html:21
#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:8
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
@@ -4171,6 +4167,7 @@ msgstr "Du har nå lykkes med å bekrefte ditt varsel."
msgid "You have successfully confirmed your email address."
msgstr "Du har nå lykkes med å bekrefte ditt varsel."
+#: templates/web/default/tokens/confirm_problem.html:14
#: templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your problem"
msgstr "Du har nå lykkes med å bekrefte ditt problem"
@@ -4426,7 +4423,7 @@ msgid "the local council"
msgstr "den lokale administrasjonen"
#: templates/web/default/report/_main.html:6
-#: templates/web/zurich/report/_main.html:14
+#: templates/web/zurich/report/_main.html:6
msgid "there is no pin shown as the user did not use the map"
msgstr ""
@@ -4570,6 +4567,10 @@ msgid_plural "%d days"
msgstr[0] "%d dag"
msgstr[1] "%d dager"
+#, fuzzy
+#~ msgid "Reported at %s"
+#~ msgstr "Rapportert %s"
+
#~ msgid "*unknown*"
#~ msgstr "*ukjent*"
@@ -4712,4 +4713,3 @@ msgstr[1] "%d dager"
#~ msgid "Photos of recent reports"
#~ msgstr "Bilder av nylig meldte problemer"
-
diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 01cec3567..faab632b4 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-01-16 11:55+0000\n"
+"POT-Creation-Date: 2013-01-16 12:43+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"
@@ -26,7 +26,8 @@ msgstr ""
msgid " and "
msgstr " og "
-#: templates/web/default/tokens/confirm_problem.html:18
+#: templates/web/default/tokens/confirm_problem.html:14
+#: templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
msgstr " og <strong>vi sender det no til administrasjonen</strong>"
@@ -2015,7 +2016,6 @@ msgstr ""
#: perllib/FixMyStreet/DB/Result/Problem.pm:541
#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331
#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340
-#: templates/web/zurich/report/_main.html:8
msgid "Other"
msgstr "Anna"
@@ -2811,11 +2811,6 @@ msgstr "Rapportert %s, til %s"
msgid "Reported anonymously at %s"
msgstr "Rapportert anonymt %s"
-#: templates/web/zurich/report/_main.html:11
-#, fuzzy
-msgid "Reported at %s"
-msgstr "Rapportert %s"
-
#: templates/web/default/admin/questionnaire.html:5
#: templates/web/default/questionnaire/index.html:77
#: templates/web/fixmystreet/questionnaire/index.html:71
@@ -2844,15 +2839,15 @@ msgstr "Rapportert av %s i kategorien %s anonymt %s"
msgid "Reported by %s in the %s category by %s at %s"
msgstr "Rapportert av %s i kategorien %s av %s %s"
+#: templates/web/zurich/report/_main.html:2
+#, fuzzy
+msgid "Reported in the %s category"
+msgstr "Rapportert i kategorien %s av %s %s"
+
#: perllib/FixMyStreet/DB/Result/Problem.pm:520
msgid "Reported in the %s category anonymously at %s"
msgstr "Rapportert i kategorien %s anonymt %s"
-#: templates/web/zurich/report/_main.html:9
-#, fuzzy
-msgid "Reported in the %s category at %s"
-msgstr "Rapportert i kategorien %s av %s %s"
-
#: perllib/FixMyStreet/DB/Result/Problem.pm:542
msgid "Reported in the %s category by %s at %s"
msgstr "Rapportert i kategorien %s av %s %s"
@@ -3695,7 +3690,7 @@ msgstr "Dette problemet er under arbeid"
msgid "This problem is old and of unknown status."
msgstr "Dette problemet er gammalt og med ukjend status."
-#: templates/web/zurich/report/_main.html:23
+#: templates/web/zurich/report/_main.html:15
#, fuzzy
msgid "This report is awaiting moderation."
msgstr "Denne rapporten er for tida markert som open."
@@ -4150,7 +4145,8 @@ msgstr ""
"Du kan <a href=\"%s\">sjå alle rapportar for administrasjonen</a> eller <a "
"href=\"/reports\">sjå alle administrasjonane</a>."
-#: templates/web/default/tokens/confirm_problem.html:22
+#: templates/web/default/tokens/confirm_problem.html:19
+#: templates/web/default/tokens/confirm_problem.html:21
#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:8
#, fuzzy
@@ -4231,6 +4227,7 @@ msgstr "Du har no stadfesta varselet ditt."
msgid "You have successfully confirmed your email address."
msgstr "Du har no stadfesta varselet ditt."
+#: templates/web/default/tokens/confirm_problem.html:14
#: templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your problem"
msgstr "Du har no stadfesta problemet ditt"
@@ -4493,7 +4490,7 @@ msgid "the local council"
msgstr "den lokale administrasjonen"
#: templates/web/default/report/_main.html:6
-#: templates/web/zurich/report/_main.html:14
+#: templates/web/zurich/report/_main.html:6
msgid "there is no pin shown as the user did not use the map"
msgstr ""
@@ -4637,6 +4634,10 @@ msgid_plural "%d days"
msgstr[0] "%d dag"
msgstr[1] "%d dager"
+#, fuzzy
+#~ msgid "Reported at %s"
+#~ msgstr "Rapportert %s"
+
#~ msgid "*unknown*"
#~ msgstr "*ukjent*"
diff --git a/templates/web/zurich/report/_main.html b/templates/web/zurich/report/_main.html
index 32da47423..9a3e56b27 100644
--- a/templates/web/zurich/report/_main.html
+++ b/templates/web/zurich/report/_main.html
@@ -1,18 +1,9 @@
<div class="problem-header cf">
- [% IF problem.state != 'unconfirmed' %]
- <h1>[% problem.title | html %]</h1>
- [% END %]
-
- <p><em>
- [% SET date_time = prettify_epoch( problem.created_local.epoch ) %]
- [% IF problem.category AND problem.category != loc('Other') %]
- [% tprintf( loc('Reported in the %s category at %s'), problem.category, date_time ) %]
- [% ELSE %]
- [% tprintf( loc('Reported at %s'), date_time ) %]
- [% END %]
-
- [%- IF !problem.used_map %]; <strong>[% loc('there is no pin shown as the user did not use the map') %]</strong>[% END %]
- </em></p>
+ <h1>[% tprintf( loc('Reported in the %s category'), problem.category ) %]</h1>
+ <p class="sub">
+ [% prettify_epoch( problem.created_local.epoch ) %]
+ [%- IF !problem.used_map %]<br>[% loc('there is no pin shown as the user did not use the map') %][% END %]
+ </p>
[% IF problem.state != 'unconfirmed' %]
[% IF problem.extra.publish_photo %]
diff --git a/web/cobrands/zurich/base.scss b/web/cobrands/zurich/base.scss
index 94fa5caf6..28ce8295c 100644
--- a/web/cobrands/zurich/base.scss
+++ b/web/cobrands/zurich/base.scss
@@ -9,3 +9,12 @@
list-style-type: none;
}
+.problem-header h1 {
+ font-size: 120%;
+ font-weight: bold;
+ margin: 0;
+}
+.problem-header .sub {
+ color: #666;
+ font-size: 85%;
+}