diff options
65 files changed, 498 insertions, 177 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cef435f0..31129d394 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ - Fix SQL error on update edit admin page in cobrands. #2049 - Improve chart display in old IE versions. #2005 - Improve handling of Open311 state changes. #2069 + - Don't strip whitespace from user passwords. #2111 - Admin improvements: - Inspectors can set non_public status of reports. #1992 - Default start date is shown on the dashboard. @@ -46,6 +47,7 @@ - Add link to admin edit page for reports. #2071 - Nicer Open311 errors. #2078 - Deleted body categories now hidden by default #1962 + - Display contents of report's extra field #1809 - Development improvements: - Add HTML email previewer. - Add CORS header to Open311 output. #2022 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6682044c6..6ddd94b03 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,12 +3,12 @@ Thanks for contributing to FixMyStreet! Here is a quick summary of where to find information: -* [Documentation](http://fixmystreet.org) – including development installation +* [Documentation](https://fixmystreet.org) – including development installation with Vagrant or manually, and information on customisation; * [Coding standards](https://mysociety.github.io/coding-standards.html); * [Ticket management](https://waffle.io/mysociety/fixmystreet) – please see below for details on our workflow; -* [Community help](http://fixmystreet.org/community/) – if you are having +* [Community help](https://fixmystreet.org/community/) – if you are having trouble, we have a number of places you can ask for assistance. Workflow @@ -19,7 +19,7 @@ Platform is now at version 2.3.1; see CHANGELOG.md for a version history. ## Installation We've been working hard to make the FixMyStreet Platform easy to install and -re-use in other countries - please see our site at <http://fixmystreet.org/> +re-use in other countries - please see our site at <https://fixmystreet.org/> for help and documentation in installing the FixMyStreet Platform. For development, if you have Vagrant installed, you can clone the repo and run diff --git a/conf/apache-vhost.conf.example b/conf/apache-vhost.conf.example index b4a3e78f0..6541f3762 100644 --- a/conf/apache-vhost.conf.example +++ b/conf/apache-vhost.conf.example @@ -1,6 +1,6 @@ # An example Apache virtualhost configuration file. # -# See our installation help at http://fixmystreet.org/ +# See our installation help at https://fixmystreet.org/ # # Hopefully you can use either mod_fastcgi or mod_fcgid. # Ubuntu has mod_fcgid by default, with mod_fastcgi in multiverse. diff --git a/conf/general.yml-example b/conf/general.yml-example index b9900dea2..9f1e2a01d 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -3,10 +3,10 @@ # contains various configuration parameters, in YAML syntax. # # For more information about this file, and general documentation on setting up -# the FixMyStreet platform, please see http://fixmystreet.org/ +# the FixMyStreet platform, please see https://fixmystreet.org/ # # Specific details about this file can be found at -# http://fixmystreet.org/customising/config/ +# https://fixmystreet.org/customising/config/ # # To start, you can copy this file to one called "general.yml" in the same # directory. Or have multiple config files and use a symlink to change between diff --git a/conf/httpd.conf-example b/conf/httpd.conf-example index 55be895e8..f174a92ea 100644 --- a/conf/httpd.conf-example +++ b/conf/httpd.conf-example @@ -4,7 +4,7 @@ # example of such a virtualhost configuration file can be found in the # file apache-vhost.conf.example in this directory. # -# See our installation help at http://fixmystreet.org/ +# See our installation help at https://fixmystreet.org/ RewriteEngine on # RewriteLog /var/log/apache2/rewrite.log diff --git a/conf/nginx.conf.example b/conf/nginx.conf.example index cc246d0db..29d06aee2 100644 --- a/conf/nginx.conf.example +++ b/conf/nginx.conf.example @@ -3,7 +3,7 @@ # An example sysvinit script to help with this is shown given in the file # sysvinit-catalyst-fastcgi.example in this directory. # -# See our installation help at http://fixmystreet.org/ +# See our installation help at https://fixmystreet.org/ server { diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 6b6a8069a..d70fdb156 100644 --- a/locale/FixMyStreet.po +++ b/locale/FixMyStreet.po @@ -1145,7 +1145,7 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" #: templates/web/base/auth/general.html:96 templates/web/base/report/new/form_user_loggedout_password.html:20 templates/web/base/report/update/form_user_loggedout_password.html:19 @@ -2328,7 +2328,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -3949,7 +3949,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po index 997822e34..8a7989034 100644 --- a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1433,8 +1433,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "للمزيد من المعلومات، راجع <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>كيف أصلح شارعي يستخدم الخريطة</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "للمزيد من المعلومات، راجع <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>كيف أصلح شارعي يستخدم الخريطة</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2905,8 +2905,8 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "تم النشر بواسطة <strong>%s</strong> في %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "مشغّل بواسطة <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">نظام FixMyStreet الأساسي</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" +msgstr "مشغّل بواسطة <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">نظام FixMyStreet الأساسي</a>" #: templates/web/base/pagination.html:4 msgid "Previous" @@ -4891,8 +4891,8 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "هل تريد المساهمة في FixMyStreet؟ التعليمات البرمجية الخاصة بنا مفتوحة المصدر <a href=\"http://fixmystreet.org\">ومتاحة على fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "هل تريد المساهمة في FixMyStreet؟ التعليمات البرمجية الخاصة بنا مفتوحة المصدر <a href=\"https://fixmystreet.org\">ومتاحة على fixmystreet.org</a>." #: templates/web/base/questionnaire/index.html:101 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" diff --git a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po index b2fe0bd41..fcd5ec1bd 100644 --- a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1411,8 +1411,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "За повече информацич вижте <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Как ПоправиСофия използва MapIt</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "За повече информацич вижте <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Как ПоправиСофия използва MapIt</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2853,7 +2853,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Публикувано от <strong>%s</strong> в %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4809,7 +4809,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po index 12f9df1cf..cdce0e19a 100644 --- a/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1397,7 +1397,7 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" #: templates/web/base/auth/general.html:96 @@ -2833,7 +2833,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4770,7 +4770,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po index a112a273c..127ad2e33 100644 --- a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1413,8 +1413,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "Více informací naleznete v článku <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Jak FixMyStreet používá Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "Více informací naleznete v článku <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Jak FixMyStreet používá Mapit</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2868,7 +2868,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Odesláno uživatelem <strong>%s</strong> v %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4845,8 +4845,8 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "Chcete se podílet na rozvoji projektu FixMyStreet? Náš kód je open source a je k dispozici na <a href=\"http://fixmystreet.org\">fixmystreet.org </a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "Chcete se podílet na rozvoji projektu FixMyStreet? Náš kód je open source a je k dispozici na <a href=\"https://fixmystreet.org\">fixmystreet.org </a>." #: templates/web/base/questionnaire/index.html:101 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po index 703f44321..7cfa37723 100644 --- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1398,7 +1398,7 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" #: templates/web/base/auth/general.html:96 @@ -2837,7 +2837,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Postiwyd gan <strong>%s</strong> am %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4788,7 +4788,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index a6aa0b366..d250394bd 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po @@ -1142,7 +1142,7 @@ msgid "For council(s):" msgstr "For council(s):" #: templates/web/base/admin/body-form.html:65 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How reportemptyhomes.com uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How reportemptyhomes.com uses Mapit</a>." msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 @@ -3641,7 +3641,7 @@ msgstr "With request searches, it is also possible to search for agency_responsi #: templates/web/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:15 #, fuzzy -msgid "Would you like to contribute to reportemptyhomes.com? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to reportemptyhomes.com? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Would you like to contribute to reportemptyhomes.com? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." #: templates/web/base/questionnaire/index.html:78 diff --git a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po index 1222ef61e..7f7abfbe7 100644 --- a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1413,8 +1413,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "For mere information, se <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Hvordan FixMyStreet bruger Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "For mere information, se <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Hvordan FixMyStreet bruger Mapit</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2871,7 +2871,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Sendt ind af <strong>%s</strong> %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4858,8 +4858,8 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "Kunne du tænke dig at bidrage til FixMinVej? Vores kKildekoden er frit programmel og <a href=\"http://fixmystreet.org\">tilgængelig via fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "Kunne du tænke dig at bidrage til FixMinVej? Vores kKildekoden er frit programmel og <a href=\"https://fixmystreet.org\">tilgængelig via fixmystreet.org</a>." #: templates/web/base/questionnaire/index.html:101 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index 0b3e608bf..2b1417be3 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1398,7 +1398,7 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" #: templates/web/base/auth/general.html:96 @@ -2841,7 +2841,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4786,7 +4786,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po index 8ec31a759..5504c0ddd 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1396,7 +1396,7 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" #: templates/web/base/auth/general.html:96 @@ -2840,7 +2840,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4789,7 +4789,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po index 1a3f75365..6820baf1d 100644 --- a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1429,8 +1429,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "Για περισσότερες πληροφορίες, δες <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Πώς το FixMyStreet χρησιμοποιεί το Mapit (στα Αγγλικά)</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "Για περισσότερες πληροφορίες, δες <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Πώς το FixMyStreet χρησιμοποιεί το Mapit (στα Αγγλικά)</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2884,8 +2884,8 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Δημοσιεύθηκε από <strong>%s</strong> στις %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "Βασισμένο στην <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">Πλατφόρμα FixMyStreet</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" +msgstr "Βασισμένο στην <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">Πλατφόρμα FixMyStreet</a>" #: templates/web/base/pagination.html:4 msgid "Previous" @@ -4862,8 +4862,8 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "Θα ήθελες να συνεισφέρεις στο FixMyStreet; Ο κώδικας μας είναι ανοιχτής πηγής και <a href=\"http://fixmystreet.org\">διαθέσιμος στο fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "Θα ήθελες να συνεισφέρεις στο FixMyStreet; Ο κώδικας μας είναι ανοιχτής πηγής και <a href=\"https://fixmystreet.org\">διαθέσιμος στο fixmystreet.org</a>." #: templates/web/base/questionnaire/index.html:101 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po index ce0c6017d..f14ca9554 100644 --- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1405,8 +1405,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "Para más información, vea <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Cómo FixMyStreet usa Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "Para más información, vea <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Cómo FixMyStreet usa Mapit</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2857,7 +2857,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Publicado por <strong>%s</strong> - %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4811,8 +4811,8 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "¿Quieres contribuir a mejorar FixMyStreet? Nuestro código es abierto y está <a href=\"http://fixmystreet.org\">disponible en fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "¿Quieres contribuir a mejorar FixMyStreet? Nuestro código es abierto y está <a href=\"https://fixmystreet.org\">disponible en fixmystreet.org</a>." #: templates/web/base/questionnaire/index.html:101 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" diff --git a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po index 5bc255fd5..f6e717fcd 100644 --- a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1432,8 +1432,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "Para más información, vea <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Cómo FixMyStreet usa Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "Para más información, vea <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Cómo FixMyStreet usa Mapit</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2903,8 +2903,8 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Publicado por <strong>%s</strong> - %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "Con la tecnología de <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" +msgstr "Con la tecnología de <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" #: templates/web/base/pagination.html:4 msgid "Previous" @@ -4884,8 +4884,8 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "¿Quieres contribuir a mejorar FixMyStreet? Nuestro código es abierto y está <a href=\"http://fixmystreet.org\">disponible en fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "¿Quieres contribuir a mejorar FixMyStreet? Nuestro código es abierto y está <a href=\"https://fixmystreet.org\">disponible en fixmystreet.org</a>." #: templates/web/base/questionnaire/index.html:101 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po index ee0ac154a..c9993ffc1 100644 --- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1424,8 +1424,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "Pour chaque option, <strong>La clé</strong> est la valeur qui est stockée dans la base de données pour cette option et Nom est la valeur affichée pour l'utilisateur." #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "Pour plus d'information, Lire <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>comment FixMyStreet utilise Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "Pour plus d'information, Lire <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>comment FixMyStreet utilise Mapit</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2893,8 +2893,8 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Envoyé par <strong>%s</strong> à %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" +msgstr "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" #: templates/web/base/pagination.html:4 msgid "Previous" @@ -4871,7 +4871,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Aimeriez-vous contribuer à FixMyStreet? Notre code est open source et <a href=\"http://fixmystreetf.org\"> disponible sur fixmystreet.org </a>" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po index 98439eb33..d3259e38c 100644 --- a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1380,7 +1380,7 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" #: templates/web/base/auth/general.html:96 @@ -2811,7 +2811,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4740,7 +4740,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po index d6f35c384..248b50d20 100644 --- a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1398,7 +1398,7 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" #: templates/web/base/auth/general.html:96 @@ -2840,7 +2840,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Objavio <strong>%s</strong> na %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4797,7 +4797,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po index 593e7b0e1..1280ea7fe 100644 --- a/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1435,8 +1435,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "Untuk informasi lebih lanjut, lihat <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Bagaimana FixMyStreet menggunakan Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "Untuk informasi lebih lanjut, lihat <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Bagaimana FixMyStreet menggunakan Mapit</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2912,8 +2912,8 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Dikirim oleh <strong>%s</strong> pada %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "Didukung oleh <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">Platform FixMyStreet</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" +msgstr "Didukung oleh <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">Platform FixMyStreet</a>" #: templates/web/base/pagination.html:4 msgid "Previous" @@ -4907,8 +4907,8 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "Inginkah Anda berkontribusi di FixMyStreet? Kode kami adalah sumber terbuka dan <a href=\"http://fixmystreet.org\">tersedia di fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "Inginkah Anda berkontribusi di FixMyStreet? Kode kami adalah sumber terbuka dan <a href=\"https://fixmystreet.org\">tersedia di fixmystreet.org</a>." #: templates/web/base/questionnaire/index.html:101 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" diff --git a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po index c08080c64..b47038a28 100644 --- a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1399,7 +1399,7 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" #: templates/web/base/auth/general.html:96 @@ -2839,7 +2839,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Postato da <strong>%s</strong> al %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4791,7 +4791,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po index 66ca4cf71..dcd33745a 100644 --- a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1423,8 +1423,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "Daugiau informacijos rasite <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "Daugiau informacijos rasite <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2881,7 +2881,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4823,7 +4823,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po index cde49204e..eb08dc980 100644 --- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1402,8 +1402,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "Untuk maklumat lanjut, lihat <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Bagaimana FixMyStreet mengguna Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "Untuk maklumat lanjut, lihat <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Bagaimana FixMyStreet mengguna Mapit</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2841,7 +2841,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Dipostkan oleh <strong>%s</strong> pada %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4790,7 +4790,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po index e93e92026..f304c6127 100644 --- a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1399,7 +1399,7 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" #: templates/web/base/auth/general.html:96 @@ -2839,7 +2839,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "%s မွာ <strong>%s</strong>မွတင္ခဲ့သည္" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4788,7 +4788,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index ee875b516..ddcab8f1e 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1398,8 +1398,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "For mer informasjon, se <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Hvordan FixMyStreet bruker Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "For mer informasjon, se <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Hvordan FixMyStreet bruker Mapit</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2853,8 +2853,8 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Lagt inn av <strong>%s</strong> %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "Drevet av <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" +msgstr "Drevet av <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" #: templates/web/base/pagination.html:4 msgid "Previous" @@ -4814,8 +4814,8 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "Kunne du tenke deg å bidra til FiksGataMi? Kildekoden vår er fri programvare og <a href=\"http://fixmystreet.org\">tilgjengelig via fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "Kunne du tenke deg å bidra til FiksGataMi? Kildekoden vår er fri programvare og <a href=\"https://fixmystreet.org\">tilgjengelig via fixmystreet.org</a>." #: templates/web/base/questionnaire/index.html:101 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po index 5ca0cccb6..bf965c51a 100644 --- a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1406,7 +1406,7 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" #: templates/web/base/auth/general.html:96 @@ -2850,7 +2850,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Geplaatst door <strong>%s</strong> bij %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4802,7 +4802,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 82e6ee1d5..341f0ceab 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1392,7 +1392,7 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" #: templates/web/base/auth/general.html:96 @@ -2833,7 +2833,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Lagt inn av <strong>%s</strong> %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4791,7 +4791,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po index 798af1d90..41ae1bc8e 100644 --- a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1401,7 +1401,7 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" #: templates/web/base/auth/general.html:96 @@ -2848,7 +2848,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Postado por <strong>%s</strong> em %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4806,7 +4806,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po index dcb6f1879..d0368f280 100644 --- a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1382,7 +1382,7 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" #: templates/web/base/auth/general.html:96 @@ -2812,7 +2812,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4740,7 +4740,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po index a6191c44d..9bd24f147 100644 --- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1433,8 +1433,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "Подробнее читайте в разделе <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Как в FixMyStreet используется инструмент Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "Подробнее читайте в разделе <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Как в FixMyStreet используется инструмент Mapit</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2901,8 +2901,8 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Автор публикации: <strong>%s</strong>, время публикации: %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "На базе платформы <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" +msgstr "На базе платформы <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet</a>" #: templates/web/base/pagination.html:4 msgid "Previous" @@ -4886,8 +4886,8 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "Хотите помочь проекту FixMyStreet? Наш код находится в открытом доступе и <a href=\"http://fixmystreet.org\">доступен на сайте fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "Хотите помочь проекту FixMyStreet? Наш код находится в открытом доступе и <a href=\"https://fixmystreet.org\">доступен на сайте fixmystreet.org</a>." #: templates/web/base/questionnaire/index.html:101 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" diff --git a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po index 5e34be100..822ef3b92 100644 --- a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1412,8 +1412,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "Për më shumë informata, shih <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Si përdoret Mapit nga FixMyStreet</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "Për më shumë informata, shih <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Si përdoret Mapit nga FixMyStreet</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2871,8 +2871,8 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Postuar nga <strong>%s</strong> ne %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "Mundësuar nga <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">Platforma FixMyStreet</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" +msgstr "Mundësuar nga <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">Platforma FixMyStreet</a>" #: templates/web/base/pagination.html:4 msgid "Previous" @@ -4828,8 +4828,8 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "A dëshironi të kontribuoni në FixMyStreet? Kodi jonë është i hapur dhe i <a href=\"http://fixmystreet.org\">qasshëm në fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "A dëshironi të kontribuoni në FixMyStreet? Kodi jonë është i hapur dhe i <a href=\"https://fixmystreet.org\">qasshëm në fixmystreet.org</a>." #: templates/web/base/questionnaire/index.html:101 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" diff --git a/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po index dfb4e0930..ca0059d3f 100644 --- a/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1427,8 +1427,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "Za podrobnije informacije, vidi <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Kako Sredimoju ulicu koristi Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "Za podrobnije informacije, vidi <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Kako Sredimoju ulicu koristi Mapit</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2888,8 +2888,8 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Postavio <strong>%s</strong> na %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">Ndreqe.com Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" +msgstr "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">Ndreqe.com Platform</a>" #: templates/web/base/pagination.html:4 msgid "Previous" @@ -4871,7 +4871,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po index 17b63a5cb..ad0138563 100644 --- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1386,8 +1386,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "För varje alternativ är <strong>Nyckel</strong> det värde som är sparat i databasen för det alternativet, och <strong>Namn</strong> är värdet som visas för användaren." #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "För mer information, se <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "För mer information, se <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2824,8 +2824,8 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Postat av <strong>%s</strong> %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "Byggd på <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet-plattformen</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" +msgstr "Byggd på <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet-plattformen</a>" #: templates/web/base/pagination.html:4 msgid "Previous" @@ -4760,8 +4760,8 @@ msgid "Within the specified timeframe:" msgstr "Inom den specificerade tidsramen:" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "Vill du bidra till FixaMinGata? Vår kod är öppen programvara och <a href=\"http://fixmystreet.org\">tillgänglig på fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "Vill du bidra till FixaMinGata? Vår kod är öppen programvara och <a href=\"https://fixmystreet.org\">tillgänglig på fixmystreet.org</a>." #: templates/web/base/questionnaire/index.html:101 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" diff --git a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po index a539ab2f9..550bda1fb 100644 --- a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1399,8 +1399,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "Daha fazla bilgi için, bakınız <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'> FixMyStreet'in Mapit'i nasıl kullandığını</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "Daha fazla bilgi için, bakınız <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'> FixMyStreet'in Mapit'i nasıl kullandığını</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2832,7 +2832,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "<strong>%s</strong> tarafından %s 'te paylaşılmıştır" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4766,8 +4766,8 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "FixMyStreet'e katkıda bulunmak ister misin? Şifremiz herkese açıktır ve <a href=\"http://fixmystreet.org\"> burdan ulaşılabilir fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "FixMyStreet'e katkıda bulunmak ister misin? Şifremiz herkese açıktır ve <a href=\"https://fixmystreet.org\"> burdan ulaşılabilir fixmystreet.org</a>." #: templates/web/base/questionnaire/index.html:101 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" diff --git a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po index 6d6d4bb90..8e5ff8515 100644 --- a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1405,8 +1405,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2853,7 +2853,7 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "Опубліковано <strong>%s</strong> в %s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" msgstr "" #: templates/web/base/pagination.html:4 @@ -4816,7 +4816,7 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" #: templates/web/base/questionnaire/index.html:101 diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po index fb026166f..981c4055e 100644 --- a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -1430,8 +1430,8 @@ msgid "For each option, <strong>Key</strong> is the value which is stored in the msgstr "" #: templates/web/base/admin/body-form.html:73 -msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "更多資訊，請詳見<a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>如何使用 FixMyStreet 地圖標記</a>（英文）" +msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "更多資訊，請詳見<a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>如何使用 FixMyStreet 地圖標記</a>（英文）" #: templates/web/base/auth/general.html:96 #: templates/web/base/report/new/form_user_loggedout_password.html:20 @@ -2902,8 +2902,8 @@ msgid "Posted by <strong>%s</strong> at %s" msgstr "由<strong>%s</strong> 在%s" #: templates/web/base/front/footer-marketing.html:6 -msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" -msgstr "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>" +msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" +msgstr "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>" #: templates/web/base/pagination.html:4 msgid "Previous" @@ -4888,8 +4888,8 @@ msgid "Within the specified timeframe:" msgstr "" #: templates/web/base/front/footer-marketing.html:3 -msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "您願為FixMyStreet貢獻嗎?這個一個開放原始碼，可從 <a href=\"http://fixmystreet.org\">fixmystreet.org</a>官網進一步了解 " +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "您願為FixMyStreet貢獻嗎?這個一個開放原始碼，可從 <a href=\"https://fixmystreet.org\">fixmystreet.org</a>官網進一步了解 " #: templates/web/base/questionnaire/index.html:101 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 2cd34b7e2..a923a3407 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -843,6 +843,27 @@ sub report_edit : Path('report_edit') : Args(1) { } $c->stash->{problem} = $problem; + if ( $problem->extra ) { + my @fields; + if ( my $fields = $problem->get_extra_fields ) { + for my $field ( @{$fields} ) { + my $name = $field->{description} ? + "$field->{description} ($field->{name})" : + "$field->{name}"; + push @fields, { name => $name, val => $field->{value} }; + } + } + my $extra = $problem->get_extra_metadata; + if ( $extra->{duplicates} ) { + push @fields, { name => 'Duplicates', val => join( ',', @{ $problem->get_extra_metadata('duplicates') } ) }; + delete $extra->{duplicates}; + } + for my $key ( keys %$extra ) { + push @fields, { name => $key, val => $extra->{$key} }; + } + + $c->stash->{extra_fields} = \@fields; + } $c->forward('/auth/get_csrf_token'); diff --git a/perllib/FixMyStreet/App/Controller/Alert.pm b/perllib/FixMyStreet/App/Controller/Alert.pm index 9d522dbc9..1060c080b 100644 --- a/perllib/FixMyStreet/App/Controller/Alert.pm +++ b/perllib/FixMyStreet/App/Controller/Alert.pm @@ -369,7 +369,7 @@ sub process_user : Private { # return 1; # } # -# $alert_user->password( Utils::trim_text( $params{password_register} ) ); +# $alert_user->password( $params{password_register} ); } =head2 setup_coordinate_rss_feeds diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 8c6c1b244..3a8362b5b 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -829,7 +829,7 @@ sub process_user : Private { $c->forward('update_user', [ \%params ]); if ($params{password_register}) { $c->forward('/auth/test_password', [ $params{password_register} ]); - $report->user->password(Utils::trim_text($params{password_register})); + $report->user->password($params{password_register}); } return 1; diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm index 9d97688c5..13eceadb0 100644 --- a/perllib/FixMyStreet/App/Controller/Report/Update.pm +++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm @@ -156,7 +156,7 @@ sub process_user : Private { if ($params{password_register}) { $c->forward('/auth/test_password', [ $params{password_register} ]); - $update->user->password(Utils::trim_text($params{password_register})); + $update->user->password($params{password_register}); } return 1; diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm index 20381bb85..3aa24c2db 100644 --- a/perllib/FixMyStreet/App/Controller/Reports.pm +++ b/perllib/FixMyStreet/App/Controller/Reports.pm @@ -490,8 +490,8 @@ sub export_summary_csv : Private { 'id', 'title', 'category', - 'created_pp', - 'confirmed_pp', + 'created', + 'confirmed', 'state', 'latitude', 'longitude', 'postcode', diff --git a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm index a1ba25e6c..1b42055b6 100644 --- a/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm +++ b/perllib/FixMyStreet/Cobrand/Buckinghamshire.pm @@ -322,7 +322,7 @@ sub lookup_site_code { my $self = shift; my $row = shift; - my $buffer = 10; # metres + my $buffer = 200; # metres my ($x, $y) = $row->local_coords; my ($w, $s, $e, $n) = ($x-$buffer, $y-$buffer, $x+$buffer, $y+$buffer); @@ -342,13 +342,61 @@ sub lookup_site_code { my $j = JSON->new->utf8->allow_nonref; try { $j = $j->decode($response); - return $j->{features}->[0]->{properties}->{site_code}; } catch { # There was either no asset found, or an error with the WFS # call - in either case let's just proceed without the USRN. - return; + return ''; + }; + + # We have a list of features, and we want to find the one closest to the + # report location. + my $site_code = ''; + my $nearest; + + # There are only certain features we care about, the rest can be ignored. + my @valid_types = ( "2", "3A", "3B", "4A", "4B", "HE", "HWOA", "HWSA", "P" ); + my %valid_types = map { $_ => 1 } @valid_types; + + for my $feature ( @{ $j->{features} } ) { + my $type = $feature->{properties}->{feature_ty}; + next unless $valid_types{$type}; + + # We shouldn't receive anything aside from these two geometry types, but belt and braces. + next unless $feature->{geometry}->{type} eq 'MultiLineString' || $feature->{geometry}->{type} eq 'LineString'; + + my @coordinates = @{ $feature->{geometry}->{coordinates} }; + if ( $feature->{geometry}->{type} eq 'MultiLineString') { + # The coordinates are stored as a list of lists, so flatten 'em out + @coordinates = map { @{ $_ } } @coordinates; + } + + # If any of this feature's points are closer than those we've seen so + # far then use the site_code from this feature. + for my $coords ( @coordinates ) { + my ($fx, $fy) = @$coords; + my $distance = $self->_distance($x, $y, $fx, $fy); + if ( !defined $nearest || $distance < $nearest ) { + $site_code = $feature->{properties}->{site_code}; + $nearest = $distance; + } + } } + return $site_code; +} + + +=head2 _distance + +Returns the cartesian distance between two coordinates. +This is not a general-purpose distance function, it's intended for use with +fairly nearby coordinates in EPSG:27700 where a spheroid doesn't need to be +taken into account. + +=cut +sub _distance { + my ($self, $ax, $ay, $bx, $by) = @_; + return sqrt( (($ax - $bx) ** 2) + (($ay - $by) ** 2) ); } 1; diff --git a/perllib/Open311/GetServiceRequestUpdates.pm b/perllib/Open311/GetServiceRequestUpdates.pm index e052e4bd4..b4d7c6347 100644 --- a/perllib/Open311/GetServiceRequestUpdates.pm +++ b/perllib/Open311/GetServiceRequestUpdates.pm @@ -136,8 +136,8 @@ sub update_comments { # a more fine-grained status code that we use within FMS for # response templates. if ( $external_status_code ) { - $comment->set_extra_metadata(external_status_code =>$external_status_code); - $p->set_extra_metadata(external_status_code =>$external_status_code); + $comment->set_extra_metadata(external_status_code => $external_status_code); + $p->set_extra_metadata(external_status_code => $external_status_code); } $open311->add_media($request->{media_url}, $comment) @@ -162,6 +162,10 @@ sub update_comments { } } + # If nothing to show (no text, photo, or state change), don't show this update + $comment->state('hidden') unless $comment->text || $comment->photo + || ($comment->problem_state && $state ne $old_state); + $p->lastupdate( $comment->created ); $p->update; $comment->insert(); diff --git a/t/app/controller/admin/report_edit.t b/t/app/controller/admin/report_edit.t index e61f781f5..34277ca74 100644 --- a/t/app/controller/admin/report_edit.t +++ b/t/app/controller/admin/report_edit.t @@ -557,4 +557,80 @@ subtest "Test setting a report from unconfirmed to something else doesn't cause $mech->get_ok("/report/$report_id"); }; +subtest "Test display of report extra data" => sub { + $report->unset_extra_metadata; + $mech->get_ok("/admin/report_edit/$report_id"); + $mech->content_contains('Extra data: No'); + $report->set_extra_metadata('extra_field', 'this is extra data'); + $report->update; + $mech->get_ok("/admin/report_edit/$report_id"); + $mech->content_contains('extra_field</strong>: this is extra data'); +}; + +my $report2 = FixMyStreet::App->model('DB::Problem')->find_or_create( + { + postcode => 'SW1A 1AA', + bodies_str => '2504', + areas => ',105255,11806,11828,2247,2504,', + category => 'Other', + title => 'Report to Duplicate Edit', + detail => 'Detail for Duplicate Report to Edit', + used_map => 't', + name => 'Test User', + anonymous => 'f', + external_id => '13', + state => 'confirmed', + confirmed => $dt->ymd . ' ' . $dt->hms, + lang => 'en-gb', + service => '', + cobrand => '', + cobrand_data => '', + send_questionnaire => 't', + latitude => '51.5016605453401', + longitude => '-0.142497580865087', + user_id => $user->id, + whensent => $dt->ymd . ' ' . $dt->hms, + } +); + +subtest "Test display of report duplicates extra data" => sub { + $report->update( { extra => undef } ); + $mech->get_ok("/admin/report_edit/$report_id"); + $mech->content_contains('Extra data: No'); + + $report2->set_duplicate_of($report_id); + $report2->update; + + $mech->get_ok("/admin/report_edit/$report_id"); + $mech->content_contains('Duplicates</strong>: ' . $report2->id); +}; + +subtest "Test display of fields extra data" => sub { + $report->unset_extra_metadata( 'duplicates' ); + $report->update; + $mech->get_ok("/admin/report_edit/$report_id"); + $mech->content_contains('Extra data: No'); + + $report->push_extra_fields( { + name => 'report_url', + value => 'http://example.com', + }); + $report->update; + + $report->discard_changes; + + $mech->get_ok("/admin/report_edit/$report_id"); + $mech->content_contains('report_url</strong>: http://example.com'); + + $report->set_extra_fields( { + description => 'Report URL', + name => 'report_url', + value => 'http://example.com', + }); + $report->update; + + $mech->get_ok("/admin/report_edit/$report_id"); + $mech->content_contains('Report URL (report_url)</strong>: http://example.com'); +}; + done_testing(); diff --git a/t/open311/getservicerequestupdates.t b/t/open311/getservicerequestupdates.t index dad3bb0d1..3c279d776 100644 --- a/t/open311/getservicerequestupdates.t +++ b/t/open311/getservicerequestupdates.t @@ -368,6 +368,7 @@ for my $test ( mark_open => 0, problem_state => 'investigating', end_state => 'investigating', + comment_state => 'hidden', }, { desc => 'open status does not re-open hidden report', @@ -401,6 +402,7 @@ for my $test ( is $c->mark_fixed, $test->{mark_fixed}, 'mark_closed correct'; is $c->problem_state, $test->{problem_state}, 'problem_state correct'; is $c->mark_open, $test->{mark_open}, 'mark_open correct'; + is $c->state, $test->{comment_state} || 'confirmed', 'comment state correct'; is $problem->state, $test->{end_state}, 'correct problem state'; $problem->comments->delete; }; diff --git a/templates/email/buckinghamshire/other-reported.txt b/templates/email/buckinghamshire/other-reported.txt new file mode 100644 index 000000000..8f5a3654f --- /dev/null +++ b/templates/email/buckinghamshire/other-reported.txt @@ -0,0 +1,29 @@ +Subject: Your [% report.category | lower %] report has been logged + +Hello [% report.name %], + +Your report to [% report.body %] has been logged on [% site_name %]. + +[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %] +Please note that [% c.cobrand.council_name %] is not responsible for this type +of report, so it will instead be sent to [% report.body %]. +[% ELSE %] +[% TRY %][% INCLUDE '_council_reference.txt' problem=report %][% CATCH file %][% END %] +[% END %] + +It is available to view at: + +[% cobrand.base_url_for_report(report) %][% report.url %] + +Your report is at the following location: + +[% report.title %] + +And details: + +[% report.detail %] + +[% INCLUDE 'signature.txt' %] + +This email was sent automatically, from an unmonitored email account - so +please do not reply to it. diff --git a/templates/web/base/admin/bodies.html b/templates/web/base/admin/bodies.html index eab0f4c49..9f4b81340 100644 --- a/templates/web/base/admin/bodies.html +++ b/templates/web/base/admin/bodies.html @@ -16,7 +16,7 @@ [% IF c.config.STAGING_SITE and !c.config.STAGING_FLAGS.send_reports %] <p class="fms-admin-warning"> - [% tprintf(loc("As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category."), "<a class='admin-offsite-link' href='http://fixmystreet.org/customising/config/#send_reports_on_staging'><code>STAGING_FLAGS send_reports</code></a>") %] + [% tprintf(loc("As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category."), "<a class='admin-offsite-link' href='https://fixmystreet.org/customising/config/#send_reports_on_staging'><code>STAGING_FLAGS send_reports</code></a>") %] </p> [% END %] diff --git a/templates/web/base/admin/body-form.html b/templates/web/base/admin/body-form.html index 54445a282..958ea5d78 100644 --- a/templates/web/base/admin/body-form.html +++ b/templates/web/base/admin/body-form.html @@ -70,7 +70,7 @@ your config file is not pointing to a live MapIt service.") %] [% END %] <br> - [% loc("For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>.")%] + [% loc("For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>.")%] </p> </div> <p> diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html index 7fa446f44..92d20f665 100644 --- a/templates/web/base/admin/body.html +++ b/templates/web/base/admin/body.html @@ -61,7 +61,7 @@ </p> [% ELSIF c.config.STAGING_SITE and !c.config.STAGING_FLAGS.send_reports %] <p class="fms-admin-warning"> - [% tprintf(loc("As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category."), "<a class='admin-offsite-link' href='http://fixmystreet.org/customising/config/#send_reports_on_staging'><code>STAGING_FLAGS send_reports</code></a>") %] + [% tprintf(loc("As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category."), "<a class='admin-offsite-link' href='https://fixmystreet.org/customising/config/#send_reports_on_staging'><code>STAGING_FLAGS send_reports</code></a>") %] </p> [% END %] diff --git a/templates/web/base/admin/config_page.html b/templates/web/base/admin/config_page.html index d448d2a63..8e8d562ff 100644 --- a/templates/web/base/admin/config_page.html +++ b/templates/web/base/admin/config_page.html @@ -139,7 +139,7 @@ running version <strong>[% git_version || 'unknown' %]</strong>. Other things can be changed on a cobrand basis by using functions in an (optional) Cobrand .pm module, as explained in the -<a href="http://fixmystreet.org/customising/" class="admin-offsite-link">customising section of our +<a href="https://fixmystreet.org/customising/" class="admin-offsite-link">customising section of our documentation</a>. If you wish to add new functionality just for your cobrand that can't be done simply by changes to your cobrand's templates, you might need to add a new Cobrand function. @@ -147,7 +147,7 @@ need to add a new Cobrand function. <p>Examples of cobrand functions are below; this is not exhaustive. Many were added for one specific cobrand, so didn't need a general configuration option. Please feel free to discuss on <a -href="http://fixmystreet.org/community/" class="admin-offsite-link">our mailing list</a> if you think +href="https://fixmystreet.org/community/" class="admin-offsite-link">our mailing list</a> if you think something should be moved to the general.yml file, done differently, or have any questions.</p> diff --git a/templates/web/base/admin/index.html b/templates/web/base/admin/index.html index 8498055b1..8691dbcf8 100644 --- a/templates/web/base/admin/index.html +++ b/templates/web/base/admin/index.html @@ -3,11 +3,11 @@ <div class="fms-admin-info fms-admin-floated"> This is the administration interface for [% site_name %]. If you -need any help or guidance, there is <a href="http://fixmystreet.org/">plenty of +need any help or guidance, there is <a href="https://fixmystreet.org/">plenty of online documentation</a>. The FixMyStreet Platform is <a href="https://github.com/mysociety/fixmystreet">actively supported</a> by its developers, and has a community of people using or working on the code. -Please <a href="http://fixmystreet.org/community/">sign up to the mailing list +Please <a href="https://fixmystreet.org/community/">sign up to the mailing list or get in touch</a> to let us know about your use of the FixMyStreet Platform, and to receive notices of updates. </div> diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html index 00e686566..138ba8c05 100644 --- a/templates/web/base/admin/report_edit.html +++ b/templates/web/base/admin/report_edit.html @@ -92,7 +92,6 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a> <li>[% loc('Cobrand:') %] [% problem.cobrand %] <br><small>[% loc('Cobrand data:') %] [% cobrand_data OR '<em>' _ loc('None') _ '</em>' %]</small> </li> -<li>[% loc('Extra data:') %] [% problem.extra ? 'Yes' : 'No' %]</li> <li>[% loc('Going to send questionnaire?') %] [% IF problem.send_questionnaire %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</li> <li><label for="external_id">[% loc('External ID') %]:</label> @@ -126,6 +125,7 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a> <li><label class="inline-text" for="category">[% loc('Category:') %]</label> [% INCLUDE 'admin/report-category.html' %] </li> +<li>[% loc('Extra data:') %] [% IF extra_fields.size %]<ul>[% FOREACH field IN extra_fields %]<li><strong>[% field.name %]</strong>: [% field.val %]</li>[% END %]</ul>[% ELSE %]No[% END %]</li> <li><label class="inline-text" for="anonymous">[% loc('Anonymous:') %]</label> <select class="form-control" name="anonymous" id="anonymous"> <option [% 'selected ' IF problem.anonymous %]value="1">[% loc('Yes') %]</option> diff --git a/templates/web/base/front/footer-marketing.html b/templates/web/base/front/footer-marketing.html index 3fb7a3044..6e7fc2a97 100644 --- a/templates/web/base/front/footer-marketing.html +++ b/templates/web/base/front/footer-marketing.html @@ -1,8 +1,8 @@ <div class="tablewrapper bordered footer-marketing"> <p> - [% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://fixmystreet.org">available at fixmystreet.org</a>.') %] + [% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="https://fixmystreet.org">available at fixmystreet.org</a>.') %] </p> <p> - [% loc('Powered by <a class="platform-logo" href="http://fixmystreet.org/">FixMyStreet Platform</a>') %] + [% loc('Powered by <a class="platform-logo" href="https://fixmystreet.org/">FixMyStreet Platform</a>') %] </p> </div> diff --git a/templates/web/buckinghamshire/report/_item.html b/templates/web/buckinghamshire/report/_item.html new file mode 100644 index 000000000..b87363a6a --- /dev/null +++ b/templates/web/buckinghamshire/report/_item.html @@ -0,0 +1,139 @@ +[% IF NOT report_blocks_included ~%] +[% PROCESS 'admin/report_blocks.html' ~%] +[% END ~%] + +[% IF c.user.has_permission_to('planned_reports', problem.bodies_str_ids) OR c.user.is_planned_report(problem) ~%] + [% item_extra_class = "item-list__item--indented" ~%] + [% item_action = BLOCK ~%] + <input type="submit" value="1" + data-label-remove="[% loc('Remove from shortlist') %]" + data-label-add="[% loc('Add to shortlist') %]" + [% IF c.user.is_planned_report(problem) ~%] + name="shortlist-remove" title="[% loc('Remove from shortlist') %]" class="item-list__item__shortlist-remove" + [%~ ELSE ~%] + name="shortlist-add" title="[% IF problem.shortlisted_user %] + [%~ tprintf(loc('Shortlisted by %s'), problem.shortlisted_user.name) %]; [% END %] + [%~ loc('Add to shortlist') %]" class="item-list__item__shortlist-[% IF problem.shortlisted_user %]take[% ELSE %]add[% END %]" + [%~ END ~%] + > + [%~ END %] +[% END %] + +[% IF shortlist %] + [% item_extra_class = "item-list__item--indented item-list__item--act-and-sort" %] + [% item_action = BLOCK %] + [% item_action %] + <input type="submit" name="shortlist-up" value="[% loc('Up one') %]" title="[% loc('Up one') %]" class="item-list__item__shortlist-up" [% IF loop.first %]disabled[% END %]> + <input type="submit" name="shortlist-down" value="[% loc('Down one') %]" title="[% loc('Down one') %]" class="item-list__item__shortlist-down" [% IF loop.last %]disabled[% END %]> + [% END %] +[% END %] + +<li class="item-list__item item-list--reports__item [% item_extra_class %]" + data-report-id="[% problem.id | html %]" data-lastupdate="[% problem.lastupdate %]" id="report-[% problem.id | html %]"> +<a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]"> + [% IF problem.photo %] + <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt=""> + [% END %] + <h3 class="item-list__heading">[% problem.category | html %]: [% problem.title | html %]</h3> + [% IF c.user.has_permission_to('report_inspect', problem.bodies_str_ids) %] + <div class="item-list__description">[% problem.detail | html %]</div> + [% END %] + <small> + [% IF NOT no_fixed AND problem.is_fixed %] + <span class="item-list__item__state">[% prettify_state('fixed') %]</span> + [% ELSIF NOT no_fixed AND problem.is_closed %] + <span class="item-list__item__state">[% prettify_state('closed') %]</span> + [% ELSIF (c.user.has_permission_to('report_edit_priority', problem.bodies_str_ids) OR c.user.has_permission_to('report_inspect', problem.bodies_str_ids)) AND problem.response_priority %] + <span class="item-list__item__state">[% problem.response_priority.name %]</span> + [% END %] + [%- IF c.cobrand.moniker != 'fixamingata' %] [%# Default: %] + [%- IF problem.days_ago > 0 AND problem.days_ago <= c.cobrand.display_days_ago_threshold %] + [% tprintf( nget('Reported %d day ago', 'Reported %d days ago', problem.days_ago), problem.days_ago ) %] + [%- ELSE %] + [% prettify_dt( problem.confirmed, 1 ) %] + [%- END %] + [%- ELSE %] [%# Swedish cobrand fixamingata: %] + [%- prettify_dt( problem.confirmed) %] + [%- END %] + [%- 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('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 %] + [%- END %] + [% IF include_sentinfo %] + [% IF c.cobrand.is_council && !c.cobrand.owns_problem( problem ) %] + (sent to [% problem.body %]) + [% ELSIF problem.bodies_str_ids.size > 2 %] [% loc('(sent to all)') %] + [% ELSIF problem.bodies_str_ids.size == 2 %] [% loc('(sent to both)') %] + [% ELSIF problem.bodies_str_ids.size == 0 %] [% loc('(not sent to council)') %] + [% END %] + [% END %] + </small> + + [% IF c.user.has_permission_to('report_inspect', problem.bodies_str_ids) %] + <div class="item-list__item__metadata"> + <div> + <h4>[% loc('Report ID:') %]</h4> + <p>[% problem.id %]</p> + </div> + [% IF problem.local_coords %] + <div> + <h4>[% loc('Easting/Northing:') %]</h4> + <p>[% problem.local_coords.0 %], [% problem.local_coords.1 %]</p> + </div> + [% END %] + <div> + <h4>[% loc('Latitude/Longitude:') %]</h4> + <p>[% problem.latitude %], [% problem.longitude %]</p> + </div> + <div> + <h4>[% loc('Category') %]</h4> + <p>[% (problem.category_display OR '-') | html %]</p> + </div> + <div> + <h4>[% loc('State') %]</h4> + <p>[% prettify_state(problem.state, 1) %]</p> + </div> + <div> + <h4>[% loc('Priority') %]</h4> + <p>[% problem.response_priority.name OR '-' %]</p> + </div> + <div> + <h4>[% loc('Traffic management required?') %]</h4> + <p>[% problem.get_extra_metadata('traffic_information') %]</p> + </div> + <div> + <h4>[% loc('Extra details') %]</h4> + <p>[% problem.get_extra_metadata('detailed_information') | html %]</p> + </div> + [% SET fields = problem.get_extra_fields; IF fields.size %] + [% FOR f IN fields %] + <div> + <h4>[% f.name %]</h4> + <p>[% f.value %]</p> + </div> + [% END %] + [% END %] + </div> + [% END %] + + +</a> +[% IF item_action ~%] + [% IF page == 'report' ~%] + [%# We don't want to output shortlist on report page (in duplicate list) %] + [% ELSIF page == 'around' ~%] + [%# The around page list is already contained within the new report form %] + [% item_action.replace('("shortlist-[^"]*)', '$1-' _ problem.id) %] + [% ELSE ~%] + <form method="post" action="/my/planned/change"> + <input type="hidden" name="id" value="[% problem.id %]"> + <input type="hidden" name="token" value="[% csrf_token %]"> + [% item_action %] + </form> + [% END ~%] +[% END %] +</li> diff --git a/templates/web/fiksgatami/front/footer-marketing.html b/templates/web/fiksgatami/front/footer-marketing.html index 6069c8793..5ab99012c 100644 --- a/templates/web/fiksgatami/front/footer-marketing.html +++ b/templates/web/fiksgatami/front/footer-marketing.html @@ -7,12 +7,12 @@ <div id="footer-help"> <p> - Powered by <a class="platform-logo" href="http://fixmystreet.org/">FixMyStreet Platform</a> + Powered by <a class="platform-logo" href="https://fixmystreet.org/">FixMyStreet Platform</a> </p> <ul> <li> <h4>[% loc('Are you a developer?') %]</h4> - <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://fixmystreet.org">available at fixmystreet.org</a>.') %]</p> + <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="https://fixmystreet.org">available at fixmystreet.org</a>.') %]</p> </li> </ul> </div> diff --git a/templates/web/fixamingata/front/footer-marketing.html b/templates/web/fixamingata/front/footer-marketing.html index 3a081fdb9..587857f09 100644 --- a/templates/web/fixamingata/front/footer-marketing.html +++ b/templates/web/fixamingata/front/footer-marketing.html @@ -15,7 +15,7 @@ </li> <li> <h4>Är du en utvecklare?</h4> - <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://fixmystreet.org">available at fixmystreet.org</a>.') %]</p> + <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="https://fixmystreet.org">available at fixmystreet.org</a>.') %]</p> </li> <li> <h4>Är du anställd i en kommun?</h4> diff --git a/templates/web/fixmystreet.com/about/faq-en-gb.html b/templates/web/fixmystreet.com/about/faq-en-gb.html index 7601110a7..ef7b6e036 100755 --- a/templates/web/fixmystreet.com/about/faq-en-gb.html +++ b/templates/web/fixmystreet.com/about/faq-en-gb.html @@ -426,7 +426,7 @@ newspaper, put a message up in your library. It all helps. <dt>I'd like to make a FixMyStreet for my own country or town</dt> <dd> <p>FixMyStreet runs on open-source code, so that's fine. -<a href="http://fixmystreet.org/">Read more here</a>. +<a href="https://fixmystreet.org/">Read more here</a>. </dd> <dt>I want to suggest an improvement</dt> diff --git a/templates/web/fixmystreet.com/footer_extra.html b/templates/web/fixmystreet.com/footer_extra.html index e958ca35c..699d7de8b 100644 --- a/templates/web/fixmystreet.com/footer_extra.html +++ b/templates/web/fixmystreet.com/footer_extra.html @@ -63,7 +63,7 @@ </p> <p class="mysoc-footer__org"> Powered by - <a href="http://fixmystreet.org" class="js-lazyload mysoc-footer__org__logo mysoc-footer__org__logo--fms-platform">FixMyStreet Platform</a> + <a href="https://fixmystreet.org" class="js-lazyload mysoc-footer__org__logo mysoc-footer__org__logo--fms-platform">FixMyStreet Platform</a> </p> </div> </div> diff --git a/templates/web/fixmystreet.com/front/footer-marketing.html b/templates/web/fixmystreet.com/front/footer-marketing.html index 6ea1422d4..c5812cccf 100644 --- a/templates/web/fixmystreet.com/front/footer-marketing.html +++ b/templates/web/fixmystreet.com/front/footer-marketing.html @@ -14,5 +14,5 @@ </div> <div class="footer-marketing"> - <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://fixmystreet.org">available at fixmystreet.org</a>.') %]</p> + <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="https://fixmystreet.org">available at fixmystreet.org</a>.') %]</p> </div> diff --git a/templates/web/rutland/front/footer-marketing.html b/templates/web/rutland/front/footer-marketing.html index 7d998eba6..f6418e54d 100755 --- a/templates/web/rutland/front/footer-marketing.html +++ b/templates/web/rutland/front/footer-marketing.html @@ -3,6 +3,6 @@ [% loc('') %] </p> <p> - [% loc('Powered by <a class="platform-logo" href="http://fixmystreet.org/">FixMyStreet Platform</a>') %] + [% loc('Powered by <a class="platform-logo" href="https://fixmystreet.org/">FixMyStreet Platform</a>') %] </p> </div> diff --git a/web/cobrands/fixmystreet.com/front.js b/web/cobrands/fixmystreet.com/front.js index f544fb657..f3e64efa9 100644 --- a/web/cobrands/fixmystreet.com/front.js +++ b/web/cobrands/fixmystreet.com/front.js @@ -23,7 +23,7 @@ document.cookie = 'has_seen_country_message=1; path=/; expires=' + t.toUTCString(); }; var p = document.createElement('p'); - p.innerHTML = 'This site is for reporting <strong>problems in the UK</strong>. There are FixMyStreet sites <a href="http://fixmystreet.org/sites/">all over the world</a>, or you could set up your own using the <a href="http://fixmystreet.org/">FixMyStreet Platform</a>.'; + p.innerHTML = 'This site is for reporting <strong>problems in the UK</strong>. There are FixMyStreet sites <a href="https://fixmystreet.org/sites/">all over the world</a>, or you could set up your own using the <a href="https://fixmystreet.org/">FixMyStreet Platform</a>.'; banner.appendChild(close); banner.appendChild(p); document.body.insertBefore(banner, document.body.firstChild); |