diff options
| author | Dave Arter <davea@mysociety.org> | 2017-03-16 10:14:47 -0400 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-03-30 17:35:05 +0100 |
| commit | e5529e430f180cebfa992dff6ac8285870576051 (patch) | |
| tree | 7e19ad9b26d1e64804fe998afd52f1f04d0f5d85 | |
| parent | 21bde113503d86f1791e170d1133710a2ed32077 (diff) | |
Improve translatability of various pages.
This commit makes the following parts of the site translatable:
- Social login buttons
- Moderation UI
- Offline glitch page & offline caching UI
- Dashboard
It also fixes a bug in the nget parser, stops some Oxfordshire bits
being translated for the moment, and brings the translation file up
to date.
20 files changed, 652 insertions, 320 deletions
diff --git a/bin/gettext-nget-patch b/bin/gettext-nget-patch index d058bc784..67f98e319 100755 --- a/bin/gettext-nget-patch +++ b/bin/gettext-nget-patch @@ -18,12 +18,12 @@ find( sub { do { $text .= <FP>; } until $text =~ /\)/; - if ($text =~ /nget\(\s*"(.*?)"\s*,\s*"(.*?)"\s*,\s*(.*?)\s*\)/s) { - $out{$1} = { + if ($text =~ /nget\(\s*(['"])(.*?)\1\s*,\s*(['"])(.*?)\3\s*,\s*(.*?)\s*\)/s) { + $out{$2} = { file => $File::Find::name, line => $line, - s => $1, - p => $2, + s => $2, + p => $4, }; } } diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 60c0e8fb7..f04c38bf7 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: 2017-02-02 10:31+0000\n" +"POT-Creation-Date: 2017-03-30 17:33+0100\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" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:648 perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/DB/Result/Problem.pm:695 perllib/FixMyStreet/Script/Reports.pm:197 msgid " and " msgstr "" @@ -93,11 +93,11 @@ msgid "" "for the county council." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 msgid "%s, within %s ward" msgstr "" @@ -142,7 +142,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/_item.html:68 msgid "(not sent to council)" msgstr "" @@ -150,15 +150,15 @@ msgstr "" msgid "(optional)" msgstr "" -#: templates/web/base/report/_item.html:59 +#: templates/web/base/report/_item.html:67 msgid "(sent to both)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:239 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/DB/Result/Problem.pm:439 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:239 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/DB/Result/Problem.pm:454 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:445 +#: perllib/FixMyStreet/DB/Result/Problem.pm:460 msgid "-- Pick a property type --" msgstr "" @@ -170,6 +170,14 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" +#: templates/web/base/dashboard/index.html:152 +msgid "14-30 days old" +msgstr "" + +#: templates/web/base/dashboard/index.html:151 +msgid "7-14 days old" +msgstr "" + #: templates/web/base/admin/body-form.html:48 templates/web/base/admin/body-form.html:49 msgid "" "<code>MAPIT_URL</code> is set (<code>%s</code>) but no <code>MAPIT_TYPES</code>.<br>\n" @@ -177,12 +185,20 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" +#: templates/web/base/dashboard/index.html:15 +msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>" +msgstr "" + #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories') #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:28 +#: templates/web/base/reports/_list-filters.html:37 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s" msgstr "" +#: templates/web/base/js/translation_strings.html:71 +msgid "<span>%s</span> saved." +msgstr "" + #: templates/web/base/status/stats.html:18 templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" msgstr "" @@ -199,11 +215,11 @@ msgstr "" msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/report/_inspect.html:142 +#: templates/web/base/report/_inspect.html:160 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:162 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -211,7 +227,7 @@ msgstr "" msgid "<strong>Yes</strong> I have a password" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:10 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:10 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:6 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42 msgid "Action Scheduled" msgstr "" @@ -242,15 +258,15 @@ msgstr "" msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:733 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Add/edit response templates" msgstr "" @@ -262,6 +278,10 @@ msgstr "" msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" +#: templates/web/base/main_nav_items.html:47 +msgid "Admin" +msgstr "" + #: templates/web/base/auth/change_password.html:39 msgid "Again:" msgstr "" @@ -278,6 +298,10 @@ msgstr "" msgid "Alert me to future updates" msgstr "" +#: templates/web/base/dashboard/index.html:138 templates/web/base/dashboard/index.html:21 templates/web/base/dashboard/index.html:30 +msgid "All" +msgstr "" + #: templates/web/base/reports/index.html:6 templates/web/zurich/reports/index.html:13 msgid "All Reports" msgstr "" @@ -286,11 +310,11 @@ msgstr "" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/admin/responsepriorities/list.html:19 +#: templates/web/base/admin/category-multiselect.html:5 templates/web/base/admin/responsepriorities/list.html:19 msgid "All categories" msgstr "" -#: templates/web/base/footer.html:29 templates/web/base/reports/_list-filters.html:2 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21 templates/web/zurich/nav_over_content.html:6 +#: templates/web/base/main_nav_items.html:0 templates/web/base/main_nav_items.html:27 templates/web/base/reports/_list-filters.html:3 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:21 templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "" @@ -318,11 +342,11 @@ msgstr "" msgid "Are you a developer?" msgstr "" -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:56 msgid "Are you sure you want to cancel this upload?" msgstr "" -#: templates/web/base/admin/report_edit.html:84 templates/web/base/report/display_tools.html:6 +#: templates/web/base/admin/report_edit.html:84 templates/web/base/js/translation_strings.html:66 templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -354,7 +378,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Assign users to areas" msgstr "" @@ -378,15 +402,23 @@ msgstr "" msgid "Auto-response:" msgstr "" -#: templates/web/base/admin/report_edit.html:127 templates/web/base/report/_inspect.html:41 +#: templates/web/base/admin/report_edit.html:127 templates/web/base/report/_inspect.html:47 msgid "Available categories" msgstr "" +#: templates/web/base/dashboard/index.html:109 +msgid "Average time to council marking fixed (days)" +msgstr "" + +#: templates/web/base/dashboard/index.html:117 +msgid "Average time to first council state change (days)" +msgstr "" + #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:402 templates/web/zurich/report/_item.html:9 +#: perllib/FixMyStreet/DB/Result/Problem.pm:417 templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -402,11 +434,11 @@ msgstr "" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 perllib/FixMyStreet/Cobrand/Default.pm:730 perllib/FixMyStreet/Cobrand/Zurich.pm:391 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:55 templates/web/zurich/header.html:56 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 perllib/FixMyStreet/Cobrand/Default.pm:729 perllib/FixMyStreet/Cobrand/Zurich.pm:391 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:55 templates/web/zurich/header.html:56 msgid "Bodies" msgstr "" -#: templates/web/base/admin/flagged.html:17 templates/web/base/admin/index.html:57 templates/web/base/admin/reports.html:15 templates/web/base/admin/users.html:18 +#: templates/web/base/admin/flagged.html:17 templates/web/base/admin/index.html:63 templates/web/base/admin/reports.html:15 templates/web/base/admin/users.html:18 msgid "Body" msgstr "" @@ -430,15 +462,15 @@ msgstr "" msgid "Categories" msgstr "" -#: templates/web/base/admin/category-checkboxes.html:2 +#: templates/web/base/admin/category-checkboxes.html:2 templates/web/base/admin/category-multiselect.html:2 msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/contact-form.html:19 templates/web/base/admin/stats_fix_rate.html:4 templates/web/base/report/_inspect.html:32 templates/web/base/report/_item.html:82 templates/web/base/report/new/category.html:6 templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/body.html:14 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:50 +#: templates/web/base/admin/body.html:72 templates/web/base/admin/contact-form.html:19 templates/web/base/admin/stats_fix_rate.html:4 templates/web/base/report/_inspect.html:38 templates/web/base/report/_item.html:90 templates/web/base/report/new/category.html:6 templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/body.html:14 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:50 msgid "Category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:854 +#: perllib/FixMyStreet/App/Controller/Admin.pm:852 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -446,11 +478,11 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/report_edit.html:119 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/contact-form.html:2 templates/web/zurich/admin/report_edit-sdm.html:72 templates/web/zurich/admin/report_edit.html:100 +#: templates/web/base/admin/report_edit.html:119 templates/web/base/dashboard/index.html:29 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/contact-form.html:2 templates/web/zurich/admin/report_edit-sdm.html:72 templates/web/zurich/admin/report_edit.html:100 msgid "Category:" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:188 msgid "Category: %s" msgstr "" @@ -499,10 +531,14 @@ msgid "" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:76 +#: templates/web/base/report/_inspect.html:93 msgid "Choose another" msgstr "" +#: templates/web/base/js/translation_strings.html:65 +msgid "Clear offline data" +msgstr "" + #: templates/web/base/admin/stats.html:72 templates/web/base/admin/stats.html:78 msgid "Click here or enter as dd/mm/yyyy" msgstr "" @@ -527,15 +563,15 @@ msgstr "" msgid "Click the link in our confirmation email to sign in." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:189 perllib/FixMyStreet/Cobrand/Zurich.pm:960 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:17 templates/web/base/admin/report_blocks.html:27 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/_item.html:43 templates/web/base/report/banner.html:15 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:16 templates/web/zurich/admin/stats.html:31 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:189 perllib/FixMyStreet/Cobrand/Zurich.pm:960 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:17 templates/web/base/admin/report_blocks.html:27 templates/web/base/dashboard/index.html:139 templates/web/base/dashboard/index.html:141 templates/web/base/report/_item.html:43 templates/web/base/report/banner.html:15 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:18 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:16 templates/web/zurich/admin/stats.html:31 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:809 +#: perllib/FixMyStreet/DB/Result/Problem.pm:889 msgid "Closed by council" msgstr "" -#: templates/web/base/reports/_list-filters.html:4 +#: templates/web/base/reports/_list-filters.html:13 msgid "Closed reports" msgstr "" @@ -559,6 +595,10 @@ msgstr "" msgid "Cobrand:" msgstr "" +#: templates/web/base/js/translation_strings.html:50 +msgid "Collapse map" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Default.pm:646 templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -608,7 +648,7 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1651 perllib/FixMyStreet/App/Controller/Admin.pm:1679 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1668 perllib/FixMyStreet/App/Controller/Admin.pm:1696 msgid "Could not find user" msgstr "" @@ -624,6 +664,26 @@ msgstr "" msgid "Council contacts for %s" msgstr "" +#: templates/web/base/dashboard/index.html:78 templates/web/base/dashboard/index.html:83 +msgid "Council has marked as closed" +msgstr "" + +#: templates/web/base/dashboard/index.html:54 templates/web/base/dashboard/index.html:57 +msgid "Council has marked as fixed" +msgstr "" + +#: templates/web/base/dashboard/index.html:78 templates/web/base/dashboard/index.html:80 +msgid "Council has marked as in progress" +msgstr "" + +#: templates/web/base/dashboard/index.html:78 templates/web/base/dashboard/index.html:82 +msgid "Council has marked as investigating" +msgstr "" + +#: templates/web/base/dashboard/index.html:78 templates/web/base/dashboard/index.html:81 +msgid "Council has marked as planned" +msgstr "" + #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "" @@ -644,15 +704,15 @@ msgstr "" msgid "Create category" msgstr "" -#: templates/web/base/admin/responsepriorities/edit.html:36 +#: templates/web/base/admin/responsepriorities/edit.html:46 msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -688,7 +748,11 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 templates/web/base/admin/template_edit.html:50 templates/web/zurich/admin/template_edit.html:33 +#: templates/web/base/report/_inspect.html:73 +msgid "Defect type" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:973 templates/web/base/admin/template_edit.html:50 templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -696,6 +760,10 @@ msgstr "" msgid "Deleted" msgstr "" +#: templates/web/base/report/_main.html:110 templates/web/base/report/update.html:59 +msgid "Describe why you are moderating this" +msgstr "" + #: templates/web/base/admin/responsepriorities/list.html:7 templates/web/zurich/admin/index-dm.html:22 templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports.html:12 msgid "Description" msgstr "" @@ -724,6 +792,10 @@ msgstr "" msgid "Diligency prize league table" msgstr "" +#: templates/web/base/report/_main.html:114 templates/web/base/report/update.html:61 +msgid "Discard changes" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:95 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -745,19 +817,19 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "Drag and drop photos here or <u>click to upload</u>" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:16 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:43 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:16 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:10 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:43 msgid "Duplicate" msgstr "" -#: templates/web/base/report/_inspect.html:71 +#: templates/web/base/report/_inspect.html:88 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:81 +#: templates/web/base/report/_inspect.html:98 msgid "Duplicates" msgstr "" @@ -769,7 +841,7 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:15 templates/web/base/report/_item.html:73 +#: templates/web/base/report/_inspect.html:16 templates/web/base/report/_item.html:81 msgid "Easting/Northing:" msgstr "" @@ -777,27 +849,27 @@ msgstr "" msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:140 templates/web/base/admin/index.html:35 templates/web/zurich/admin/body.html:69 +#: templates/web/base/admin/body.html:140 templates/web/base/admin/index.html:39 templates/web/zurich/admin/body.html:69 msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:708 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 msgid "Edit reports" msgstr "" @@ -821,7 +893,7 @@ msgstr "" msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1644 msgid "Email added to abuse list" msgstr "" @@ -837,7 +909,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1624 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1641 msgid "Email already in abuse list" msgstr "" @@ -876,7 +948,7 @@ msgstr "" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:15 msgid "Enter a nearby UK postcode, or street name and area" msgstr "" @@ -900,7 +972,7 @@ msgstr "" msgid "Error" msgstr "" -#: templates/web/base/reports/_list-filters.html:11 templates/web/base/reports/_list-filters.html:19 +#: templates/web/base/reports/_list-filters.html:20 templates/web/base/reports/_list-filters.html:28 msgid "Everything" msgstr "" @@ -912,19 +984,27 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/base/admin/report_edit.html:122 templates/web/base/report/_inspect.html:36 +#: templates/web/base/admin/report_edit.html:122 templates/web/base/report/_inspect.html:42 msgid "Existing category" msgstr "" +#: templates/web/base/js/translation_strings.html:49 +msgid "Expand map" +msgstr "" + #: templates/web/base/report/new/form_report.html:52 msgid "Explain what’s wrong" msgstr "" +#: templates/web/base/dashboard/index.html:146 +msgid "Export as CSV" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 perllib/FixMyStreet/Cobrand/Zurich.pm:913 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:12 msgid "Extern" msgstr "" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:97 templates/web/base/admin/responsepriorities/edit.html:27 msgid "External ID" msgstr "" @@ -944,7 +1024,7 @@ msgstr "" msgid "Extra data:" msgstr "" -#: templates/web/base/report/_inspect.html:116 templates/web/base/report/_item.html:98 +#: templates/web/base/report/_inspect.html:134 templates/web/base/report/_item.html:106 msgid "Extra details" msgstr "" @@ -964,11 +1044,11 @@ msgstr "" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:11 templates/web/base/admin/report_blocks.html:26 templates/web/base/admin/stats_fix_rate.html:4 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/_item.html:41 templates/web/base/report/banner.html:12 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:45 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:11 templates/web/base/admin/report_blocks.html:26 templates/web/base/admin/stats_fix_rate.html:4 templates/web/base/dashboard/index.html:139 templates/web/base/dashboard/index.html:141 templates/web/base/report/_item.html:41 templates/web/base/report/banner.html:12 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:17 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:45 msgid "Fixed" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:13 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:13 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:7 msgid "Fixed - Council" msgstr "" @@ -976,7 +1056,7 @@ msgstr "" msgid "Fixed - User" msgstr "" -#: templates/web/base/reports/_list-filters.html:5 +#: templates/web/base/reports/_list-filters.html:14 msgid "Fixed reports" msgstr "" @@ -984,7 +1064,7 @@ msgstr "" msgid "Fixed:" msgstr "" -#: templates/web/base/admin/body-form.html:95 templates/web/base/admin/responsepriorities/edit.html:31 templates/web/zurich/admin/body-form.html:36 +#: templates/web/base/admin/body-form.html:95 templates/web/base/admin/responsepriorities/edit.html:41 templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "" @@ -1060,7 +1140,7 @@ msgstr "" msgid "Glad to hear it’s been fixed!" msgstr "" -#: templates/web/base/admin/index.html:45 templates/web/base/alert/index.html:34 templates/web/base/around/postcode_form.html:13 templates/web/base/reports/_list-filters.html:29 templates/web/base/reports/_list-filters.html:44 templates/web/zurich/admin/stats.html:26 +#: templates/web/base/admin/index.html:28 templates/web/base/admin/index.html:34 templates/web/base/admin/index.html:49 templates/web/base/alert/index.html:34 templates/web/base/around/postcode_form.html:13 templates/web/base/reports/_list-filters.html:38 templates/web/base/reports/_list-filters.html:53 templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "" @@ -1068,11 +1148,11 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Grant access to the admin" msgstr "" -#: templates/web/base/admin/index.html:70 +#: templates/web/base/admin/index.html:76 msgid "Graph of problem creation by status over time" msgstr "" @@ -1088,7 +1168,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:35 templates/web/zurich/about/faq-de-ch.html:1 templates/web/zurich/footer.html:23 templates/web/zurich/nav_over_content.html:8 +#: templates/web/base/main_nav_items.html:40 templates/web/zurich/about/faq-de-ch.html:1 templates/web/zurich/footer.html:23 templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "" @@ -1104,10 +1184,14 @@ msgstr "" msgid "Hi %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:906 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:19 templates/web/base/admin/report_blocks.html:28 templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:906 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:19 templates/web/base/admin/report_blocks.html:28 templates/web/base/admin/update_edit.html:30 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:12 templates/web/base/report/inspect/state_groups_select.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" +#: templates/web/base/report/_main.html:105 +msgid "Hide entire report" +msgstr "" + #: templates/web/base/around/display_location.html:67 msgid "Hide old" msgstr "" @@ -1116,6 +1200,10 @@ msgstr "" msgid "Hide pins" msgstr "" +#: templates/web/base/report/update.html:15 +msgid "Hide update completely?" +msgstr "" + #: templates/web/base/admin/category_edit.html:49 msgid "History" msgstr "" @@ -1144,7 +1232,7 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" -#: templates/web/base/admin/flagged.html:14 templates/web/base/admin/index.html:54 templates/web/base/admin/list_updates.html:6 templates/web/base/admin/reports.html:12 templates/web/zurich/admin/index-dm.html:21 templates/web/zurich/admin/index-sdm.html:19 templates/web/zurich/admin/list_updates.html:24 templates/web/zurich/admin/list_updates.html:38 templates/web/zurich/admin/reports.html:11 +#: templates/web/base/admin/flagged.html:14 templates/web/base/admin/index.html:60 templates/web/base/admin/list_updates.html:6 templates/web/base/admin/reports.html:12 templates/web/zurich/admin/index-dm.html:21 templates/web/zurich/admin/index-sdm.html:19 templates/web/zurich/admin/list_updates.html:24 templates/web/zurich/admin/list_updates.html:38 templates/web/zurich/admin/reports.html:11 msgid "ID" msgstr "" @@ -1154,6 +1242,10 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" +#: templates/web/base/admin/responsepriorities/edit.html:23 +msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here." +msgstr "" + #: templates/web/base/admin/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" @@ -1164,7 +1256,7 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/admin/responsepriorities/edit.html:23 +#: templates/web/base/admin/responsepriorities/edit.html:33 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1218,7 +1310,7 @@ msgstr "" msgid "Illegal feed selection" msgstr "" -#: templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:43 +#: templates/web/base/dashboard/index.html:139 templates/web/base/dashboard/index.html:141 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:43 msgid "In Progress" msgstr "" @@ -1230,7 +1322,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:192 perllib/FixMyStreet/Cobrand/Zurich.pm:954 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:9 templates/web/base/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:192 perllib/FixMyStreet/Cobrand/Zurich.pm:954 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:9 templates/web/base/report/banner.html:18 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:5 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 msgid "In progress" msgstr "" @@ -1246,7 +1338,7 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:360 +#: perllib/FixMyStreet/App/Controller/Open311.pm:351 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1254,7 +1346,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Instruct contractors to fix problems" msgstr "" @@ -1262,31 +1354,35 @@ msgstr "" msgid "Internal notes" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:18 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:11 msgid "Internal referral" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:345 +#: templates/web/base/offline/appcache.html:3 +msgid "Internet glitch" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:336 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1502 msgid "Invalid end date" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:438 +#: perllib/FixMyStreet/App/Controller/Open311.pm:429 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:384 +#: perllib/FixMyStreet/App/Controller/Report.pm:398 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1481 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 msgid "Invalid start date" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:7 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:7 templates/web/base/dashboard/index.html:139 templates/web/base/dashboard/index.html:140 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:4 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:42 msgid "Investigating" msgstr "" @@ -1310,6 +1406,14 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "" +#: templates/web/base/dashboard/index.html:50 +msgid "Last 4 weeks" +msgstr "" + +#: templates/web/base/dashboard/index.html:49 +msgid "Last 7 days" +msgstr "" + #: templates/web/base/admin/body.html:74 templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "" @@ -1322,11 +1426,11 @@ msgstr "" msgid "Last update:" msgstr "" -#: templates/web/base/report/_item.html:78 +#: templates/web/base/report/_inspect.html:20 templates/web/base/report/_item.html:86 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:41 +#: templates/web/base/reports/_list-filters.html:50 msgid "Least recently updated" msgstr "" @@ -1334,6 +1438,10 @@ msgstr "" msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" +#: templates/web/base/dashboard/index.html:150 +msgid "Less than 7 days old" +msgstr "" + #: templates/web/base/admin/body.html:31 msgid "List all reported problems" msgstr "" @@ -1350,7 +1458,7 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:32 +#: templates/web/base/main_nav_items.html:31 templates/web/base/main_nav_items.html:37 msgid "Local alerts" msgstr "" @@ -1358,15 +1466,31 @@ msgstr "" msgid "Locate the problem on a map of the area" msgstr "" +#: templates/web/base/auth/general.html:22 templates/web/base/report/new/form_user_loggedout.html:6 templates/web/base/report/update/form_user_loggedout.html:7 +msgid "Log in with Facebook" +msgstr "" + +#: templates/web/base/auth/general.html:30 templates/web/base/report/new/form_user_loggedout.html:14 templates/web/base/report/update/form_user_loggedout.html:15 +msgid "Log in with Twitter" +msgstr "" + +#: templates/web/base/js/translation_strings.html:59 +msgid "Log in with email" +msgstr "" + +#: templates/web/base/dashboard/index.html:145 templates/web/base/dashboard/index.html:38 +msgid "Look up" +msgstr "" + #: templates/web/base/js/translation_strings.html:44 msgid "MAP" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:36 +#: templates/web/base/reports/_list-filters.html:45 msgid "Manual order" msgstr "" @@ -1390,7 +1514,7 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Markup problem details" msgstr "" @@ -1410,7 +1534,7 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:446 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Missing jurisdiction_id" msgstr "" @@ -1418,7 +1542,7 @@ msgstr "" msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:707 +#: perllib/FixMyStreet/Cobrand/Default.pm:706 msgid "Moderate report details" msgstr "" @@ -1426,19 +1550,31 @@ msgstr "" msgid "Moderate this report" msgstr "" +#: templates/web/base/report/update.html:12 +msgid "Moderate this update" +msgstr "" + +#: templates/web/base/report/_main.html:69 templates/web/base/report/update.html:49 +msgid "Moderated by %s at %s" +msgstr "" + #: templates/web/zurich/admin/stats.html:34 msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/report/_main.html:109 templates/web/base/report/update.html:57 +msgid "Moderation reason:" +msgstr "" + #: templates/web/base/admin/stats.html:11 msgid "Month" msgstr "" -#: templates/web/base/reports/_list-filters.html:42 +#: templates/web/base/reports/_list-filters.html:51 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 templates/web/base/admin/body-form.html:24 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/index.html:56 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reports.html:14 templates/web/base/admin/responsepriorities/list.html:6 templates/web/base/admin/users.html:16 templates/web/base/auth/general.html:106 templates/web/base/report/new/form_user_loggedin.html:40 templates/web/base/report/new/form_user_loggedout_by_email.html:7 templates/web/base/report/update/form_name.html:23 templates/web/base/reports/index.html:23 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/auth/general.html:60 templates/web/zurich/report/new/fill_in_details_form.html:59 +#: templates/web/base/admin/bodies.html:25 templates/web/base/admin/body-form.html:24 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/index.html:62 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reports.html:14 templates/web/base/admin/responsepriorities/list.html:6 templates/web/base/admin/users.html:16 templates/web/base/auth/general.html:106 templates/web/base/report/new/form_user_loggedin.html:40 templates/web/base/report/new/form_user_loggedout_by_email.html:7 templates/web/base/report/update/form_name.html:23 templates/web/base/reports/index.html:23 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/auth/general.html:60 templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "" @@ -1450,7 +1586,7 @@ msgstr "" msgid "Name: %s" msgstr "" -#: templates/web/base/report/_inspect.html:22 +#: templates/web/base/report/_inspect.html:28 msgid "Navigate to this problem" msgstr "" @@ -1458,7 +1594,7 @@ msgstr "" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:129 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" @@ -1466,7 +1602,7 @@ msgstr "" msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:323 +#: perllib/FixMyStreet/Script/Alerts.pm:319 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1544,7 +1680,7 @@ msgstr "" msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:38 +#: templates/web/base/reports/_list-filters.html:47 msgid "Newest" msgstr "" @@ -1552,7 +1688,7 @@ msgstr "" msgid "Next" msgstr "" -#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:137 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:26 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:55 +#: perllib/FixMyStreet/Cobrand/Default.pm:1203 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:137 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:26 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:55 msgid "No" msgstr "" @@ -1568,7 +1704,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:430 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "No council selected" msgstr "" @@ -1584,7 +1720,7 @@ msgstr "" msgid "No flagged users found." msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:14 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:14 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:8 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44 msgid "No further action" msgstr "" @@ -1592,6 +1728,14 @@ msgstr "" msgid "No further updates" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84 +msgid "No inspections by that inspector in the selected date range." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86 +msgid "No inspections in the selected date range." +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "" @@ -1624,7 +1768,7 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:15 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:15 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:9 templates/web/base/report/update/form_update.html:41 templates/web/base/report/update/form_update.html:44 msgid "Not Responsible" msgstr "" @@ -1676,6 +1820,14 @@ msgstr "" msgid "OK" msgstr "" +#: templates/web/base/js/translation_strings.html:67 +msgid "Offline data cleared" +msgstr "" + +#: templates/web/base/js/translation_strings.html:64 +msgid "Offline update data saved" +msgstr "" + #: templates/web/base/reports/index.html:26 msgid "Old / unknown <br>problems" msgstr "" @@ -1692,11 +1844,11 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:48 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:169 perllib/FixMyStreet/Cobrand/Zurich.pm:900 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:25 templates/web/base/admin/report_blocks.html:6 templates/web/base/admin/update_edit.html:30 templates/web/base/dashboard/index.html:140 templates/web/base/report/update/form_update.html:41 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/update_edit.html:18 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:169 perllib/FixMyStreet/Cobrand/Zurich.pm:900 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:25 templates/web/base/admin/report_blocks.html:6 templates/web/base/admin/update_edit.html:30 templates/web/base/dashboard/index.html:139 templates/web/base/report/inspect/state_groups_select.html:1 templates/web/base/report/inspect/state_groups_select.html:16 templates/web/base/report/inspect/state_groups_select.html:3 templates/web/base/report/update/form_update.html:41 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/update_edit.html:18 msgid "Open" msgstr "" @@ -1736,7 +1888,7 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/App/Controller/Report/New.pm:659 perllib/FixMyStreet/DB/Result/Problem.pm:595 perllib/FixMyStreet/DB/Result/Problem.pm:602 perllib/FixMyStreet/DB/Result/Problem.pm:617 perllib/FixMyStreet/DB/Result/Problem.pm:626 perllib/FixMyStreet/Script/Reports.pm:185 perllib/FixMyStreet/Script/Reports.pm:200 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/App/Controller/Report/New.pm:659 perllib/FixMyStreet/DB/Result/Problem.pm:642 perllib/FixMyStreet/DB/Result/Problem.pm:649 perllib/FixMyStreet/DB/Result/Problem.pm:664 perllib/FixMyStreet/DB/Result/Problem.pm:673 perllib/FixMyStreet/Script/Reports.pm:183 perllib/FixMyStreet/Script/Reports.pm:198 msgid "Other" msgstr "" @@ -1764,11 +1916,11 @@ msgstr "" msgid "Password:" msgstr "" -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:52 msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:144 msgid "Permissions:" msgstr "" @@ -1808,7 +1960,7 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:940 perllib/FixMyStreet/Cobrand/Zurich.pm:946 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:8 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:940 perllib/FixMyStreet/Cobrand/Zurich.pm:946 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:8 templates/web/base/dashboard/index.html:139 templates/web/base/dashboard/index.html:140 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 msgid "Planned" msgstr "" @@ -1824,11 +1976,11 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:350 perllib/FixMyStreet/App/Controller/Report/New.pm:845 perllib/FixMyStreet/App/Controller/Report/New.pm:868 perllib/FixMyStreet/DB/Result/Problem.pm:441 templates/web/base/js/translation_strings.html:9 +#: perllib/FixMyStreet/App/Controller/Admin.pm:350 perllib/FixMyStreet/App/Controller/Report/New.pm:844 perllib/FixMyStreet/App/Controller/Report/New.pm:867 perllib/FixMyStreet/DB/Result/Problem.pm:456 templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:447 +#: perllib/FixMyStreet/DB/Result/Problem.pm:462 msgid "Please choose a property type" msgstr "" @@ -1851,7 +2003,7 @@ msgstr "" msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1204 perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 perllib/FixMyStreet/App/Controller/Admin.pm:1364 msgid "Please enter a name" msgstr "" @@ -1863,11 +2015,11 @@ msgstr "" msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:114 perllib/FixMyStreet/DB/Result/Problem.pm:424 templates/web/base/js/translation_strings.html:3 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 perllib/FixMyStreet/DB/Result/Problem.pm:439 templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 perllib/FixMyStreet/App/Controller/Admin.pm:1359 perllib/FixMyStreet/App/Controller/Admin.pm:363 perllib/FixMyStreet/DB/Result/User.pm:164 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 perllib/FixMyStreet/App/Controller/Admin.pm:1361 perllib/FixMyStreet/App/Controller/Admin.pm:363 perllib/FixMyStreet/DB/Result/User.pm:164 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" msgstr "" @@ -1875,7 +2027,7 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:427 templates/web/base/js/translation_strings.html:4 +#: perllib/FixMyStreet/DB/Result/Problem.pm:442 templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "" @@ -1891,11 +2043,11 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:319 templates/web/base/js/translation_strings.html:7 +#: perllib/FixMyStreet/Cobrand/UK.pm:320 templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:112 perllib/FixMyStreet/DB/Result/Comment.pm:124 perllib/FixMyStreet/DB/Result/Problem.pm:435 perllib/FixMyStreet/DB/Result/User.pm:157 templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 perllib/FixMyStreet/DB/Result/Comment.pm:124 perllib/FixMyStreet/DB/Result/Problem.pm:450 perllib/FixMyStreet/DB/Result/User.pm:157 templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -1951,7 +2103,7 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:358 msgid "Please provide a public update for this report." msgstr "" @@ -1983,7 +2135,7 @@ msgstr "" msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:129 perllib/FixMyStreet/App/Model/PhotoSet.pm:163 perllib/FixMyStreet/App/Model/PhotoSet.pm:165 templates/web/base/js/translation_strings.html:54 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122 perllib/FixMyStreet/App/Model/PhotoSet.pm:156 perllib/FixMyStreet/App/Model/PhotoSet.pm:158 templates/web/base/js/translation_strings.html:57 msgid "Please upload an image only" msgstr "" @@ -2003,15 +2155,15 @@ msgstr "" msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:257 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:250 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Posted by <strong>%s</strong> (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:252 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by <strong>%s</strong> at %s" msgstr "" @@ -2027,11 +2179,11 @@ msgstr "" msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:96 templates/web/base/report/_item.html:90 +#: templates/web/base/report/_inspect.html:113 templates/web/base/report/_item.html:98 msgid "Priority" msgstr "" -#: templates/web/base/footer.html:38 +#: templates/web/base/main_nav_items.html:43 msgid "Privacy" msgstr "" @@ -2067,7 +2219,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1171 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1167 msgid "Problem marked as open." msgstr "" @@ -2075,7 +2227,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:706 templates/web/base/admin/flagged.html:10 +#: perllib/FixMyStreet/Cobrand/Default.pm:705 templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -2095,11 +2247,11 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:834 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 perllib/FixMyStreet/Cobrand/UK.pm:208 +#: perllib/FixMyStreet/Cobrand/Default.pm:833 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 perllib/FixMyStreet/Cobrand/UK.pm:209 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:222 +#: perllib/FixMyStreet/Cobrand/UK.pm:223 msgid "Problems within %s ward" msgstr "" @@ -2140,7 +2292,7 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:152 msgid "Public update:" msgstr "" @@ -2168,19 +2320,19 @@ msgstr "" msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 +#: perllib/FixMyStreet/Cobrand/UK.pm:252 perllib/FixMyStreet/Cobrand/UK.pm:264 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 +#: perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270 msgid "RSS feed for %s ward, %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:153 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:153 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2188,11 +2340,11 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:835 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 perllib/FixMyStreet/Cobrand/UK.pm:215 +#: perllib/FixMyStreet/Cobrand/Default.pm:834 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 perllib/FixMyStreet/Cobrand/UK.pm:216 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2208,7 +2360,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:720 +#: perllib/FixMyStreet/DB/Result/Problem.pm:801 msgid "Received by %s moments later" msgstr "" @@ -2225,7 +2377,7 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:40 +#: templates/web/base/reports/_list-filters.html:49 msgid "Recently updated" msgstr "" @@ -2257,11 +2409,11 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:10 templates/web/base/report/_item.html:68 +#: templates/web/base/report/_inspect.html:10 templates/web/base/report/_item.html:76 msgid "Report ID:" msgstr "" -#: templates/web/base/footer.html:23 templates/web/base/header_logo.html:2 templates/web/zurich/footer.html:19 templates/web/zurich/nav_over_content.html:4 +#: templates/web/base/header_logo.html:2 templates/web/base/main_nav_items.html:1 templates/web/zurich/footer.html:19 templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" @@ -2277,6 +2429,10 @@ msgstr "" msgid "Report on %s" msgstr "" +#: templates/web/base/dashboard/index.html:137 +msgid "Report state:" +msgstr "" + #: templates/web/base/report/new/fill_in_details_form.html:1 templates/web/base/report/new/login_success_form.html:1 templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2285,7 +2441,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:606 templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:653 templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "" @@ -2293,7 +2449,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:630 templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:677 templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "" @@ -2305,27 +2461,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:674 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 +#: perllib/FixMyStreet/DB/Result/Problem.pm:647 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:671 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/Result/Problem.pm:644 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/DB/Result/Problem.pm:666 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2341,11 +2497,11 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 perllib/FixMyStreet/Cobrand/Zurich.pm:383 templates/web/zurich/header.html:52 +#: perllib/FixMyStreet/Cobrand/Default.pm:655 perllib/FixMyStreet/Cobrand/Zurich.pm:383 templates/web/base/dashboard/index.html:134 templates/web/zurich/header.html:52 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 +#: perllib/FixMyStreet/Cobrand/UK.pm:329 perllib/FixMyStreet/Cobrand/UK.pm:333 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2353,10 +2509,6 @@ msgstr "" msgid "Reports awaiting approval" msgstr "" -#: templates/web/base/admin/user-form.html:127 -msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors." -msgstr "" - #: templates/web/base/admin/user-form.html:107 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -2365,7 +2517,11 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/admin/index.html:50 +#: templates/web/base/js/translation_strings.html:68 +msgid "Reports saved offline." +msgstr "" + +#: templates/web/base/admin/index.html:56 msgid "Reports waiting to be sent" msgstr "" @@ -2377,10 +2533,6 @@ msgstr "" msgid "Reputation threshold" msgstr "" -#: templates/web/base/admin/user-form.html:130 -msgid "Reputation:" -msgstr "" - #: templates/web/base/admin/report_edit.html:84 msgid "Resend report" msgstr "" @@ -2409,6 +2561,18 @@ msgstr "" msgid "Response Templates for %s" msgstr "" +#: templates/web/base/report/update.html:40 +msgid "Revert to original" +msgstr "" + +#: templates/web/base/report/_main.html:95 +msgid "Revert to original text" +msgstr "" + +#: templates/web/base/report/_main.html:50 +msgid "Revert to original title" +msgstr "" + #: templates/web/base/js/translation_strings.html:28 templates/web/base/js/translation_strings.html:40 msgid "Right place?" msgstr "" @@ -2421,11 +2585,11 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1726 perllib/FixMyStreet/App/Controller/Admin.pm:1730 templates/web/base/admin/report_edit.html:163 templates/web/base/admin/update_edit.html:66 templates/web/zurich/admin/report_edit.html:118 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1743 perllib/FixMyStreet/App/Controller/Admin.pm:1747 templates/web/base/admin/report_edit.html:163 templates/web/base/admin/update_edit.html:66 templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1726 templates/web/base/admin/report_edit.html:164 templates/web/base/admin/update_edit.html:67 templates/web/zurich/admin/report_edit.html:119 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1743 templates/web/base/admin/report_edit.html:164 templates/web/base/admin/update_edit.html:67 templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "" @@ -2433,27 +2597,33 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:47 templates/web/base/maps/google-ol.html:11 +#: templates/web/base/js/translation_strings.html:47 templates/web/base/maps/google-ol.html:16 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:150 +#: templates/web/base/report/_inspect.html:168 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:137 templates/web/base/admin/responsepriorities/edit.html:36 templates/web/base/admin/template_edit.html:46 templates/web/base/report/_inspect.html:150 templates/web/zurich/admin/body.html:62 templates/web/zurich/admin/contact-form.html:20 templates/web/zurich/admin/template_edit.html:29 +#: templates/web/base/admin/contact-form.html:137 templates/web/base/admin/responsepriorities/edit.html:46 templates/web/base/admin/template_edit.html:46 templates/web/base/report/_inspect.html:168 templates/web/base/report/_main.html:113 templates/web/base/report/update.html:60 templates/web/zurich/admin/body.html:62 templates/web/zurich/admin/contact-form.html:20 templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "" -#: templates/web/base/report/_inspect.html:130 +#: templates/web/base/report/_inspect.html:148 msgid "Save with a public update" msgstr "" -#: templates/web/base/admin/index.html:24 templates/web/base/admin/reports.html:1 templates/web/zurich/admin/reports.html:1 +#. ('This is followed by a progress count, e.g. 3/5') +#. ("This is followed by a progress count, e.g. 3/5") +#: templates/web/base/js/translation_strings.html:69 +msgid "Saving reports offline" +msgstr "" + +#: templates/web/base/admin/index.html:26 templates/web/base/admin/reports.html:1 templates/web/zurich/admin/reports.html:1 msgid "Search Reports" msgstr "" -#: templates/web/base/admin/index.html:29 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 msgid "Search Users" msgstr "" @@ -2477,7 +2647,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "See user detail for reports created as the council" msgstr "" @@ -2509,7 +2679,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:724 +#: perllib/FixMyStreet/DB/Result/Problem.pm:804 msgid "Sent to %s %s later" msgstr "" @@ -2521,7 +2691,7 @@ msgstr "" msgid "Service:" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:31 msgid "Set to my current location" msgstr "" @@ -2529,11 +2699,11 @@ msgstr "" msgid "Share" msgstr "" -#: templates/web/base/report/_main.html:136 templates/web/base/report/_main.html:21 templates/web/base/report/_main.html:29 +#: templates/web/base/main_nav_items.html:10 templates/web/base/report/_main.html:136 templates/web/base/report/_main.html:21 templates/web/base/report/_main.html:29 msgid "Shortlist" msgstr "" -#: templates/web/base/report/_main.html:134 templates/web/base/report/_main.html:20 templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:134 templates/web/base/report/_main.html:20 templates/web/base/report/_main.html:25 templates/web/base/reports/_list-filters.html:9 msgid "Shortlisted" msgstr "" @@ -2541,19 +2711,35 @@ msgstr "" msgid "Shortlisted by %s" msgstr "" +#: templates/web/base/report/update.html:20 +msgid "Show Photo?" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:54 templates/web/base/report/new/form_user_loggedout_by_email.html:22 templates/web/base/report/update/form_name.html:33 msgid "Show my name publicly" msgstr "" +#: templates/web/base/report/update.html:17 +msgid "Show name publicly?" +msgstr "" + #: templates/web/base/around/display_location.html:69 msgid "Show old" msgstr "" +#: templates/web/base/report/_main.html:79 +msgid "Show photo" +msgstr "" + #: templates/web/base/around/display_location.html:60 msgid "Show pins" msgstr "" -#: templates/web/base/auth/general.html:117 templates/web/base/auth/general.html:3 templates/web/base/auth/general.html:86 templates/web/base/footer.html:26 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35 +#: templates/web/base/report/_main.html:60 +msgid "Show reporter’s name" +msgstr "" + +#: templates/web/base/auth/general.html:117 templates/web/base/auth/general.html:3 templates/web/base/auth/general.html:86 templates/web/base/main_nav_items.html:6 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35 msgid "Sign in" msgstr "" @@ -2588,7 +2774,7 @@ msgstr "" msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:79 +#: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2612,15 +2798,21 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:146 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:139 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" +#: templates/web/base/offline/appcache.html:5 +msgid "" +"Sorry, we don’t have a good enough connection to fetch that page, or the\n" +"page wasn’t found or there was a server error. Please try again later." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Root.pm:107 msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:33 +#: templates/web/base/reports/_list-filters.html:42 msgid "Sort by" msgstr "" @@ -2636,7 +2828,7 @@ msgstr "" msgid "Start Date:" msgstr "" -#: templates/web/base/admin/body.html:73 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:58 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:16 templates/web/base/admin/template_edit.html:40 templates/web/base/report/_inspect.html:66 templates/web/base/report/_item.html:86 templates/web/base/report/update/form_update.html:39 +#: templates/web/base/admin/body.html:73 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:64 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:16 templates/web/base/admin/template_edit.html:40 templates/web/base/report/_inspect.html:83 templates/web/base/report/_item.html:94 templates/web/base/report/update/form_update.html:39 msgid "State" msgstr "" @@ -2644,7 +2836,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:640 perllib/FixMyStreet/Cobrand/Zurich.pm:386 templates/web/base/admin/index.html:65 templates/web/base/admin/stats.html:1 templates/web/base/admin/stats_by_state.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 perllib/FixMyStreet/Cobrand/Zurich.pm:386 templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 templates/web/base/admin/stats_by_state.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 msgid "Stats" msgstr "" @@ -2660,7 +2852,7 @@ msgstr "" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:194 +#: perllib/FixMyStreet/Script/Reports.pm:192 msgid "Subcategory: %s" msgstr "" @@ -2680,7 +2872,7 @@ msgstr "" msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:174 templates/web/base/admin/report_edit.html:24 templates/web/base/admin/update_edit.html:77 templates/web/base/admin/user-form.html:177 templates/web/zurich/admin/report_edit-sdm.html:124 templates/web/zurich/admin/report_edit.html:264 templates/web/zurich/admin/update_edit.html:38 +#: templates/web/base/admin/report_edit.html:174 templates/web/base/admin/report_edit.html:24 templates/web/base/admin/update_edit.html:77 templates/web/base/admin/user-form.html:170 templates/web/zurich/admin/report_edit-sdm.html:124 templates/web/zurich/admin/report_edit.html:264 templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -2716,11 +2908,11 @@ msgstr "" msgid "Summary reports" msgstr "" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:133 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:138 +#: templates/web/base/admin/user-form.html:130 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin." msgstr "" @@ -2776,7 +2968,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:170 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:163 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2788,7 +2980,7 @@ msgstr "" msgid "That location does not appear to be in the UK; please try again." msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50 perllib/FixMyStreet/Cobrand/UK.pm:72 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50 perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -2928,7 +3120,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:759 perllib/FixMyStreet/App/Controller/Report/Update.pm:152 templates/web/base/auth/general.html:53 templates/web/zurich/auth/general.html:28 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:758 perllib/FixMyStreet/App/Controller/Report/Update.pm:152 templates/web/base/auth/general.html:53 templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -2994,15 +3186,15 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:201 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:204 +#: perllib/FixMyStreet/Script/Reports.pm:202 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:882 perllib/FixMyStreet/App/Controller/Report/New.pm:926 perllib/FixMyStreet/App/Controller/Report/New.pm:972 perllib/FixMyStreet/Cobrand/UK.pm:44 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:881 perllib/FixMyStreet/App/Controller/Report/New.pm:925 perllib/FixMyStreet/App/Controller/Report/New.pm:971 perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -3018,14 +3210,18 @@ msgstr "" msgid "This pothole has been here for two months and…" msgstr "" -#: templates/web/base/report/update/form_update.html:59 +#: templates/web/base/report/update/form_update.html:63 msgid "This problem has been fixed" msgstr "" -#: templates/web/base/report/update/form_update.html:53 +#: templates/web/base/report/update/form_update.html:56 msgid "This problem has not been fixed" msgstr "" +#: templates/web/base/report/update/form_update.html:54 +msgid "This problem is still ongoing" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:3 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -3066,7 +3262,7 @@ msgstr "" msgid "Tips for perfect photos" msgstr "" -#: templates/web/base/admin/flagged.html:15 templates/web/base/admin/index.html:55 templates/web/base/admin/reports.html:13 templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/flagged.html:15 templates/web/base/admin/index.html:61 templates/web/base/admin/reports.html:13 templates/web/base/admin/templates.html:10 msgid "Title" msgstr "" @@ -3090,7 +3286,23 @@ msgstr "" msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:107 templates/web/base/report/_item.html:94 +#: templates/web/base/dashboard/index.html:97 +msgid "Total marked" +msgstr "" + +#: templates/web/base/dashboard/index.html:71 +msgid "Total marked as fixed" +msgstr "" + +#: templates/web/base/dashboard/index.html:125 +msgid "Total not marked" +msgstr "" + +#: templates/web/base/dashboard/index.html:54 templates/web/base/dashboard/index.html:56 +msgid "Total reports received" +msgstr "" + +#: templates/web/base/report/_inspect.html:124 templates/web/base/report/_item.html:102 msgid "Traffic management required?" msgstr "" @@ -3098,7 +3310,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -3118,7 +3330,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/reports/_list-filters.html:3 +#: templates/web/base/reports/_list-filters.html:12 templates/web/base/reports/_list-filters.html:5 msgid "Unfixed reports" msgstr "" @@ -3138,6 +3350,10 @@ msgstr "" msgid "Unknown problem ID" msgstr "" +#: templates/web/base/reports/_list-filters.html:10 +msgid "Unshortlisted" +msgstr "" + #: templates/web/base/report/_item.html:24 msgid "Up one" msgstr "" @@ -3190,7 +3406,7 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1161 perllib/FixMyStreet/App/Controller/Admin.pm:1223 perllib/FixMyStreet/App/Controller/Admin.pm:1376 perllib/FixMyStreet/App/Controller/Admin.pm:824 perllib/FixMyStreet/Cobrand/Zurich.pm:762 perllib/FixMyStreet/Cobrand/Zurich.pm:787 perllib/FixMyStreet/Cobrand/Zurich.pm:857 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1157 perllib/FixMyStreet/App/Controller/Admin.pm:1221 perllib/FixMyStreet/App/Controller/Admin.pm:1384 perllib/FixMyStreet/App/Controller/Admin.pm:822 perllib/FixMyStreet/Cobrand/Zurich.pm:762 perllib/FixMyStreet/Cobrand/Zurich.pm:787 perllib/FixMyStreet/Cobrand/Zurich.pm:857 msgid "Updated!" msgstr "" @@ -3227,23 +3443,27 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1683 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1700 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1672 msgid "User flagged" msgstr "" +#: templates/web/base/dashboard/index.html:54 templates/web/base/dashboard/index.html:58 +msgid "User has marked as fixed" +msgstr "" + #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 perllib/FixMyStreet/Cobrand/Default.pm:724 perllib/FixMyStreet/Cobrand/Zurich.pm:398 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: perllib/FixMyStreet/Cobrand/Default.pm:669 perllib/FixMyStreet/Cobrand/Default.pm:723 perllib/FixMyStreet/Cobrand/Zurich.pm:398 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:149 +#: templates/web/base/admin/user-form.html:141 msgid "Users can perform the following actions within their assigned body or area." msgstr "" @@ -3267,6 +3487,15 @@ msgstr "" msgid "Viewing a problem" msgstr "" +#. ("Week to date") +#: templates/web/base/dashboard/index.html:48 +msgid "WTD" +msgstr "" + +#: templates/web/base/dashboard/index.html:20 +msgid "Ward:" +msgstr "" + #: templates/web/base/reports/body.html:16 msgid "Wards of this council" msgstr "" @@ -3283,7 +3512,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:210 +#: perllib/FixMyStreet/Script/Reports.pm:208 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -3299,6 +3528,10 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" +#: templates/web/base/dashboard/index.html:48 +msgid "Week To Date" +msgstr "" + #: templates/web/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3315,11 +3548,11 @@ msgstr "" msgid "When sent" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:89 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -3351,11 +3584,16 @@ msgstr "" msgid "Wrong location? Just click again on the map." msgstr "" +#. ("Year to date") +#: templates/web/base/dashboard/index.html:51 +msgid "YTD" +msgstr "" + #: templates/web/base/admin/stats.html:10 msgid "Year" msgstr "" -#: templates/web/base/admin/bodies.html:70 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:5 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:136 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/users.html:32 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:104 templates/web/base/questionnaire/index.html:53 +#: perllib/FixMyStreet/Cobrand/Default.pm:1202 templates/web/base/admin/bodies.html:70 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/body.html:92 templates/web/base/admin/body.html:94 templates/web/base/admin/category_edit.html:5 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:136 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/users.html:32 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:104 templates/web/base/questionnaire/index.html:53 msgid "Yes" msgstr "" @@ -3367,6 +3605,10 @@ msgstr "" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" +#: templates/web/base/js/translation_strings.html:70 +msgid "You are offline" +msgstr "" + #: templates/web/base/contact/unsuitable-text.html:2 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" @@ -3406,6 +3648,10 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "" +#: templates/web/base/js/translation_strings.html:72 +msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" @@ -3457,7 +3703,7 @@ msgstr "" msgid "Your Reports" msgstr "" -#: templates/web/base/auth/change_password.html:11 templates/web/base/footer.html:26 templates/web/base/my/my.html:18 +#: templates/web/base/auth/change_password.html:11 templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" @@ -3477,6 +3723,10 @@ msgstr "" msgid "Your name" msgstr "" +#: templates/web/base/js/translation_strings.html:62 +msgid "Your offline reports" +msgstr "" + #: templates/web/base/auth/general.html:85 templates/web/base/report/new/form_user_loggedout_password.html:10 templates/web/base/report/update/form_user_loggedout_password.html:9 templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "" @@ -3501,6 +3751,10 @@ msgstr "" msgid "Your shortlist" msgstr "" +#: templates/web/base/js/translation_strings.html:63 +msgid "Your update has been saved offline for submission when back online." +msgstr "" + #: templates/web/base/my/my.html:51 msgid "Your updates" msgstr "" @@ -3509,7 +3763,7 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/category-checkboxes.html:7 templates/web/base/admin/user-form.html:159 +#: templates/web/base/admin/category-checkboxes.html:7 templates/web/base/admin/user-form.html:151 msgid "all" msgstr "" @@ -3517,7 +3771,7 @@ msgstr "" msgid "by %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:288 +#: perllib/FixMyStreet/DB/Result/Comment.pm:290 msgid "closed as a duplicate report" msgstr "" @@ -3541,47 +3795,47 @@ msgstr "" msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:54 templates/web/zurich/report/_item.html:14 +#: templates/web/base/report/_item.html:61 templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:206 +#: perllib/Utils.pm:227 msgid "less than a minute" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/Result/Comment.pm:280 msgid "marked as action scheduled" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:290 +#: perllib/FixMyStreet/DB/Result/Comment.pm:292 msgid "marked as an internal referral" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:280 +#: perllib/FixMyStreet/DB/Result/Comment.pm:282 msgid "marked as closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:261 perllib/FixMyStreet/DB/Result/Comment.pm:282 +#: perllib/FixMyStreet/DB/Result/Comment.pm:263 perllib/FixMyStreet/DB/Result/Comment.pm:284 msgid "marked as fixed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:276 +#: perllib/FixMyStreet/DB/Result/Comment.pm:278 msgid "marked as in progress" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:274 msgid "marked as investigating" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:284 +#: perllib/FixMyStreet/DB/Result/Comment.pm:286 msgid "marked as no further action" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:286 +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 msgid "marked as not the council's responsibility" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:274 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as planned" msgstr "" @@ -3589,7 +3843,7 @@ msgstr "" msgid "n/a" msgstr "" -#: templates/web/base/admin/category-checkboxes.html:8 templates/web/base/admin/user-form.html:160 +#: templates/web/base/admin/category-checkboxes.html:8 templates/web/base/admin/user-form.html:152 msgid "none" msgstr "" @@ -3613,7 +3867,7 @@ msgstr "" msgid "other areas:" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:263 perllib/FixMyStreet/DB/Result/Comment.pm:269 +#: perllib/FixMyStreet/DB/Result/Comment.pm:265 perllib/FixMyStreet/DB/Result/Comment.pm:271 msgid "reopened" msgstr "" @@ -3633,7 +3887,7 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:186 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "this type of local problem" msgstr "" @@ -3641,6 +3895,14 @@ msgstr "" msgid "today" msgstr "" +#: templates/web/base/js/translation_strings.html:73 +msgid "update" +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "updates" +msgstr "" + #: templates/web/base/admin/report_edit.html:52 msgid "used map" msgstr "" @@ -3657,27 +3919,41 @@ msgstr "" msgid "ward" msgstr "" -#: perllib/Utils.pm:223 +#: templates/web/base/admin/bodies.html:56 +#, perl-format +msgid "%d address" +msgid_plural "%d addresses" +msgstr[0] "" +msgstr[1] "" + +#: perllib/Utils.pm:250 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:225 +#: perllib/Utils.pm:252 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:254 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" +#: perllib/Utils.pm:246 +#, perl-format +msgid "%d month" +msgid_plural "%d months" +msgstr[0] "" +msgstr[1] "" + #: templates/web/base/report/_support.html:6 #, perl-format msgid "%d supporter" @@ -3685,13 +3961,20 @@ msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:221 +#: perllib/Utils.pm:248 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" +#: perllib/Utils.pm:244 +#, perl-format +msgid "%d year" +msgid_plural "%d years" +msgstr[0] "" +msgstr[1] "" + #: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" @@ -3720,6 +4003,13 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "" msgstr[1] "" +#: templates/web/base/report/_item.html:49 +#, perl-format +msgid "Reported %d day ago" +msgid_plural "Reported %d days ago" +msgstr[0] "" +msgstr[1] "" + #: templates/web/base/report/new/top_message_some.html:3 #, perl-format msgid "We do <strong>not</strong> yet have details for the other council that covers this location." @@ -3733,3 +4023,17 @@ msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." msgstr[0] "" msgstr[1] "" + +#: templates/web/base/report/_item.html:59 +#, perl-format +msgid "last updated %d day ago" +msgid_plural "last updated %d days ago" +msgstr[0] "" +msgstr[1] "" + +#: templates/email/oxfordshire/archive.txt:9 +#, perl-format +msgid "report" +msgid_plural "reports" +msgstr[0] "" +msgstr[1] "" diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm index 78247e39d..3e262a700 100644 --- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm +++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm @@ -162,10 +162,10 @@ sub admin_pages { # Oxfordshire have a custom admin page for downloading reports in an Exor- # friendly format which anyone with report_instruct permission can use. if ( $user->has_body_permission_to('report_instruct') ) { - $pages->{exordefects} = [ _('Download Exor RDI'), 10 ]; + $pages->{exordefects} = [ ('Download Exor RDI'), 10 ]; } if ( $user->has_body_permission_to('defect_type_edit') ) { - $pages->{defecttypes} = [ _('Defect Types'), 11 ]; + $pages->{defecttypes} = [ ('Defect Types'), 11 ]; $pages->{defecttype_edit} = [ undef, undef ]; }; diff --git a/perllib/FixMyStreet/Template.pm b/perllib/FixMyStreet/Template.pm index f41d11b69..4a9cffecb 100644 --- a/perllib/FixMyStreet/Template.pm +++ b/perllib/FixMyStreet/Template.pm @@ -62,7 +62,7 @@ sub loc : Fn { =head2 nget - [% nget( 'singular', 'plural', $number ) %] + [% nget( 'singular', 'plural', $number ) %] Use first or second string depending on the number. diff --git a/templates/web/base/admin/defecttypes/edit.html b/templates/web/base/admin/defecttypes/edit.html index 65c8a5ab7..a3b324d11 100644 --- a/templates/web/base/admin/defecttypes/edit.html +++ b/templates/web/base/admin/defecttypes/edit.html @@ -1,7 +1,7 @@ -[% INCLUDE 'admin/header.html' title=tprintf(loc('Defect Type for %s'), body.name) -%] +[% INCLUDE 'admin/header.html' title=tprintf(('Defect Type for %s'), body.name) -%] [% dt = defect_type %] -[% UNLESS dt.id %]<h3>[% loc('New defect type') %]</h3>[% END %] +[% UNLESS dt.id %]<h3>[% ('New defect type') %]</h3>[% END %] <form method="post" action="[% c.uri_for('', body.id, dt.id || 'new' ) %]" @@ -10,17 +10,17 @@ class="validate"> <p> - <strong>[% loc('Name:') %] </strong> + <strong>[% ('Name:') %] </strong> <input type="text" name="name" class="required form-control" size="30" value="[% dt.name | html %]"> </p> <p> - <strong>[% loc('Description:') %] </strong> + <strong>[% ('Description:') %] </strong> <input type="text" name="description" class="form-control" size="30" value="[% dt.description | html %]"> </p> <div class="admin-hint"> <p> - [% loc('If you only want this defect type to be an option for specific categories, pick them here. By default they will show for all categories.') %] + [% ('If you only want this defect type to be an option for specific categories, pick them here. By default they will show for all categories.') %] </p> </div> @@ -30,7 +30,7 @@ <p> <input type="hidden" name="token" value="[% csrf_token %]" > - <input type="submit" class="btn" name="save" value="[% dt.id ? loc('Save changes') : loc('Create defect type') %]" > + <input type="submit" class="btn" name="save" value="[% dt.id ? ('Save changes') : ('Create defect type') %]" > </p> </form> diff --git a/templates/web/base/admin/defecttypes/index.html b/templates/web/base/admin/defecttypes/index.html index 2e6ce7e1b..c45a09e6e 100644 --- a/templates/web/base/admin/defecttypes/index.html +++ b/templates/web/base/admin/defecttypes/index.html @@ -1,4 +1,4 @@ -[% INCLUDE 'admin/header.html' title=loc('Defect Types') -%] +[% INCLUDE 'admin/header.html' title=('Defect Types') -%] <ul> [% FOR body IN bodies %] diff --git a/templates/web/base/admin/defecttypes/list.html b/templates/web/base/admin/defecttypes/list.html index 1a9cb4fa7..783bd085c 100644 --- a/templates/web/base/admin/defecttypes/list.html +++ b/templates/web/base/admin/defecttypes/list.html @@ -1,11 +1,11 @@ -[% INCLUDE 'admin/header.html' title=tprintf(loc('Defect Types for %s'), body.name) -%] +[% INCLUDE 'admin/header.html' title=tprintf(('Defect Types for %s'), body.name) -%] <table> <thead> <tr> - <th> [% loc('Name') %] </th> - <th> [% loc('Description') %] </th> - <th> [% loc('Categories') %] </th> + <th> [% ('Name') %] </th> + <th> [% ('Description') %] </th> + <th> [% ('Categories') %] </th> <th> </th> </tr> </thead> @@ -17,19 +17,19 @@ <td> [% d.description | html %] </td> <td> [% UNLESS d.contacts.size %] - <em>[% loc('All categories') %]</em> + <em>[% ('All categories') %]</em> [% ELSE %] [% FOR contact IN d.contacts %] [% contact.category %][% ',' UNLESS loop.last %] [% END %] [% END %] </td> - <td> <a href="[% c.uri_for('', body.id, d.id) %]" class="btn">[% loc('Edit') %]</a> </td> + <td> <a href="[% c.uri_for('', body.id, d.id) %]" class="btn">[% ('Edit') %]</a> </td> </tr> [% END %] </tbody> </table> -<a href="[% c.uri_for('', body.id, 'new') %]" class="btn">[% loc('New defect type') %]</a> +<a href="[% c.uri_for('', body.id, 'new') %]" class="btn">[% ('New defect type') %]</a> [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/base/admin/exordefects/index.html b/templates/web/base/admin/exordefects/index.html index 06d2aa7a5..dba58198d 100644 --- a/templates/web/base/admin/exordefects/index.html +++ b/templates/web/base/admin/exordefects/index.html @@ -1,4 +1,4 @@ -[% INCLUDE 'admin/header.html' title=loc('Download Exor RDI') -%] +[% INCLUDE 'admin/header.html' title=('Download Exor RDI') -%] [% IF error_message %] <h2>Error</h2> @@ -7,20 +7,20 @@ <form method="get" action="[% c.uri_for('download') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> <p> - <label for="start_date">[% loc('Start Date:') %]</label><input type="text" class="form-control" - placeholder="[% loc('Click here or enter as dd/mm/yyyy') %]" name="start_date" id="start_date" + <label for="start_date">[% ('Start Date:') %]</label><input type="text" class="form-control" + placeholder="[% ('Click here or enter as dd/mm/yyyy') %]" name="start_date" id="start_date" value="[% start_date ? start_date.strftime( '%d/%m/%Y') : '' | html %]" /> </p> <p> - <label for="end_date">[% loc('End Date:') %]</label><input type="text" class="form-control" - placeholder="[% loc('Click here or enter as dd/mm/yyyy') %]" name="end_date" id="end_date" size="5" + <label for="end_date">[% ('End Date:') %]</label><input type="text" class="form-control" + placeholder="[% ('Click here or enter as dd/mm/yyyy') %]" name="end_date" id="end_date" size="5" value="[% end_date ? end_date.strftime( '%d/%m/%Y') : '' | html %]" /> </p> <p> - [% loc('Inspector:') %] <select class="form-control" id='user_id' name='user_id'> - <option value=''>[% loc('All inspectors') %]</option> + [% ('Inspector:') %] <select class="form-control" id='user_id' name='user_id'> + <option value=''>[% ('All inspectors') %]</option> [% FOR inspector IN inspectors %] <option value="[% inspector.id %]" [% 'selected' IF user_id == inspector.id %]>[% inspector.name %] ([% inspector.get_extra_metadata('initials') %])</option> [% END %] diff --git a/templates/web/base/admin/responsepriorities/edit.html b/templates/web/base/admin/responsepriorities/edit.html index a4dc61213..07d6906ba 100644 --- a/templates/web/base/admin/responsepriorities/edit.html +++ b/templates/web/base/admin/responsepriorities/edit.html @@ -24,7 +24,7 @@ </p> </div> <p> - <strong>[% loc('External ID:') %] </strong> + <strong>[% loc('External ID') %]:</strong> <input type="text" name="external_id" class="form-control" size="30" value="[% rp.external_id | html %]"> </p> diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html index cf539ff4f..41ff3a2e1 100644 --- a/templates/web/base/auth/general.html +++ b/templates/web/base/auth/general.html @@ -19,7 +19,7 @@ <div class="form-box"> <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook"> <img alt="" src="/i/facebook-icon-32.png" width="17" height="32"> - Log in with Facebook + [% loc('Log in with Facebook') %] </button> </div> [% END %] @@ -27,7 +27,7 @@ <div class="form-box"> <button name="twitter_sign_in" id="twitter_sign_in" value="twitter_sign_in" class="btn btn--block btn--social btn--twitter"> <img alt="" src="/i/twitter-icon-32.png" width="17" height="32"> - Log in with Twitter + [% loc('Log in with Twitter') %] </button> </div> [% END %] diff --git a/templates/web/base/dashboard/index.html b/templates/web/base/dashboard/index.html index 1af507569..2a9a2ef42 100644 --- a/templates/web/base/dashboard/index.html +++ b/templates/web/base/dashboard/index.html @@ -12,14 +12,13 @@ <form> <hgroup> - <h2>Reports, Statistics and Actions for</h2> - <h1>[% council.name %]</h1> + [% tprintf(loc('<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>'), council.name) %] </hgroup> <div class="filters"> <p> - <label for="ward">Ward:</label> - <select class="form-control" name="ward"><option value=''>All</option> + <label for="ward">[% loc('Ward:') %]</label> + <select class="form-control" name="ward"><option value=''>[% loc('All') %]</option> [% FOR w IN children.values.sort('name') %] <option value="[% w.id %]"[% ' selected' IF w.id == ward %]>[% w.name %]</option> [% END %] @@ -27,8 +26,8 @@ </p> <p> - <label for="category">Report category:</label> - <select class="form-control" name="category"><option value=''>All</option> + <label for="category">[% loc('Category:') %]</label> + <select class="form-control" name="category"><option value=''>[% loc('All') %]</option> [% FOR cat_op IN category_options %] <option value='[% cat_op | html %]'[% ' selected' IF category == cat_op %]>[% cat_op | html %]</option> [% END %] @@ -36,7 +35,7 @@ </p> <p> - <input type="submit" class="btn" value="Look up"> + <input type="submit" class="btn" value="[% loc('Look up') %]"> </p> <br clear="all" /> @@ -46,17 +45,17 @@ <table width="100%" id="overview"> <tr> <th> </th> - <th scope="col"><abbr title="Week To Date">WTD</abbr></th> - <th scope="col">Last 7 days</th> - <th scope="col">Last 4 weeks</th> - <th scope="col">YTD</th> + <th scope="col"><abbr title="[% loc('Week To Date') %]">[% loc('WTD', "Week to date") %]</abbr></th> + <th scope="col">[% loc('Last 7 days') %]</th> + <th scope="col">[% loc('Last 4 weeks') %]</th> + <th scope="col">[% loc('YTD', "Year to date") %]</th> </tr> [% rows = { - '0' => [ "total", "Total reports received" ] - '1' => [ "fixed - council", "Council has marked as fixed" ] - '2' => [ "fixed_user", "User has marked as fixed" ] + '0' => [ "total", loc("Total reports received") ] + '1' => [ "fixed - council", loc("Council has marked as fixed") ] + '2' => [ "fixed_user", loc("User has marked as fixed") ] }; FOR row IN rows %] <tr id="[% row.value.0.replace('[^\w]+', '_' ) %]"> @@ -69,7 +68,7 @@ [% END %] <tr class='subtotal' id="total_fixed"> - <th scope="row">Total marked as fixed</th> + <th scope="row">[% loc('Total marked as fixed') %]</th> <td>[% problems.wtd.${"fixed - council"} + problems.wtd.fixed_user %]</td> <td>[% problems.week.${"fixed - council"} + problems.week.fixed_user %]</td> <td>[% problems.weeks.${"fixed - council"} + problems.weeks.fixed_user %]</td> @@ -78,10 +77,10 @@ [% rows = { - '0' => [ "in progress", "Council has marked as in progress" ] - '1' => [ "action scheduled", "Council has marked as planned" ] - '2' => [ "investigating", "Council has marked as investigating" ] - '3' => [ "closed", "Council has marked as closed" ] + '0' => [ "in progress", loc("Council has marked as in progress") ] + '1' => [ "action scheduled", loc("Council has marked as planned") ] + '2' => [ "investigating", loc("Council has marked as investigating") ] + '3' => [ "closed", loc("Council has marked as closed") ] }; wtd = 0, week = 0, weeks = 0, ytd = 0; FOR row IN rows %] @@ -95,7 +94,7 @@ [% END %] <tr class='subtotal' id="marked"> - <th scope="row">Total marked</th> + <th scope="row">[% loc('Total marked') %]</th> <td>[% problems.wtd.${"in progress"} + problems.wtd.${"action scheduled"} + problems.wtd.investigating + problems.wtd.closed %]</td> <td>[% problems.week.${"in progress"} + problems.week.${"action scheduled"} + @@ -107,7 +106,7 @@ </tr> <tr id="avg_fixed"> - <th scope="row">Average time to council marking fixed (days)</th> + <th scope="row">[% loc('Average time to council marking fixed (days)') %]</th> <td>[% problems.wtd.time_to_fix %]</td> <td>[% problems.week.time_to_fix %]</td> <td>[% problems.weeks.time_to_fix %]</td> @@ -115,7 +114,7 @@ </tr> <tr id="avg_marked"> - <th scope="row">Average time to first council state change (days)</th> + <th scope="row">[% loc('Average time to first council state change (days)') %]</th> <td>[% problems.wtd.time_to_mark %]</td> <td>[% problems.week.time_to_mark %]</td> <td>[% problems.weeks.time_to_mark %]</td> @@ -123,7 +122,7 @@ </tr> <tr class='subtotal' id="not_marked"> - <th scope="row">Total not marked</th> + <th scope="row">[% loc('Total not marked') %]</th> <td>[% problems.wtd.not_marked %]</td> <td>[% problems.week.not_marked %]</td> <td>[% problems.weeks.not_marked %]</td> @@ -132,25 +131,25 @@ </table> -<h2>Reports</h2> +<h2>[% loc('Reports') %]</h2> </select> -<p>Report state: <select class="form-control" name="state"> -<option value=''>All</option> +<p>[% loc('Report state:') %] <select class="form-control" name="state"> +<option value=''>[% loc('All') %]</option> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', loc('Investigating')], ['action scheduled', loc('Planned')], ['in progress', loc('In Progress')], ['closed', loc('Closed')], ['fixed', loc('Fixed')] ] %] <option [% 'selected ' IF state.0 == q_state %] value="[% state.0 %]">[% state.1 %]</option> [% END %] </select> -<input type="submit" class="btn" value="Look up"> -<a class="export_as_csv" href="[% c.req.uri_with({ export => 1 }) %]">Export as CSV</a> +<input type="submit" class="btn" value="[% loc('Look up') %]"> +<a class="export_as_csv" href="[% c.req.uri_with({ export => 1 }) %]">[% loc('Export as CSV') %]</a> <table width="100%" id="reports"> <tr> - <th scope="col">Less than 7 days old</th> - <th scope="col">7-14 days old</th> - <th scope="col">14-30 days old</th> + <th scope="col">[% loc('Less than 7 days old') %]</th> + <th scope="col">[% loc('7-14 days old') %]</th> + <th scope="col">[% loc('14-30 days old') %]</th> </tr> <tr> <td width="34%"><ul>[% INCLUDE list, list = lists.1 %]</ul></td> diff --git a/templates/web/base/js/translation_strings.html b/templates/web/base/js/translation_strings.html index c09609411..b90a4d576 100644 --- a/templates/web/base/js/translation_strings.html +++ b/templates/web/base/js/translation_strings.html @@ -54,5 +54,23 @@ upload_max_files_exceeded: '[% loc ('Whoa there Testino! Three photos are enough.') | replace("'", "\\'") %]', upload_default_message: '[% loc ('Drag and drop photos here or <u>click to upload</u>') | replace("'", "\\'") %]', upload_cancel_confirmation: '[% loc ('Are you sure you want to cancel this upload?') | replace("'", "\\'") %]', - upload_invalid_file_type: '[% loc ('Please upload an image only') | replace("'", "\\'") %]' + upload_invalid_file_type: '[% loc ('Please upload an image only') | replace("'", "\\'") %]', + + login_with_email: '[% loc('Log in with email') | replace("'", "\\'") %]', + + offline: { + your_reports: '[% loc('Your offline reports') | replace("'", "\\'") %]', + update_saved: '[% loc('Your update has been saved offline for submission when back online.') | replace("'", "\\'") %]', + update_data_saved: '[% loc('Offline update data saved') | replace("'", "\\'") %]', + clear_data: '[% loc('Clear offline data') | replace("'", "\\'") %]', + are_you_sure: '[% loc('Are you sure?') | replace("'", "\\'") %]', + data_cleared: '[% loc('Offline data cleared') | replace("'", "\\'") %]', + reports_saved: '[% loc('Reports saved offline.') | replace("'", "\\'") %]', + saving_reports: '[% loc('Saving reports offline', 'This is followed by a progress count, e.g. 3/5') | replace("'", "\\'") %]', + you_are_offline: '[% loc('You are offline') | replace("'", "\\'") %]', + N_saved: '[% loc('<span>%s</span> saved.') | replace("'", "\\'") %]', + saved_to_submit: '[% loc('You have <a id="oFN" href=""><span>%s</span> saved to submit</a>.') | replace("'", "\\'") %]', + update_single: '[% loc('update') | replace("'", "\\'") %]', + update_plural: '[% loc('updates') | replace("'", "\\'") %]' + } }; diff --git a/templates/web/base/offline/appcache.html b/templates/web/base/offline/appcache.html index 5a8ba1463..ba54b229a 100644 --- a/templates/web/base/offline/appcache.html +++ b/templates/web/base/offline/appcache.html @@ -1,9 +1,10 @@ [% INCLUDE 'header.html' appcache = 1 bodyclass = "fullwidthpage" %] -<h1>Internet glitch</h1> +<h1>[% loc('Internet glitch') %]</h1> -<p>Sorry, we don’t have a good enough connection to fetch that page, or the -page wasn’t found or there was a server error. Please try again later.</p> +<p>[% loc('Sorry, we don’t have a good enough connection to fetch that page, or the +page wasn’t found or there was a server error. Please try again later.') %] +</p> <ul class="item-list item-list--reports" id="offline_list"></ul> diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html index 712044592..e627227d4 100644 --- a/templates/web/base/report/_item.html +++ b/templates/web/base/report/_item.html @@ -46,7 +46,7 @@ [% END %] [%- IF c.cobrand.moniker != 'fixamingata' %] [%# Default: %] [%- IF problem.days_ago > 0 AND problem.days_ago <= c.cobrand.display_days_ago_threshold %] - [% tprintf( nget( loc('Reported %d day ago'), loc('Reported %d days ago'), problem.days_ago), problem.days_ago ) %] + [% tprintf( nget('Reported %d day ago', 'Reported %d days ago', problem.days_ago), problem.days_ago ) %] [%- ELSE %] [% prettify_dt( problem.confirmed, 1 ) %] [%- END %] @@ -56,7 +56,7 @@ [%- IF dist %], [% dist %]km[% END %] [%- IF problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %], [%- IF problem.days_ago('lastupdate') > 0 AND problem.days_ago('lastupdate') <= c.cobrand.display_days_ago_threshold %] - [% tprintf( nget( loc('last updated %d day ago'), loc('last updated %d days ago'), problem.days_ago('lastupdate') ), problem.days_ago('lastupdate') ) %] + [% tprintf( nget('last updated %d day ago', 'last updated %d days ago', problem.days_ago('lastupdate') ), problem.days_ago('lastupdate') ) %] [%- ELSE %] [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 1 ) ) %] [%- END %] diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index 12733a992..83a3a1109 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -47,7 +47,7 @@ [% IF problem.title != original.title %] <label> <input type="checkbox" name="problem_revert_title" class="revert-title"> - Revert to original title + [% loc('Revert to original title') %] </label> [% END %] <h1><input class="form-control" type="text" name="problem_title" value="[% problem.title | html %]" data-original-value="[% original.title | html %]"></h1> @@ -57,7 +57,7 @@ <div class="moderate-edit"> <label> <input type="checkbox" name="problem_show_name" [% 'checked' UNLESS problem.anonymous %]> - Show reporter’s name + [% loc('Show reporter’s name') %] </label> </div> <p class="report_meta_info"> @@ -66,7 +66,7 @@ [% INCLUDE 'report/_main_sent_info.html' %] [% mlog = problem.latest_moderation_log_entry(); IF mlog %] - <p>Moderated by [% mlog.admin_user %] at [% prettify_dt(mlog.whenedited) %]</p> + <p>[% tprintf(loc('Moderated by %s at %s'), mlog.admin_user, prettify_dt(mlog.whenedited)) %]</p> [% END %] [% INCLUDE 'report/_support.html' %] @@ -76,7 +76,7 @@ <p class="moderate-edit"> <label> <input type="checkbox" name="problem_show_photo" [% problem.photo ? 'checked' : '' %]> - Show photo + [% loc('Show photo') %] </label> </p> [% END %] @@ -92,7 +92,7 @@ [% IF problem.detail != original.detail %] <label> <input type="checkbox" name="problem_revert_detail" class="revert-textarea"> - Revert to original text + [% loc('Revert to original text') %] </label> [% END %] <textarea class="form-control" name="problem_detail" data-original-value="[% original.detail | html %]">[% problem.detail | html %]</textarea> @@ -102,16 +102,16 @@ <p> <label> <input type="checkbox" class="hide-document" name="problem_hide" [% problem.hidden ? 'checked' : '' %]> - Hide entire report + [% loc('Hide entire report') %] </label> </p> <p> - <label for="moderation_reason">Moderation reason:</label> - <input type="text" class="form-control" name="moderation_reason" placeholder="Describe why you are moderating this"> + <label for="moderation_reason">[% loc('Moderation reason:') %]</label> + <input type="text" class="form-control" name="moderation_reason" placeholder="[% loc('Describe why you are moderating this') %]"> </p> <p> - <input type="submit" class="green-btn" value="Save changes"> - <input type="button" class="btn cancel" value="Discard changes"> + <input type="submit" class="green-btn" value="[% loc('Save changes') %]"> + <input type="button" class="btn cancel" value="[% loc('Discard changes') %]"> </p> </div> [% END %] diff --git a/templates/web/base/report/new/form_user_loggedout.html b/templates/web/base/report/new/form_user_loggedout.html index c444ebce4..4142f4582 100644 --- a/templates/web/base/report/new/form_user_loggedout.html +++ b/templates/web/base/report/new/form_user_loggedout.html @@ -3,7 +3,7 @@ <div class="form-box"> <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook"> <img alt="" src="/i/facebook-icon-32.png" width="17" height="32"> - Log in with Facebook + [% loc('Log in with Facebook') %] </button> </div> [% END %] @@ -11,7 +11,7 @@ <div class="form-box"> <button name="twitter_sign_in" id="twitter_sign_in" value="twitter_sign_in" class="btn btn--block btn--social btn--twitter"> <img alt="" src="/i/twitter-icon-32.png" width="17" height="32"> - Log in with Twitter + [% loc('Log in with Twitter') %] </button> </div> [% END %] diff --git a/templates/web/base/report/update.html b/templates/web/base/report/update.html index 752f20174..51c1a9e4f 100644 --- a/templates/web/base/report/update.html +++ b/templates/web/base/report/update.html @@ -9,15 +9,15 @@ [% IF moderating; original_update = update.moderation_original_data %] <form method="post" action="/moderate/report/[% problem.id %]/update/[% update.id %]"> <input type="hidden" name="token" value="[% csrf_token %]"> - <input type="button" class="btn js-moderate moderate-display" value="Moderate this update"> + <input type="button" class="btn js-moderate moderate-display" value="[% loc('Moderate this update') %]"> <div class="moderate-edit"> <label><input type="checkbox" class="hide-document" name="update_hide"> - Hide update completely?</label> + [% loc('Hide update completely?') %]</label> <label><input type="checkbox" name="update_show_name" [% update.anonymous ? '' : 'checked' %]> - Show name publicly?</label> + [% loc('Show name publicly?') %]</label> [% IF update.photo or original_update.photo %] <label><input type="checkbox" name="update_show_photo" [% update.photo ? 'checked' : '' %]> - Show Photo?</label> + [% loc('Show Photo?') %]</label> [% END %] </div> [% END %] @@ -37,7 +37,7 @@ <div class="moderate-edit"> [% IF update.text != original.detail %] <label><input type="checkbox" name="update_revert_detail" class="revert-textarea"> - Revert to original</label> + [% loc('Revert to original') %]</label> [% END %] <textarea class="form-control" name="update_detail">[% update.text | add_links %]</textarea> </div> @@ -46,7 +46,7 @@ <p class="meta-2"> [% INCLUDE meta_line %] [% mlog = update.latest_moderation_log_entry(); IF mlog %] - <br /> Moderated by [% mlog.admin_user %] at [% prettify_dt(mlog.whenedited) %] + <br />[% tprintf(loc('Moderated by %s at %s'), mlog.admin_user, prettify_dt(mlog.whenedited)) %] [% END %] </p> </div> @@ -54,11 +54,11 @@ </div> [% IF moderating %] <div class="moderate-edit"> - <label for="moderation_reason">Moderation reason:</label> + <label for="moderation_reason">[% loc('Moderation reason:') %]</label> <input type="text" class="form-control" name="moderation_reason" - placeholder="Describe why you are moderating this"> - <input type="submit" class="red-btn" value="Save changes"> - <input type="button" class="btn cancel" value="Discard changes"> + placeholder="[% loc('Describe why you are moderating this') %]"> + <input type="submit" class="red-btn" value="[% loc('Save changes') %]"> + <input type="button" class="btn cancel" value="[% loc('Discard changes') %]"> </div> </form> [% END %] diff --git a/templates/web/base/report/update/form_user_loggedout.html b/templates/web/base/report/update/form_user_loggedout.html index fa26eb8f4..d9f67e06e 100644 --- a/templates/web/base/report/update/form_user_loggedout.html +++ b/templates/web/base/report/update/form_user_loggedout.html @@ -4,7 +4,7 @@ <div class="form-box"> <button name="facebook_sign_in" id="facebook_sign_in" value="facebook_sign_in" class="btn btn--block btn--social btn--facebook"> <img alt="" src="/i/facebook-icon-32.png" width="17" height="32"> - Log in with Facebook + [% loc('Log in with Facebook') %] </button> </div> [% END %] @@ -12,7 +12,7 @@ <div class="form-box"> <button name="twitter_sign_in" id="twitter_sign_in" value="twitter_sign_in" class="btn btn--block btn--social btn--twitter"> <img alt="" src="/i/twitter-icon-32.png" width="17" height="32"> - Log in with Twitter + [% loc('Log in with Twitter') %] </button> </div> [% END %] diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index e92395661..a4bab095e 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -669,7 +669,7 @@ $.extend(fixmystreet.set_up, { email_login_form: function() { // Log in with email button var email_form = $('#js-social-email-hide'), - button = $('<button class="btn btn--social btn--social-email">Log in with email</button>'), + button = $('<button class="btn btn--social btn--social-email">'+translation_strings.login_with_email+'</button>'), form_box = $('<div class="form-box"></div>'); button.click(function(e) { e.preventDefault(); diff --git a/web/cobrands/fixmystreet/offline.js b/web/cobrands/fixmystreet/offline.js index 0fdad1279..e6e50d3e8 100644 --- a/web/cobrands/fixmystreet/offline.js +++ b/web/cobrands/fixmystreet/offline.js @@ -2,17 +2,27 @@ fixmystreet.offlineBanner = (function() { var toCache = 0; var cachedSoFar = 0; + // Extremely noddy function + function sprintf(s, p) { + return s.replace('%s', p); + } + + // Note this non-global way of handling plurals may need looking at in future function formText() { var num = fixmystreet.offlineData.getForms().length; - return num + ' update' + (num===1 ? '' : 's'); + if ( num === 1 ) { + return num + translation_strings.offline.update_single; + } else { + return num + translation_strings.offline.update_plural; + } } function onlineText() { - return 'You have <a id="oFN" href=""><span>' + formText() + '</span> saved to submit</a>.'; + return sprintf(translation_strings.offline.saved_to_submit, formText()); } function offlineText() { - return 'You are offline \u2013 <span>' + formText() + '</span> saved.'; + return translation_strings.offline.you_are_offline + ' \u2013 ' + sprintf(translation_strings.offline.N_saved, formText()); } function remove() { @@ -87,12 +97,12 @@ fixmystreet.offlineBanner = (function() { startProgress: function(l) { $('.top_banner--offline').slideDown(); toCache = l; - $('#offline_saving').html('Saving reports offline – <span>0</span>/' + toCache + '.'); + $('#offline_saving').html(translation_strings.offline.saving_reports + ' – <span>0</span>/' + toCache + '.'); }, progress: function() { cachedSoFar += 1; if (cachedSoFar === toCache) { - $('#offline_saving').text('Reports saved offline.'); + $('#offline_saving').text(translation_strings.offline.reports_saved); window.setTimeout(remove, 3000); } else { $('#offline_saving span').text(cachedSoFar); @@ -367,10 +377,10 @@ if ($('#offline_list').length) { if (!success) { var html = localStorage.getItem('/my/planned'); if (html) { - $('#offline_list').before('<h2>Your offline reports</h2>'); + $('#offline_list').before('<h2>'+translation_strings.offline.your_reports+'</h2>'); $('#offline_list').html(html); if (location.search.indexOf('saved=1') > 0) { - $('#offline_list').before('<p class="form-success">Your update has been saved offline for submission when back online.</p>'); + $('#offline_list').before('<p class="form-success">'+translation_strings.offline.update_saved+'</p>'); } fixmystreet.offline.replaceImages('#offline_list img'); var offlineForms = fixmystreet.offlineData.getForms(); @@ -380,16 +390,16 @@ if ($('#offline_list').length) { }); $('#offline_list a').each(function(i, a) { if (savedForms[a.href]) { - $(this).find('h3').prepend('<em>Offline update data saved</em> '); + $(this).find('h3').prepend('<em>'+translation_strings.offline.update_data_saved+'</em> '); } }); - $('#offline_clear').css('margin-top', '5em').html('<button id="js-clear-localStorage">Clear offline data</button>'); + $('#offline_clear').css('margin-top', '5em').html('<button id="js-clear-localStorage">'+translation_strings.offline.clear_data+'</button>'); $('#js-clear-localStorage').click(function() { - if (window.confirm("Are you sure?")) { + if (window.confirm(translation_strings.offline.are_you_sure)) { fixmystreet.offline.removeReports(fixmystreet.offlineData.getCachedUrls()); fixmystreet.offlineData.clearForms(); localStorage.removeItem('/my/planned'); - alert('Offline data cleared'); + alert(translation_strings.offline.data_cleared); } }); } |