diff options
26 files changed, 1319 insertions, 527 deletions
diff --git a/bin/gettext-merge b/bin/gettext-merge new file mode 100755 index 000000000..84aa4fdb7 --- /dev/null +++ b/bin/gettext-merge @@ -0,0 +1,45 @@ +#!/bin/bash +# +# bin/gettext-merge +# Update all .po files from new .pot +# +# Copyright (c) 2011 UK Citizens Online Democracy. All rights reserved. +# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ + +# Yuck +if [ -e ../../locale ] +then + cd ../../ +else if [ -e ../locale ] +then + cd ../ +else if [ -e locale ] +then + cd . +else + echo "Please run with current directory fixmystreet" + exit 1 +fi +fi +fi + +for X in locale/*.UTF-8 +do + if [ -d $X ] + then + cd $X/LC_MESSAGES + echo $X + if [ -e EmptyHomes.po ] + then + msgmerge -o New.po EmptyHomes.po ../../FixMyStreet-EmptyHomes.po + mv New.po EmptyHomes.po + fi + if [ -e FixMyStreet.po ] + then + msgmerge -o New.po FixMyStreet.po ../../FixMyStreet.po + mv New.po FixMyStreet.po + fi + cd - >/dev/null + fi +done + diff --git a/commonlib b/commonlib -Subproject 408dc4eda871e89ab97887c822fb21a869b0f89 +Subproject 5179eafd5174b069ea7d6b5855233513f0ec370 diff --git a/conf/httpd.conf b/conf/httpd.conf index 89da921ca..5797788e4 100644 --- a/conf/httpd.conf +++ b/conf/httpd.conf @@ -28,6 +28,8 @@ # # Alias /admin/ /home/yourname/fixmystreet/web-admin/ # +# Alias /jslib/ "/home/yourname/fixmystreet/commonlib/jslib/" +# # </VirtualHost> # # diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index cf5d40b7f..f1d14a6c0 100644 --- a/locale/FixMyStreet.po +++ b/locale/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-02-22 13:53+0000\n" +"POT-Creation-Date: 2011-02-23 13:09+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -22,7 +22,7 @@ msgid "Report Empty Homes" msgstr "" #: perllib/Cobrands/Fiksgatami/Util.pm:27 -msgid "Enter a nearby postcode, or street name and area:" +msgid "Enter a nearby postcode, or street name and area" msgstr "" #: perllib/Page.pm:83 @@ -257,7 +257,7 @@ msgstr "" msgid "Not reported to council" msgstr "" -#: perllib/Page.pm:622 web-admin/index.cgi:521 web-admin/index.cgi:645 +#: perllib/Page.pm:622 web-admin/index.cgi:522 web-admin/index.cgi:646 msgid "Updates" msgstr "" @@ -292,7 +292,7 @@ msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: perllib/Page.pm:675 perllib/FixMyStreet/Geocode.pm:133 +#: perllib/Page.pm:675 perllib/FixMyStreet/Geocode.pm:134 msgid "" "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include " "any maps for the region." @@ -324,21 +324,21 @@ msgstr "" msgid "That location does not appear to be in Britain; please try again." msgstr "" -#: perllib/FixMyStreet/Geocode.pm:113 +#: perllib/FixMyStreet/Geocode.pm:114 msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/Geocode.pm:115 perllib/FixMyStreet/Geocode.pm:130 +#: perllib/FixMyStreet/Geocode.pm:116 perllib/FixMyStreet/Geocode.pm:131 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode.pm:146 +#: perllib/FixMyStreet/Geocode.pm:147 msgid "" "We found more than one match for that location. We show up to ten matches, " "please try a different search if yours is not here." msgstr "" -#: perllib/FixMyStreet/Geocode.pm:161 +#: perllib/FixMyStreet/Geocode.pm:162 msgid "More than one match" msgstr "" @@ -381,32 +381,32 @@ msgstr "" msgid "Problem" msgstr "" -#: perllib/Problems.pm:147 +#: perllib/Problems.pm:148 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "" msgstr[1] "" -#: perllib/Problems.pm:152 +#: perllib/Problems.pm:153 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" -#: perllib/Problems.pm:158 +#: perllib/Problems.pm:159 msgid "FixMyStreet updates" msgstr "" -#: perllib/Problems.pm:161 perllib/Problems.pm:165 +#: perllib/Problems.pm:162 perllib/Problems.pm:166 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" msgstr[0] "" msgstr[1] "" -#: perllib/Problems.pm:166 +#: perllib/Problems.pm:167 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -546,7 +546,7 @@ msgid "RSS feed of nearby problems" msgstr "" #: web/alert.cgi:308 web/alert.cgi:367 web/index.cgi:970 web/index.cgi:1082 -#: web/reports.cgi:254 +#: web/reports.cgi:255 msgid "RSS feed" msgstr "" @@ -617,6 +617,7 @@ msgid "Receive email when updates are left on this problem." msgstr "" #: web/alert.cgi:461 web/alert.cgi:488 web/index.cgi:736 web/index.cgi:1076 +#: web-admin/index.cgi:630 web-admin/index.cgi:750 msgid "Email:" msgstr "" @@ -736,13 +737,15 @@ msgid "" "reported a problem to a council before?" msgstr "" -#: web/confirm.cgi:190 web/questionnaire.cgi:234 web-admin/index.cgi:339 -#: web-admin/index.cgi:340 web-admin/index.cgi:589 +#: web/confirm.cgi:190 web/questionnaire.cgi:234 web/questionnaire.cgi:322 +#: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503 +#: web-admin/index.cgi:590 web-admin/index.cgi:608 msgid "Yes" msgstr "" -#: web/confirm.cgi:191 web/questionnaire.cgi:235 web-admin/index.cgi:339 -#: web-admin/index.cgi:340 web-admin/index.cgi:589 +#: web/confirm.cgi:191 web/questionnaire.cgi:235 web/questionnaire.cgi:323 +#: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503 +#: web-admin/index.cgi:590 web-admin/index.cgi:608 msgid "No" msgstr "" @@ -836,7 +839,7 @@ msgstr "" msgid "Your email:" msgstr "" -#: web/contact.cgi:236 web/index.cgi:732 +#: web/contact.cgi:236 web/index.cgi:732 web-admin/index.cgi:622 msgid "Subject:" msgstr "" @@ -885,7 +888,7 @@ msgid "Viewing a location" msgstr "" #: web/index.cgi:121 -msgid "Enter a nearby GB postcode, or street name and area:" +msgid "Enter a nearby GB postcode, or street name and area" msgstr "" #: web/index.cgi:135 @@ -944,7 +947,7 @@ msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: web/index.cgi:258 +#: web/index.cgi:258 web-admin/index.cgi:477 msgid "Anonymous" msgstr "" @@ -1020,7 +1023,7 @@ msgid "" "please specify the closest point on land." msgstr "" -#: web/index.cgi:566 +#: web/index.cgi:566 web-admin/index.cgi:628 msgid "Category:" msgstr "" @@ -1059,6 +1062,10 @@ msgid "" "If this is not the correct location, simply click on the map again. " msgstr "" +#: web/index.cgi:641 web/index.cgi:660 web/index.cgi:662 web/index.cgi:675 +msgid " or " +msgstr "" + #: web/index.cgi:643 #, perl-format msgid "" @@ -1075,10 +1082,6 @@ msgid "" "name if you give us permission." msgstr "" -#: web/index.cgi:660 web/index.cgi:662 web/index.cgi:675 -msgid " or " -msgstr "" - #: web/index.cgi:661 msgid "All the information you provide here will be sent to" msgstr "" @@ -1163,7 +1166,7 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: web/index.cgi:733 +#: web/index.cgi:733 web-admin/index.cgi:623 msgid "Details:" msgstr "" @@ -1171,11 +1174,12 @@ msgstr "" msgid "Photo:" msgstr "" -#: web/index.cgi:735 web/index.cgi:1089 +#: web/index.cgi:735 web/index.cgi:1089 web-admin/index.cgi:629 +#: web-admin/index.cgi:749 msgid "Name:" msgstr "" -#: web/index.cgi:737 bin/send-reports:89 +#: web/index.cgi:737 bin/send-reports:89 web-admin/index.cgi:631 msgid "Phone:" msgstr "" @@ -1516,106 +1520,112 @@ msgid "" "your experience of getting the problem fixed?" msgstr "" -#: web/reports.cgi:192 web/reports.cgi:239 +#: web/questionnaire.cgi:321 +msgid "" +"Would you like to receive another questionnaire in 4 weeks, reminding you to " +"check the status?" +msgstr "" + +#: web/reports.cgi:193 web/reports.cgi:240 msgid "Summary reports" msgstr "" -#: web/reports.cgi:194 +#: web/reports.cgi:195 msgid "" "This is a summary of all reports on this site; select a particular council " "to see the reports sent there." msgstr "" -#: web/reports.cgi:195 +#: web/reports.cgi:196 msgid "Greyed-out lines are councils that no longer exist." msgstr "" -#: web/reports.cgi:199 +#: web/reports.cgi:200 web-admin/index.cgi:477 web-admin/index.cgi:656 msgid "Name" msgstr "" -#: web/reports.cgi:199 web/reports.cgi:275 +#: web/reports.cgi:200 web/reports.cgi:276 msgid "New problems" msgstr "" -#: web/reports.cgi:199 web/reports.cgi:283 +#: web/reports.cgi:200 web/reports.cgi:284 msgid "Older problems" msgstr "" -#: web/reports.cgi:201 +#: web/reports.cgi:202 msgid "Old problems,<br>state unknown" msgstr "" -#: web/reports.cgi:203 web/reports.cgi:290 +#: web/reports.cgi:204 web/reports.cgi:291 msgid "Recently fixed" msgstr "" -#: web/reports.cgi:203 +#: web/reports.cgi:204 msgid "Older fixed" msgstr "" -#: web/reports.cgi:245 +#: web/reports.cgi:246 msgid "council" msgstr "" -#: web/reports.cgi:255 +#: web/reports.cgi:256 #, perl-format msgid "RSS feed of problems in this %s" msgstr "" -#: web/reports.cgi:259 +#: web/reports.cgi:260 #, perl-format msgid "This is a summary of all reports for one %s." msgstr "" -#: web/reports.cgi:260 +#: web/reports.cgi:261 #, perl-format msgid "This is a summary of all reports for this %s." msgstr "" -#: web/reports.cgi:264 +#: web/reports.cgi:265 #, perl-format msgid "You can <a href=\"%s\">see less detail</a>." msgstr "" -#: web/reports.cgi:266 +#: web/reports.cgi:267 #, perl-format msgid "You can <a href=\"%s\">see more details</a>." msgstr "" -#: web/reports.cgi:268 +#: web/reports.cgi:269 #, perl-format msgid "" "You can <a href=\"%s\">see less detail</a> or go back and <a href=\"/reports" "\">show all councils</a>." msgstr "" -#: web/reports.cgi:270 +#: web/reports.cgi:271 #, perl-format msgid "" "You can <a href=\"%s\">see more details</a> or go back and <a href=\"/reports" "\">show all councils</a>." msgstr "" -#: web/reports.cgi:285 +#: web/reports.cgi:286 msgid "Old problems, state unknown" msgstr "" -#: web/reports.cgi:291 +#: web/reports.cgi:292 msgid "Old fixed" msgstr "" -#: web/reports.cgi:294 +#: web/reports.cgi:295 #, perl-format msgid "%s - Summary reports" msgstr "" -#: web/reports.cgi:294 +#: web/reports.cgi:295 #, perl-format msgid "Problems within %s, FixMyStreet" msgstr "" -#: web/reports.cgi:334 +#: web/reports.cgi:335 msgid "(not sent to council)" msgstr "" @@ -1804,7 +1814,11 @@ msgstr "" msgid "Council contacts" msgstr "" -#: web-admin/index.cgi:71 web-admin/index.cgi:782 web-admin/index.cgi:783 +#: web-admin/index.cgi:70 web-admin/index.cgi:464 +msgid "Search Reports" +msgstr "" + +#: web-admin/index.cgi:71 web-admin/index.cgi:783 web-admin/index.cgi:784 msgid "Timeline" msgstr "" @@ -1816,6 +1830,31 @@ msgstr "" msgid "FixMyStreet admin:" msgstr "" +#: web-admin/index.cgi:153 +#, perl-format +msgid "<strong>%d</strong> live problems" +msgstr "" + +#: web-admin/index.cgi:154 +#, perl-format +msgid "%d live updates" +msgstr "" + +#: web-admin/index.cgi:155 +#, perl-format +msgid "%d confirmed alerts, %d unconfirmed" +msgstr "" + +#: web-admin/index.cgi:156 +#, perl-format +msgid "%d questionnaires sent – %d answered (%d%%)" +msgstr "" + +#: web-admin/index.cgi:157 +#, perl-format +msgid "%d council contacts – %d confirmed, %d unconfirmed" +msgstr "" + #: web-admin/index.cgi:162 msgid "Graph of problem creation by status over time" msgstr "" @@ -1832,6 +1871,11 @@ msgstr "" msgid "Diligency prize league table" msgstr "" +#: web-admin/index.cgi:190 +#, perl-format +msgid "%d edits by %d" +msgstr "" + #: web-admin/index.cgi:193 msgid "No edits have yet been made." msgstr "" @@ -1840,199 +1884,374 @@ msgstr "" msgid "Councils" msgstr "" -#: web-admin/index.cgi:210 web-admin/index.cgi:585 +#: web-admin/index.cgi:211 web-admin/index.cgi:586 msgid "None" msgstr "" -#: web-admin/index.cgi:228 +#: web-admin/index.cgi:223 +#, perl-format +msgid "%d addresses" +msgstr "" + +#: web-admin/index.cgi:229 msgid "No info at all" msgstr "" -#: web-admin/index.cgi:230 +#: web-admin/index.cgi:231 msgid "Currently has 1+ deleted" msgstr "" -#: web-admin/index.cgi:232 +#: web-admin/index.cgi:233 msgid "Some unconfirmeds" msgstr "" -#: web-admin/index.cgi:234 +#: web-admin/index.cgi:235 msgid "All confirmed" msgstr "" -#: web-admin/index.cgi:264 web-admin/index.cgi:274 web-admin/index.cgi:291 +#: web-admin/index.cgi:265 web-admin/index.cgi:275 web-admin/index.cgi:292 msgid "*unknown*" msgstr "" -#: web-admin/index.cgi:267 web-admin/index.cgi:295 +#: web-admin/index.cgi:268 web-admin/index.cgi:296 msgid "Values updated" msgstr "" -#: web-admin/index.cgi:277 +#: web-admin/index.cgi:278 msgid "New category contact added" msgstr "" -#: web-admin/index.cgi:314 web-admin/index.cgi:397 +#: web-admin/index.cgi:315 web-admin/index.cgi:398 #, perl-format msgid "Council contacts for %s" msgstr "" -#: web-admin/index.cgi:327 +#: web-admin/index.cgi:328 msgid " List all reported problems" msgstr "" -#: web-admin/index.cgi:329 +#: web-admin/index.cgi:330 msgid "Text only version" msgstr "" -#: web-admin/index.cgi:335 +#: web-admin/index.cgi:336 web-admin/index.cgi:477 msgid "Category" msgstr "" -#: web-admin/index.cgi:335 web-admin/index.cgi:437 +#: web-admin/index.cgi:336 web-admin/index.cgi:438 web-admin/index.cgi:477 +#: web-admin/index.cgi:656 msgid "Email" msgstr "" -#: web-admin/index.cgi:335 web-admin/index.cgi:367 web-admin/index.cgi:420 -#: web-admin/index.cgi:437 web-admin/index.cgi:736 +#: web-admin/index.cgi:336 web-admin/index.cgi:368 web-admin/index.cgi:421 +#: web-admin/index.cgi:438 web-admin/index.cgi:737 msgid "Confirmed" msgstr "" -#: web-admin/index.cgi:335 web-admin/index.cgi:369 web-admin/index.cgi:422 -#: web-admin/index.cgi:437 +#: web-admin/index.cgi:336 web-admin/index.cgi:370 web-admin/index.cgi:423 +#: web-admin/index.cgi:438 msgid "Deleted" msgstr "" -#: web-admin/index.cgi:335 +#: web-admin/index.cgi:336 msgid "Last editor" msgstr "" -#: web-admin/index.cgi:335 web-admin/index.cgi:437 +#: web-admin/index.cgi:336 web-admin/index.cgi:438 msgid "Note" msgstr "" -#: web-admin/index.cgi:335 web-admin/index.cgi:437 +#: web-admin/index.cgi:336 web-admin/index.cgi:438 msgid "When edited" msgstr "" -#: web-admin/index.cgi:335 +#: web-admin/index.cgi:336 msgid "Confirm" msgstr "" -#: web-admin/index.cgi:352 +#: web-admin/index.cgi:353 msgid "Update statuses" msgstr "" -#: web-admin/index.cgi:357 +#: web-admin/index.cgi:358 msgid "Add new category" msgstr "" -#: web-admin/index.cgi:360 web-admin/index.cgi:414 +#: web-admin/index.cgi:361 web-admin/index.cgi:415 msgid "Category: " msgstr "" -#: web-admin/index.cgi:363 web-admin/index.cgi:417 +#: web-admin/index.cgi:364 web-admin/index.cgi:418 msgid "Email: " msgstr "" -#: web-admin/index.cgi:372 web-admin/index.cgi:425 +#: web-admin/index.cgi:373 web-admin/index.cgi:426 msgid "Note: " msgstr "" -#: web-admin/index.cgi:379 +#: web-admin/index.cgi:380 msgid "Create category" msgstr "" -#: web-admin/index.cgi:431 +#: web-admin/index.cgi:432 msgid "Save changes" msgstr "" -#: web-admin/index.cgi:435 +#: web-admin/index.cgi:436 msgid "History" msgstr "" -#: web-admin/index.cgi:437 +#: web-admin/index.cgi:438 msgid "Editor" msgstr "" -#: web-admin/index.cgi:441 web-admin/index.cgi:442 +#: web-admin/index.cgi:442 web-admin/index.cgi:443 msgid "yes" msgstr "" -#: web-admin/index.cgi:441 web-admin/index.cgi:442 +#: web-admin/index.cgi:442 web-admin/index.cgi:443 msgid "no" msgstr "" -#: web-admin/index.cgi:469 +#: web-admin/index.cgi:470 msgid "Search:" msgstr "" -#: web-admin/index.cgi:541 +#: web-admin/index.cgi:477 web-admin/index.cgi:656 +msgid "ID" +msgstr "" + +#: web-admin/index.cgi:477 +msgid "Title" +msgstr "" + +#: web-admin/index.cgi:477 +msgid "Council" +msgstr "" + +#: web-admin/index.cgi:477 web-admin/index.cgi:656 +msgid "Cobrand" +msgstr "" + +#: web-admin/index.cgi:477 web-admin/index.cgi:656 +msgid "Created" +msgstr "" + +#: web-admin/index.cgi:477 web-admin/index.cgi:656 +msgid "State" +msgstr "" + +#: web-admin/index.cgi:477 +msgid "When sent" +msgstr "" + +#: web-admin/index.cgi:477 web-admin/index.cgi:656 +msgid "*" +msgstr "" + +#: web-admin/index.cgi:499 web-admin/index.cgi:633 +msgid "Confirmed:" +msgstr "" + +#: web-admin/index.cgi:500 +msgid "Fixed:" +msgstr "" + +#: web-admin/index.cgi:501 +msgid "Last update:" +msgstr "" + +#: web-admin/index.cgi:517 web-admin/index.cgi:675 +msgid "Edit" +msgstr "" + +#: web-admin/index.cgi:542 msgid "That problem will now be resent." msgstr "" -#: web-admin/index.cgi:547 +#: web-admin/index.cgi:548 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" -#: web-admin/index.cgi:576 web-admin/index.cgi:696 +#: web-admin/index.cgi:577 web-admin/index.cgi:697 msgid "Updated!" msgstr "" -#: web-admin/index.cgi:580 +#: web-admin/index.cgi:581 #, perl-format msgid "Editing problem %d" msgstr "" -#: web-admin/index.cgi:608 web-admin/index.cgi:736 -msgid "State:" +#: web-admin/index.cgi:591 +msgid "used map" +msgstr "" + +#: web-admin/index.cgi:591 +msgid "didn't use map" +msgstr "" + +#: web-admin/index.cgi:603 web-admin/index.cgi:733 +msgid "Remove photo (can't be undone!)" msgstr "" #: web-admin/index.cgi:608 +msgid "Anonymous:" +msgstr "" + +#: web-admin/index.cgi:609 web-admin/index.cgi:737 +msgid "State:" +msgstr "" + +#: web-admin/index.cgi:609 msgid "Open" msgstr "" -#: web-admin/index.cgi:608 +#: web-admin/index.cgi:609 msgid "Fixed" msgstr "" -#: web-admin/index.cgi:608 web-admin/index.cgi:736 +#: web-admin/index.cgi:609 web-admin/index.cgi:737 msgid "Hidden" msgstr "" -#: web-admin/index.cgi:608 web-admin/index.cgi:736 +#: web-admin/index.cgi:609 web-admin/index.cgi:737 msgid "Unconfirmed" msgstr "" -#: web-admin/index.cgi:608 +#: web-admin/index.cgi:609 msgid "Partial" msgstr "" -#: web-admin/index.cgi:611 +#: web-admin/index.cgi:612 msgid "You really want to resend?" msgstr "" -#: web-admin/index.cgi:611 +#: web-admin/index.cgi:612 msgid "Resend report" msgstr "" -#: web-admin/index.cgi:642 web-admin/index.cgi:756 +#: web-admin/index.cgi:621 +msgid "View report on site" +msgstr "" + +#: web-admin/index.cgi:624 +msgid "Co-ordinates:" +msgstr "" + +#: web-admin/index.cgi:624 +msgid "originally entered" +msgstr "" + +#: web-admin/index.cgi:625 +msgid "For council(s):" +msgstr "" + +#: web-admin/index.cgi:625 +msgid "other areas:" +msgstr "" + +#: web-admin/index.cgi:632 web-admin/index.cgi:753 +msgid "Created:" +msgstr "" + +#: web-admin/index.cgi:634 +msgid "Sent:" +msgstr "" + +#: web-admin/index.cgi:635 +msgid "Last update:" +msgstr "" + +#: web-admin/index.cgi:636 +msgid "Service:" +msgstr "" + +#: web-admin/index.cgi:637 web-admin/index.cgi:751 +msgid "Cobrand:" +msgstr "" + +#: web-admin/index.cgi:638 web-admin/index.cgi:752 +msgid "Cobrand data:" +msgstr "" + +#: web-admin/index.cgi:639 +msgid "Going to send questionnaire?" +msgstr "" + +#: web-admin/index.cgi:643 web-admin/index.cgi:757 msgid "Submit changes" msgstr "" -#: web-admin/index.cgi:674 -msgid "Edit" +#: web-admin/index.cgi:656 +msgid "Text" msgstr "" -#: web-admin/index.cgi:701 +#: web-admin/index.cgi:702 msgid "Problem marked as open." msgstr "" -#: web-admin/index.cgi:717 +#: web-admin/index.cgi:718 #, perl-format msgid "Editing update %d" msgstr "" +#: web-admin/index.cgi:746 +msgid "View update on site" +msgstr "" + +#: web-admin/index.cgi:747 +msgid "Text:" +msgstr "" + +#: web-admin/index.cgi:749 +msgid "(blank to go anonymous)" +msgstr "" + +#: web-admin/index.cgi:830 +#, perl-format +msgid "by %s" +msgstr "" + +#: web-admin/index.cgi:832 +#, perl-format +msgid "Problem %d created" +msgstr "" + +#: web-admin/index.cgi:836 +#, perl-format +msgid "Problem %s confirmed" +msgstr "" + +#: web-admin/index.cgi:840 +#, perl-format +msgid "Problem %s sent to council %s" +msgstr "" + +#: web-admin/index.cgi:842 +#, perl-format +msgid "Questionnaire %d sent for problem %d" +msgstr "" + +#: web-admin/index.cgi:844 +#, perl-format +msgid "Questionnaire %d answered for problem %d, %s to %s" +msgstr "" + +#: web-admin/index.cgi:849 +#, perl-format +msgid "Update %s created for problem %d; by %s" +msgstr "" + +#: web-admin/index.cgi:853 +#, perl-format +msgid "Alert %d created for %s, type %s, parameters %s / %s" +msgstr "" + +#: web-admin/index.cgi:856 +#, perl-format +msgid "Alert %d disabled (created %s)" +msgstr "" + #. Please leave the first word "Subject:" untranslated #: templates/emails/alert-confirm diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index 1bd47967f..bc32354de 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-02-22 13:53+0000\n" +"POT-Creation-Date: 2011-02-23 13:09+0000\n" "PO-Revision-Date: 2009-07-10 14:20-0000\n" "Last-Translator: Mark Smith <Mark.Smith@trosol.co.uk>\n" "Language-Team: mySociety\n" @@ -25,7 +25,7 @@ msgstr "Adrodd am Eiddo Gwag" #: perllib/Cobrands/Fiksgatami/Util.pm:27 #, fuzzy -msgid "Enter a nearby postcode, or street name and area:" +msgid "Enter a nearby postcode, or street name and area" msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" #: perllib/Page.pm:83 @@ -289,7 +289,7 @@ msgstr "Anfonwyd at %s %s yn ddiweddarach" msgid "Not reported to council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: perllib/Page.pm:622 web-admin/index.cgi:521 web-admin/index.cgi:645 +#: perllib/Page.pm:622 web-admin/index.cgi:522 web-admin/index.cgi:646 msgid "Updates" msgstr "Diweddariadau" @@ -324,7 +324,7 @@ msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: perllib/Page.pm:675 perllib/FixMyStreet/Geocode.pm:133 +#: perllib/Page.pm:675 perllib/FixMyStreet/Geocode.pm:134 msgid "" "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include " "any maps for the region." @@ -363,16 +363,16 @@ msgstr "" "Nid yw'n ymddangos bod y lleoliad hwnnw ym Mhrydain; rhowch gynnig arall " "arni." -#: perllib/FixMyStreet/Geocode.pm:113 +#: perllib/FixMyStreet/Geocode.pm:114 msgid "Sorry, we could not parse that location. Please try again." msgstr "" "Sori, ni fu modd i ni ddosrannu'r lleoliad hwnnw. Rhowch gynnig arall arni." -#: perllib/FixMyStreet/Geocode.pm:115 perllib/FixMyStreet/Geocode.pm:130 +#: perllib/FixMyStreet/Geocode.pm:116 perllib/FixMyStreet/Geocode.pm:131 msgid "Sorry, we could not find that location." msgstr "Sori, ni fu modd i ni ddod o hyd i'r lleoliad hwnnw." -#: perllib/FixMyStreet/Geocode.pm:146 +#: perllib/FixMyStreet/Geocode.pm:147 msgid "" "We found more than one match for that location. We show up to ten matches, " "please try a different search if yours is not here." @@ -381,7 +381,7 @@ msgstr "" "hyd at ddeg cyfatebiaeth, rhowch gynnig ar chwiliad gwahanol os nad yw'ch " "lleoliad chi yno." -#: perllib/FixMyStreet/Geocode.pm:161 +#: perllib/FixMyStreet/Geocode.pm:162 msgid "More than one match" msgstr "" @@ -425,32 +425,32 @@ msgstr "" msgid "Empty property" msgstr "Eiddo gwag" -#: perllib/Problems.pm:147 +#: perllib/Problems.pm:148 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> adroddiad o fewn yr wythnos ddiwethaf" msgstr[1] "<big>%s</big> o adroddiadau o fewn yr wythnos ddiwethaf" -#: perllib/Problems.pm:152 +#: perllib/Problems.pm:153 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> adroddiad yn ddiweddar" msgstr[1] "<big>%s</big> o adroddiadau yn ddiweddar" -#: perllib/Problems.pm:158 +#: perllib/Problems.pm:159 msgid "reportemptyhomes.com updates" msgstr "Diweddariadau i reportemptyhomes.com" -#: perllib/Problems.pm:161 perllib/Problems.pm:165 +#: perllib/Problems.pm:162 perllib/Problems.pm:166 #, perl-format msgid "<big>%s</big> returned to use in past month" msgid_plural "<big>%s</big> returned to use in past month" msgstr[0] "Dychwelwyd <big>%s</big> i'w ddefnyddio yn y mis diwethaf" msgstr[1] "Dychwelwyd <big>%s</big> i'w defnyddio yn y mis diwethaf" -#: perllib/Problems.pm:166 +#: perllib/Problems.pm:167 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -640,7 +640,7 @@ msgid "RSS feed of nearby empty properties" msgstr "Porthiant RSS o eiddo gwag sydd gerllaw" #: web/alert.cgi:308 web/alert.cgi:367 web/index.cgi:970 web/index.cgi:1082 -#: web/reports.cgi:254 +#: web/reports.cgi:255 msgid "RSS feed" msgstr "Porthiant RSS" @@ -724,6 +724,7 @@ msgstr "" "hwn." #: web/alert.cgi:461 web/alert.cgi:488 web/index.cgi:736 web/index.cgi:1076 +#: web-admin/index.cgi:630 web-admin/index.cgi:750 msgid "Email:" msgstr "E-bost:" @@ -876,13 +877,15 @@ msgstr "" "i ni'ch holi chi, a ydych erioed wedi rhoi gwybod i'r cyngor am eiddo gwag " "cyn hyn?" -#: web/confirm.cgi:190 web/questionnaire.cgi:234 web-admin/index.cgi:339 -#: web-admin/index.cgi:340 web-admin/index.cgi:589 +#: web/confirm.cgi:190 web/questionnaire.cgi:234 web/questionnaire.cgi:322 +#: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503 +#: web-admin/index.cgi:590 web-admin/index.cgi:608 msgid "Yes" msgstr "Ydw" -#: web/confirm.cgi:191 web/questionnaire.cgi:235 web-admin/index.cgi:339 -#: web-admin/index.cgi:340 web-admin/index.cgi:589 +#: web/confirm.cgi:191 web/questionnaire.cgi:235 web/questionnaire.cgi:323 +#: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503 +#: web-admin/index.cgi:590 web-admin/index.cgi:608 msgid "No" msgstr "Nac ydw" @@ -993,7 +996,7 @@ msgstr "Eich enw:" msgid "Your email:" msgstr "Eich cyfeiriad e-bost:" -#: web/contact.cgi:236 web/index.cgi:732 +#: web/contact.cgi:236 web/index.cgi:732 web-admin/index.cgi:622 msgid "Subject:" msgstr "Pwnc:" @@ -1047,8 +1050,8 @@ msgid "Viewing a location" msgstr "Gweld lleoliad" #: web/index.cgi:121 -msgid "Enter a nearby GB postcode, or street name and area:" -msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" +msgid "Enter a nearby GB postcode, or street name and area" +msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw" #: web/index.cgi:135 msgid "Report and view empty properties" @@ -1115,7 +1118,7 @@ msgstr "" "Nid yw'n ymddangos bod y ddelwedd honno wedi llwytho i fyny'n gywir (%s), " "rhowch gynnig arni eto." -#: web/index.cgi:258 +#: web/index.cgi:258 web-admin/index.cgi:477 msgid "Anonymous" msgstr "Di-enw" @@ -1202,7 +1205,7 @@ msgstr "" "Os ydych wedi ceisio adrodd am broblem oddi ar y lân, er enghraifft,\n" "dylech nodi'r pwynt agosaf ar y tir." -#: web/index.cgi:566 +#: web/index.cgi:566 web-admin/index.cgi:628 msgid "Category:" msgstr "Categori:" @@ -1244,6 +1247,11 @@ msgstr "" "gan y pin porffor ar y map.\n" "Os nad dyma'r lleoliad cywir, cliciwch ar y map eto. " +#: web/index.cgi:641 web/index.cgi:660 web/index.cgi:662 web/index.cgi:675 +#, fuzzy +msgid " or " +msgstr "neu" + #: web/index.cgi:643 #, perl-format msgid "" @@ -1265,11 +1273,6 @@ msgid "" "name if you give us permission." msgstr "" -#: web/index.cgi:660 web/index.cgi:662 web/index.cgi:675 -#, fuzzy -msgid " or " -msgstr "neu" - #: web/index.cgi:661 msgid "All the information you provide here will be sent to" msgstr "" @@ -1371,7 +1374,7 @@ msgstr "Llenwch fanylion yr eiddo gwag isod." msgid "Empty property details form" msgstr "Ffurflen manylion eiddo gwag" -#: web/index.cgi:733 +#: web/index.cgi:733 web-admin/index.cgi:623 msgid "Details:" msgstr "Manylion:" @@ -1379,11 +1382,12 @@ msgstr "Manylion:" msgid "Photo:" msgstr "Ffotograff:" -#: web/index.cgi:735 web/index.cgi:1089 +#: web/index.cgi:735 web/index.cgi:1089 web-admin/index.cgi:629 +#: web-admin/index.cgi:749 msgid "Name:" msgstr "Enw:" -#: web/index.cgi:737 bin/send-reports:89 +#: web/index.cgi:737 bin/send-reports:89 web-admin/index.cgi:631 msgid "Phone:" msgstr "Rhif ffôn:" @@ -1794,11 +1798,17 @@ msgstr "" "profiad\n" "o gael yr eiddo gwag yn ôl mewn defnydd?" -#: web/reports.cgi:192 web/reports.cgi:239 +#: web/questionnaire.cgi:321 +msgid "" +"Would you like to receive another questionnaire in 4 weeks, reminding you to " +"check the status?" +msgstr "" + +#: web/reports.cgi:193 web/reports.cgi:240 msgid "Summary reports" msgstr "Adroddiadau cryno" -#: web/reports.cgi:194 +#: web/reports.cgi:195 msgid "" "This is a summary of all reports on this site; select a particular council " "to see the reports sent there." @@ -1806,64 +1816,64 @@ msgstr "" "Dyma grynodeb o'r holl adroddiadau ar y safle hwn; dewiswch gyngor penodol i " "weld yr adroddiadau a anfonwyd ato." -#: web/reports.cgi:195 +#: web/reports.cgi:196 msgid "Greyed-out lines are councils that no longer exist." msgstr "Mae'r llinellau mewn llwyd yn gynghorau nad ydynt yn bodoli mwyach." -#: web/reports.cgi:199 +#: web/reports.cgi:200 web-admin/index.cgi:477 web-admin/index.cgi:656 msgid "Name" msgstr "Enw" -#: web/reports.cgi:199 web/reports.cgi:275 +#: web/reports.cgi:200 web/reports.cgi:276 msgid "New empty property reports" msgstr "Adroddiadau newydd am eiddo gwag" -#: web/reports.cgi:199 web/reports.cgi:283 +#: web/reports.cgi:200 web/reports.cgi:284 msgid "Older empty property reports" msgstr "Adroddiadau hŷn o eiddo gwag" -#: web/reports.cgi:201 +#: web/reports.cgi:202 msgid "Old empty properties,<br>state unknown" msgstr "Hen eiddo gwag,<br>cyflwr anhysbys" -#: web/reports.cgi:203 web/reports.cgi:290 +#: web/reports.cgi:204 web/reports.cgi:291 msgid "Recently returned to use" msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" -#: web/reports.cgi:203 +#: web/reports.cgi:204 msgid "Older returned to use" msgstr "Wedi'u hadfer i'w defnyddio ers amser" -#: web/reports.cgi:245 +#: web/reports.cgi:246 msgid "council" msgstr "cyngor" -#: web/reports.cgi:255 +#: web/reports.cgi:256 #, perl-format msgid "RSS feed of empty properties in this %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: web/reports.cgi:259 +#: web/reports.cgi:260 #, perl-format msgid "This is a summary of all reports for one %s." msgstr "Dyma grynodeb o'r holl adroddiadau ar gyfer y %s." -#: web/reports.cgi:260 +#: web/reports.cgi:261 #, perl-format msgid "This is a summary of all reports for this %s." msgstr "" -#: web/reports.cgi:264 +#: web/reports.cgi:265 #, perl-format msgid "You can <a href=\"%s\">see less detail</a>." msgstr "Gallwch <a href=\"%s\">weld llai o fanylion</a>." -#: web/reports.cgi:266 +#: web/reports.cgi:267 #, perl-format msgid "You can <a href=\"%s\">see more details</a>." msgstr "Gallwch <a href=\"%s\">weld mwy o fanylion</a>." -#: web/reports.cgi:268 +#: web/reports.cgi:269 #, perl-format msgid "" "You can <a href=\"%s\">see less detail</a> or go back and <a href=\"/reports" @@ -1872,7 +1882,7 @@ msgstr "" "Gallwch <a href=\"%s\">weld llai o fanylion</a> neu fynd yn ôl a <a href=\"/" "reports\">dangos pob cyngor</a>." -#: web/reports.cgi:270 +#: web/reports.cgi:271 #, perl-format msgid "" "You can <a href=\"%s\">see more details</a> or go back and <a href=\"/reports" @@ -1881,25 +1891,25 @@ msgstr "" "Gallwch <a href=\"%s\">weld mwy o fanylion</a> neu fynd yn ôl a <a href=\"/" "reports\">dangos pob cyngor</a>." -#: web/reports.cgi:285 +#: web/reports.cgi:286 msgid "Old empty properties, state unknown" msgstr "Eiddo gwag hen, nid yw eu cyflwr yn hysbys" -#: web/reports.cgi:291 +#: web/reports.cgi:292 msgid "Old returned to use" msgstr "Hen wedi'i adfer i'w ddefnyddio" -#: web/reports.cgi:294 +#: web/reports.cgi:295 #, perl-format msgid "%s - Summary reports" msgstr "%s - Adroddiadau cryno" -#: web/reports.cgi:294 +#: web/reports.cgi:295 #, perl-format msgid "Empty properties within %s, reportemptyhomes.com" msgstr "Eiddo gwag o fewn %s, reportemptyhomes.com" -#: web/reports.cgi:334 +#: web/reports.cgi:335 #, fuzzy msgid "(not sent to council)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -2127,7 +2137,12 @@ msgstr "Adroddiadau cryno" msgid "Council contacts" msgstr "Cysylltwch â Ni" -#: web-admin/index.cgi:71 web-admin/index.cgi:782 web-admin/index.cgi:783 +#: web-admin/index.cgi:70 web-admin/index.cgi:464 +#, fuzzy +msgid "Search Reports" +msgstr "Adroddiadau cryno" + +#: web-admin/index.cgi:71 web-admin/index.cgi:783 web-admin/index.cgi:784 msgid "Timeline" msgstr "" @@ -2141,6 +2156,31 @@ msgstr "Diweddariadau i reportemptyhomes.com" msgid "reportemptyhomes.com admin:" msgstr "reportemptyhomes.com" +#: web-admin/index.cgi:153 +#, fuzzy, perl-format +msgid "<strong>%d</strong> live empty properties" +msgstr "Adrodd am eiddo gwag a gweld y rhain" + +#: web-admin/index.cgi:154 +#, fuzzy, perl-format +msgid "%d live updates" +msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" + +#: web-admin/index.cgi:155 +#, perl-format +msgid "%d confirmed alerts, %d unconfirmed" +msgstr "" + +#: web-admin/index.cgi:156 +#, perl-format +msgid "%d questionnaires sent – %d answered (%d%%)" +msgstr "" + +#: web-admin/index.cgi:157 +#, perl-format +msgid "%d council contacts – %d confirmed, %d unconfirmed" +msgstr "" + #: web-admin/index.cgi:162 msgid "Graph of empty property creation by status over time" msgstr "" @@ -2158,6 +2198,11 @@ msgstr "" msgid "Diligency prize league table" msgstr "" +#: web-admin/index.cgi:190 +#, perl-format +msgid "%d edits by %d" +msgstr "" + #: web-admin/index.cgi:193 msgid "No edits have yet been made." msgstr "" @@ -2167,219 +2212,404 @@ msgstr "" msgid "Councils" msgstr "cyngor" -#: web-admin/index.cgi:210 web-admin/index.cgi:585 +#: web-admin/index.cgi:211 web-admin/index.cgi:586 #, fuzzy msgid "None" msgstr "Nac ydw" -#: web-admin/index.cgi:228 +#: web-admin/index.cgi:223 +#, fuzzy, perl-format +msgid "%d addresses" +msgstr "wythnos" + +#: web-admin/index.cgi:229 msgid "No info at all" msgstr "" -#: web-admin/index.cgi:230 +#: web-admin/index.cgi:231 msgid "Currently has 1+ deleted" msgstr "" -#: web-admin/index.cgi:232 +#: web-admin/index.cgi:233 msgid "Some unconfirmeds" msgstr "" -#: web-admin/index.cgi:234 +#: web-admin/index.cgi:235 msgid "All confirmed" msgstr "" -#: web-admin/index.cgi:264 web-admin/index.cgi:274 web-admin/index.cgi:291 +#: web-admin/index.cgi:265 web-admin/index.cgi:275 web-admin/index.cgi:292 msgid "*unknown*" msgstr "" -#: web-admin/index.cgi:267 web-admin/index.cgi:295 +#: web-admin/index.cgi:268 web-admin/index.cgi:296 #, fuzzy msgid "Values updated" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: web-admin/index.cgi:277 +#: web-admin/index.cgi:278 msgid "New category contact added" msgstr "" -#: web-admin/index.cgi:314 web-admin/index.cgi:397 +#: web-admin/index.cgi:315 web-admin/index.cgi:398 #, perl-format msgid "Council contacts for %s" msgstr "" -#: web-admin/index.cgi:327 +#: web-admin/index.cgi:328 #, fuzzy msgid " List all reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" -#: web-admin/index.cgi:329 +#: web-admin/index.cgi:330 msgid "Text only version" msgstr "" -#: web-admin/index.cgi:335 +#: web-admin/index.cgi:336 web-admin/index.cgi:477 #, fuzzy msgid "Category" msgstr "Categori:" -#: web-admin/index.cgi:335 web-admin/index.cgi:437 +#: web-admin/index.cgi:336 web-admin/index.cgi:438 web-admin/index.cgi:477 +#: web-admin/index.cgi:656 #, fuzzy msgid "Email" msgstr "E-bost:" -#: web-admin/index.cgi:335 web-admin/index.cgi:367 web-admin/index.cgi:420 -#: web-admin/index.cgi:437 web-admin/index.cgi:736 +#: web-admin/index.cgi:336 web-admin/index.cgi:368 web-admin/index.cgi:421 +#: web-admin/index.cgi:438 web-admin/index.cgi:737 #, fuzzy msgid "Confirmed" msgstr "Cadarnhau" -#: web-admin/index.cgi:335 web-admin/index.cgi:369 web-admin/index.cgi:422 -#: web-admin/index.cgi:437 +#: web-admin/index.cgi:336 web-admin/index.cgi:370 web-admin/index.cgi:423 +#: web-admin/index.cgi:438 msgid "Deleted" msgstr "" -#: web-admin/index.cgi:335 +#: web-admin/index.cgi:336 msgid "Last editor" msgstr "" -#: web-admin/index.cgi:335 web-admin/index.cgi:437 +#: web-admin/index.cgi:336 web-admin/index.cgi:438 #, fuzzy msgid "Note" msgstr "Nac ydw" -#: web-admin/index.cgi:335 web-admin/index.cgi:437 +#: web-admin/index.cgi:336 web-admin/index.cgi:438 msgid "When edited" msgstr "" -#: web-admin/index.cgi:335 +#: web-admin/index.cgi:336 #, fuzzy msgid "Confirm" msgstr "Cadarnhau" -#: web-admin/index.cgi:352 +#: web-admin/index.cgi:353 #, fuzzy msgid "Update statuses" msgstr "Diweddariadau" -#: web-admin/index.cgi:357 +#: web-admin/index.cgi:358 msgid "Add new category" msgstr "" -#: web-admin/index.cgi:360 web-admin/index.cgi:414 +#: web-admin/index.cgi:361 web-admin/index.cgi:415 #, fuzzy msgid "Category: " msgstr "Categori:" -#: web-admin/index.cgi:363 web-admin/index.cgi:417 +#: web-admin/index.cgi:364 web-admin/index.cgi:418 #, fuzzy msgid "Email: " msgstr "E-bost:" -#: web-admin/index.cgi:372 web-admin/index.cgi:425 +#: web-admin/index.cgi:373 web-admin/index.cgi:426 msgid "Note: " msgstr "" -#: web-admin/index.cgi:379 +#: web-admin/index.cgi:380 #, fuzzy msgid "Create category" msgstr "Categori:" -#: web-admin/index.cgi:431 +#: web-admin/index.cgi:432 msgid "Save changes" msgstr "" -#: web-admin/index.cgi:435 +#: web-admin/index.cgi:436 msgid "History" msgstr "" -#: web-admin/index.cgi:437 +#: web-admin/index.cgi:438 msgid "Editor" msgstr "" -#: web-admin/index.cgi:441 web-admin/index.cgi:442 +#: web-admin/index.cgi:442 web-admin/index.cgi:443 #, fuzzy msgid "yes" msgstr "Ydw" -#: web-admin/index.cgi:441 web-admin/index.cgi:442 +#: web-admin/index.cgi:442 web-admin/index.cgi:443 msgid "no" msgstr "" -#: web-admin/index.cgi:469 +#: web-admin/index.cgi:470 msgid "Search:" msgstr "" -#: web-admin/index.cgi:541 +#: web-admin/index.cgi:477 web-admin/index.cgi:656 +msgid "ID" +msgstr "" + +#: web-admin/index.cgi:477 +msgid "Title" +msgstr "" + +#: web-admin/index.cgi:477 +#, fuzzy +msgid "Council" +msgstr "cyngor" + +#: web-admin/index.cgi:477 web-admin/index.cgi:656 +msgid "Cobrand" +msgstr "" + +#: web-admin/index.cgi:477 web-admin/index.cgi:656 +msgid "Created" +msgstr "" + +#: web-admin/index.cgi:477 web-admin/index.cgi:656 +#, fuzzy +msgid "State" +msgstr "Diweddariad:" + +#: web-admin/index.cgi:477 +msgid "When sent" +msgstr "" + +#: web-admin/index.cgi:477 web-admin/index.cgi:656 +msgid "*" +msgstr "" + +#: web-admin/index.cgi:499 web-admin/index.cgi:633 +#, fuzzy +msgid "Confirmed:" +msgstr "Cadarnhau" + +#: web-admin/index.cgi:500 +msgid "Fixed:" +msgstr "" + +#: web-admin/index.cgi:501 +msgid "Last update:" +msgstr "" + +#: web-admin/index.cgi:517 web-admin/index.cgi:675 +msgid "Edit" +msgstr "" + +#: web-admin/index.cgi:542 #, fuzzy msgid "That empty property will now be resent." msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: web-admin/index.cgi:547 +#: web-admin/index.cgi:548 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" -#: web-admin/index.cgi:576 web-admin/index.cgi:696 +#: web-admin/index.cgi:577 web-admin/index.cgi:697 #, fuzzy msgid "Updated!" msgstr "Diweddariadau" -#: web-admin/index.cgi:580 +#: web-admin/index.cgi:581 #, fuzzy, perl-format msgid "Editing empty property %d" msgstr "Gweld eiddo gwag" -#: web-admin/index.cgi:608 web-admin/index.cgi:736 +#: web-admin/index.cgi:591 +msgid "used map" +msgstr "" + +#: web-admin/index.cgi:591 +msgid "didn't use map" +msgstr "" + +#: web-admin/index.cgi:603 web-admin/index.cgi:733 +msgid "Remove photo (can't be undone!)" +msgstr "" + +#: web-admin/index.cgi:608 +#, fuzzy +msgid "Anonymous:" +msgstr "Di-enw" + +#: web-admin/index.cgi:609 web-admin/index.cgi:737 #, fuzzy msgid "State:" msgstr "Diweddariad:" -#: web-admin/index.cgi:608 +#: web-admin/index.cgi:609 msgid "Open" msgstr "" -#: web-admin/index.cgi:608 +#: web-admin/index.cgi:609 msgid "Fixed" msgstr "" -#: web-admin/index.cgi:608 web-admin/index.cgi:736 +#: web-admin/index.cgi:609 web-admin/index.cgi:737 #, fuzzy msgid "Hidden" msgstr "Cuddio pinnau" -#: web-admin/index.cgi:608 web-admin/index.cgi:736 +#: web-admin/index.cgi:609 web-admin/index.cgi:737 msgid "Unconfirmed" msgstr "" -#: web-admin/index.cgi:608 +#: web-admin/index.cgi:609 msgid "Partial" msgstr "" -#: web-admin/index.cgi:611 +#: web-admin/index.cgi:612 msgid "You really want to resend?" msgstr "" -#: web-admin/index.cgi:611 +#: web-admin/index.cgi:612 #, fuzzy msgid "Resend report" msgstr "Cuddio hen adroddiadau " -#: web-admin/index.cgi:642 web-admin/index.cgi:756 +#: web-admin/index.cgi:621 +#, fuzzy +msgid "View report on site" +msgstr "Adroddiadau" + +#: web-admin/index.cgi:624 +msgid "Co-ordinates:" +msgstr "" + +#: web-admin/index.cgi:624 +msgid "originally entered" +msgstr "" + +#: web-admin/index.cgi:625 +#, fuzzy +msgid "For council(s):" +msgstr "cyngor" + +#: web-admin/index.cgi:625 +msgid "other areas:" +msgstr "" + +#: web-admin/index.cgi:632 web-admin/index.cgi:753 +msgid "Created:" +msgstr "" + +#: web-admin/index.cgi:634 +#, fuzzy +msgid "Sent:" +msgstr "Pwnc:" + +#: web-admin/index.cgi:635 +#, fuzzy +msgid "Last update:" +msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" + +#: web-admin/index.cgi:636 +msgid "Service:" +msgstr "" + +#: web-admin/index.cgi:637 web-admin/index.cgi:751 +msgid "Cobrand:" +msgstr "" + +#: web-admin/index.cgi:638 web-admin/index.cgi:752 +msgid "Cobrand data:" +msgstr "" + +#: web-admin/index.cgi:639 +#, fuzzy +msgid "Going to send questionnaire?" +msgstr "Anfon yr holiadur" + +#: web-admin/index.cgi:643 web-admin/index.cgi:757 #, fuzzy msgid "Submit changes" msgstr "Anfon" -#: web-admin/index.cgi:674 -msgid "Edit" +#: web-admin/index.cgi:656 +msgid "Text" msgstr "" -#: web-admin/index.cgi:701 +#: web-admin/index.cgi:702 #, fuzzy msgid "Empty property marked as open." msgstr "Ffurflen manylion eiddo gwag" -#: web-admin/index.cgi:717 +#: web-admin/index.cgi:718 #, fuzzy, perl-format msgid "Editing update %d" msgstr "Cyflwyno'ch diweddariad" +#: web-admin/index.cgi:746 +#, fuzzy +msgid "View update on site" +msgstr "Diweddariadau am {{title}}" + +#: web-admin/index.cgi:747 +msgid "Text:" +msgstr "" + +#: web-admin/index.cgi:749 +msgid "(blank to go anonymous)" +msgstr "" + +#: web-admin/index.cgi:830 +#, perl-format +msgid "by %s" +msgstr "" + +#: web-admin/index.cgi:832 +#, fuzzy, perl-format +msgid "Empty property %d created" +msgstr "Eiddo gwag" + +#: web-admin/index.cgi:836 +#, fuzzy, perl-format +msgid "Empty property %s confirmed" +msgstr "Ffurflen manylion eiddo gwag" + +#: web-admin/index.cgi:840 +#, fuzzy, perl-format +msgid "Empty property %s sent to council %s" +msgstr "Eiddo gwag yn %s" + +#: web-admin/index.cgi:842 +#, fuzzy, perl-format +msgid "Questionnaire %d sent for empty property %d" +msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" + +#: web-admin/index.cgi:844 +#, fuzzy, perl-format +msgid "Questionnaire %d answered for empty property %d, %s to %s" +msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" + +#: web-admin/index.cgi:849 +#, perl-format +msgid "Update %s created for empty property %d; by %s" +msgstr "" + +#: web-admin/index.cgi:853 +#, perl-format +msgid "Alert %d created for %s, type %s, parameters %s / %s" +msgstr "" + +#: web-admin/index.cgi:856 +#, perl-format +msgid "Alert %d disabled (created %s)" +msgstr "" + #. Please leave the first word "Subject:" untranslated #: templates/emails/alert-confirm msgid "" @@ -3292,6 +3522,9 @@ msgstr "" "ymddangos am yr eiddo hwn,\n" "dilynwch y ddolen hon: <?=$values['unsubscribe_url']?>\n" +#~ msgid "Enter a nearby GB postcode, or street name and area:" +#~ msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" + #~ msgid "" #~ "We will contact you again in a month and again after six months to ask " #~ "what has\n" @@ -3305,9 +3538,6 @@ msgstr "" #~ "hynny,\n" #~ "ond os nad ydyw, gallwn gynnig cyngor ar yr beth y gallwch ei wneud nesaf." -#~ msgid "Enter a nearby GB postcode, or street name and area" -#~ msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw" - #~ msgid "Please note that updates are not sent to the council." #~ msgstr "Sylwer nad yw diweddariadau'n cael eu hanfon at y cyngor." diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 52e695500..2d4e0a633 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: FixMyStreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-02-22 13:53+0000\n" -"PO-Revision-Date: 2011-02-22 07:59MET\n" +"POT-Creation-Date: 2011-02-23 13:09+0000\n" +"PO-Revision-Date: 2011-02-23 10:16MET\n" "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" "MIME-Version: 1.0\n" @@ -24,8 +24,8 @@ msgid "Report Empty Homes" msgstr "Rapporter tomme hjem" #: perllib/Cobrands/Fiksgatami/Util.pm:27 -msgid "Enter a nearby postcode, or street name and area:" -msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted:" +msgid "Enter a nearby postcode, or street name and area" +msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted" #: perllib/Page.pm:83 #, perl-format @@ -92,7 +92,6 @@ msgstr "" "\">kode</a>." #: perllib/Page.pm:312 -#, fuzzy msgid "" "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained " "by <a href=\"http://www.nuug.no/\">NUUG</a>, using some <a href=\"http://" @@ -101,7 +100,7 @@ msgid "" msgstr "" "Bygget av <a href=\"http://www.mysociety.org/\">mySociety</a> og " "vedlikeholdt av <a href=\"http://www.nuug.no/\">NUUG</a>, ved hjelp av <a " -"href=\"http://github.com/mysociety/fixmystreet\">smart</a> <a href=" +"href=\"http://github.com/mysociety/fixmystreet\">snedig</a> <a href=" "\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa" "\">kode</a>." @@ -128,7 +127,7 @@ msgstr "Feil" #: perllib/Page.pm:443 msgid "your problem will not be posted" -msgstr "ditt problem vil ikke bli publisert" +msgstr "vil ditt problem ikke bli publisert" #: perllib/Page.pm:444 msgid "we'll hang on to your problem report while you're checking your email." @@ -166,7 +165,7 @@ msgstr "" "<h1>Nesten ferdig! Nå må du sjekke eposten din...</h1>\n" "<p>Bekreftelseseposten <strong>kan</strong> bruke noen minutter på å nå frem " "— så vær tålmodig.</p>\n" -"<p>Hvis du bruker webbasert epost eller har søppelepost-filter, så børr du " +"<p>Hvis du bruker webbasert epost eller har søppelepost-filter, så bør du " "kanskje a sjekke din bulk/spam-mappe. Noen ganger blir epost fra oss markert " "som søppelpost.</p>\n" "<p>Du må klikke på lenken i eposten vi nettopp har sendt deg —\n" @@ -284,7 +283,7 @@ msgstr "Sendt til %s %s senere" msgid "Not reported to council" msgstr "Ikke rapportert til kommunen" -#: perllib/Page.pm:622 web-admin/index.cgi:521 web-admin/index.cgi:645 +#: perllib/Page.pm:622 web-admin/index.cgi:522 web-admin/index.cgi:646 msgid "Updates" msgstr "Oppdateringer" @@ -321,7 +320,7 @@ msgstr "" "Beklager det ser ut til å være et \"Crown dependency\"-postnummer, som vi " "ikke dekker." -#: perllib/Page.pm:675 perllib/FixMyStreet/Geocode.pm:133 +#: perllib/Page.pm:675 perllib/FixMyStreet/Geocode.pm:134 msgid "" "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include " "any maps for the region." @@ -357,15 +356,15 @@ msgstr "" msgid "That location does not appear to be in Britain; please try again." msgstr "Det stedet virker ikke å være i storbritannia. Vennligst prøv igjen." -#: perllib/FixMyStreet/Geocode.pm:113 +#: perllib/FixMyStreet/Geocode.pm:114 msgid "Sorry, we could not parse that location. Please try again." msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv på nytt." -#: perllib/FixMyStreet/Geocode.pm:115 perllib/FixMyStreet/Geocode.pm:130 +#: perllib/FixMyStreet/Geocode.pm:116 perllib/FixMyStreet/Geocode.pm:131 msgid "Sorry, we could not find that location." msgstr "Beklager, vi kunne ikke finne det stedet." -#: perllib/FixMyStreet/Geocode.pm:146 +#: perllib/FixMyStreet/Geocode.pm:147 msgid "" "We found more than one match for that location. We show up to ten matches, " "please try a different search if yours is not here." @@ -373,7 +372,7 @@ msgstr "" "Vi fant mer en ett treff for den plassen. Vi viser opp til ti treff, så " "forsøk et annet søk hvis din plass ikke er her." -#: perllib/FixMyStreet/Geocode.pm:161 +#: perllib/FixMyStreet/Geocode.pm:162 msgid "More than one match" msgstr "Mer enn ett treff" @@ -425,32 +424,32 @@ msgstr "Klarte ikke hente kartfliser fra filtjeneren." msgid "Problem" msgstr "Problem" -#: perllib/Problems.pm:147 +#: perllib/Problems.pm:148 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> rapport siste uke" msgstr[1] "<big>%s</big> rapporter siste uke" -#: perllib/Problems.pm:152 +#: perllib/Problems.pm:153 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> rapportert nylig" msgstr[1] "<big>%s</big> rapportert nylig" -#: perllib/Problems.pm:158 +#: perllib/Problems.pm:159 msgid "FixMyStreet updates" msgstr "Fiksgatami-oppdateringer" -#: perllib/Problems.pm:161 perllib/Problems.pm:165 +#: perllib/Problems.pm:162 perllib/Problems.pm:166 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" msgstr[0] "<big>%s</big> fikset siste måned" msgstr[1] "<big>%s</big> fikset siste måned" -#: perllib/Problems.pm:166 +#: perllib/Problems.pm:167 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -601,7 +600,7 @@ msgid "RSS feed of nearby problems" msgstr "RSS-strøm med problemer i nærheten" #: web/alert.cgi:308 web/alert.cgi:367 web/index.cgi:970 web/index.cgi:1082 -#: web/reports.cgi:254 +#: web/reports.cgi:255 msgid "RSS feed" msgstr "RSS-strøm" @@ -614,8 +613,8 @@ msgid "" "Or you can subscribe to an alert based upon what ward or council you’" "re in:" msgstr "" -"Du kan abonnere på varsel basert på avdeling eller kommune du’ " -"bevinner deg i:" +"Eller du kan abonnere på varsel basert på bydel eller administrasjon du " +"hører inn under:" #: web/alert.cgi:323 msgid "Give me an RSS feed" @@ -679,6 +678,7 @@ msgid "Receive email when updates are left on this problem." msgstr "Motta epost når det er uppdateringer på denne saken" #: web/alert.cgi:461 web/alert.cgi:488 web/index.cgi:736 web/index.cgi:1076 +#: web-admin/index.cgi:630 web-admin/index.cgi:750 msgid "Email:" msgstr "Epost:" @@ -807,13 +807,15 @@ msgstr "" "Takk, glad for å høre at det er fikset! Can vi få spørre deg om du har " "rapportert et problem til kommunen tidligere?" -#: web/confirm.cgi:190 web/questionnaire.cgi:234 web-admin/index.cgi:339 -#: web-admin/index.cgi:340 web-admin/index.cgi:589 +#: web/confirm.cgi:190 web/questionnaire.cgi:234 web/questionnaire.cgi:322 +#: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503 +#: web-admin/index.cgi:590 web-admin/index.cgi:608 msgid "Yes" msgstr "Ja" -#: web/confirm.cgi:191 web/questionnaire.cgi:235 web-admin/index.cgi:339 -#: web-admin/index.cgi:340 web-admin/index.cgi:589 +#: web/confirm.cgi:191 web/questionnaire.cgi:235 web/questionnaire.cgi:323 +#: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503 +#: web-admin/index.cgi:590 web-admin/index.cgi:608 msgid "No" msgstr "Nei" @@ -910,8 +912,8 @@ msgid "" "You are reporting the following problem report for being abusive, containing " "personal information, or similar:" msgstr "" -"Du rapporterer at den aktuelle saken inneholder tekst med personlig " -"informasjon, upassende tekst???:" +"Du rapporterer at følgende problem er støtende, inneholder personlig " +"informasjon eller lignende:" #: web/contact.cgi:234 msgid "Your name:" @@ -921,7 +923,7 @@ msgstr "Ditt navn:" msgid "Your email:" msgstr "Din epost:" -#: web/contact.cgi:236 web/index.cgi:732 +#: web/contact.cgi:236 web/index.cgi:732 web-admin/index.cgi:622 msgid "Subject:" msgstr "Tema:" @@ -974,8 +976,8 @@ msgid "Viewing a location" msgstr "Ser på et sted" #: web/index.cgi:121 -msgid "Enter a nearby GB postcode, or street name and area:" -msgstr "Skriv inn GB-postnummer i nærheten, eller veinavn og sted:" +msgid "Enter a nearby GB postcode, or street name and area" +msgstr "Skriv inn GB-postnummer i nærheten, eller veinavn og sted" #: web/index.cgi:135 msgid "Report, view, or discuss local problems" @@ -1036,7 +1038,7 @@ msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bildet ser ikke ut til å blitt lastet opp riktig (%s), prøv på nytt." -#: web/index.cgi:258 +#: web/index.cgi:258 web-admin/index.cgi:477 msgid "Anonymous" msgstr "Anonym" @@ -1119,7 +1121,7 @@ msgstr "" "Hvis du har forsøkt å rapportere en sak utenfor kysten, for eksempel,\n" "så marker nærmeste punkt på land." -#: web/index.cgi:566 +#: web/index.cgi:566 web-admin/index.cgi:628 msgid "Category:" msgstr "Kategori" @@ -1161,6 +1163,10 @@ msgstr "" "nål. Hvis dette ikke er korrekt plassering kan du ganske enkelt klikke på " "kartet på nytt." +#: web/index.cgi:641 web/index.cgi:660 web/index.cgi:662 web/index.cgi:675 +msgid " or " +msgstr " eller " + #: web/index.cgi:643 #, perl-format msgid "" @@ -1184,10 +1190,6 @@ msgstr "" "Tittelen og detaljene for problemet vil bli offentlig, pluss ditt navn\n" "hvis du gir oss tillatelse." -#: web/index.cgi:660 web/index.cgi:662 web/index.cgi:675 -msgid " or " -msgstr " eller " - #: web/index.cgi:661 msgid "All the information you provide here will be sent to" msgstr "All informasjonen du har lagt inn her vil bli sendt til" @@ -1297,7 +1299,7 @@ msgstr "Vennligst fyll ut detaljer om saken under" msgid "Empty property details form" msgstr "Tom eiendom detaljskjema" -#: web/index.cgi:733 +#: web/index.cgi:733 web-admin/index.cgi:623 msgid "Details:" msgstr "Detaljer:" @@ -1305,11 +1307,12 @@ msgstr "Detaljer:" msgid "Photo:" msgstr "Bilde:" -#: web/index.cgi:735 web/index.cgi:1089 +#: web/index.cgi:735 web/index.cgi:1089 web-admin/index.cgi:629 +#: web-admin/index.cgi:749 msgid "Name:" msgstr "Navn:" -#: web/index.cgi:737 bin/send-reports:89 +#: web/index.cgi:737 bin/send-reports:89 web-admin/index.cgi:631 msgid "Phone:" msgstr "Telefon:" @@ -1695,11 +1698,17 @@ msgstr "" "(denne blir sendt til kommunen). Du kan for eksempel\n" "dele din erfaring med hvordan din sak ble løst." -#: web/reports.cgi:192 web/reports.cgi:239 +#: web/questionnaire.cgi:321 +msgid "" +"Would you like to receive another questionnaire in 4 weeks, reminding you to " +"check the status?" +msgstr "" + +#: web/reports.cgi:193 web/reports.cgi:240 msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: web/reports.cgi:194 +#: web/reports.cgi:195 msgid "" "This is a summary of all reports on this site; select a particular council " "to see the reports sent there." @@ -1707,64 +1716,64 @@ msgstr "" "Dette er en opplisting av alle sakene i denne tjenesten; velg en bestemt " "kommune for å se saker som er sendt dit." -#: web/reports.cgi:195 +#: web/reports.cgi:196 msgid "Greyed-out lines are councils that no longer exist." msgstr "Grå linjer er kommuner som ikke lenger eksisterer." -#: web/reports.cgi:199 +#: web/reports.cgi:200 web-admin/index.cgi:477 web-admin/index.cgi:656 msgid "Name" msgstr "Navn" -#: web/reports.cgi:199 web/reports.cgi:275 +#: web/reports.cgi:200 web/reports.cgi:276 msgid "New problems" msgstr "Nye saker" -#: web/reports.cgi:199 web/reports.cgi:283 +#: web/reports.cgi:200 web/reports.cgi:284 msgid "Older problems" msgstr "Eldre saker" -#: web/reports.cgi:201 +#: web/reports.cgi:202 msgid "Old problems,<br>state unknown" msgstr "Eldre saker, <br>ukjent status" -#: web/reports.cgi:203 web/reports.cgi:290 +#: web/reports.cgi:204 web/reports.cgi:291 msgid "Recently fixed" msgstr "Nylig løste saker" -#: web/reports.cgi:203 +#: web/reports.cgi:204 msgid "Older fixed" msgstr "Eldre løste" -#: web/reports.cgi:245 +#: web/reports.cgi:246 msgid "council" msgstr "kommune" -#: web/reports.cgi:255 +#: web/reports.cgi:256 #, perl-format msgid "RSS feed of problems in this %s" msgstr "RSS-strøm for problemer i denne %s" -#: web/reports.cgi:259 +#: web/reports.cgi:260 #, perl-format msgid "This is a summary of all reports for one %s." msgstr "Dette er en oppsummering av alle rapporter for en %s." -#: web/reports.cgi:260 +#: web/reports.cgi:261 #, perl-format msgid "This is a summary of all reports for this %s." msgstr "Dette er en oppsummering for alle rapporter for denne %s." -#: web/reports.cgi:264 +#: web/reports.cgi:265 #, perl-format msgid "You can <a href=\"%s\">see less detail</a>." msgstr "Du kan <a href=\"%s\">se mindre detaljer</a>." -#: web/reports.cgi:266 +#: web/reports.cgi:267 #, perl-format msgid "You can <a href=\"%s\">see more details</a>." msgstr "Du kan <a href=\"%s\">se flere detaljer</a>." -#: web/reports.cgi:268 +#: web/reports.cgi:269 #, perl-format msgid "" "You can <a href=\"%s\">see less detail</a> or go back and <a href=\"/reports" @@ -1773,7 +1782,7 @@ msgstr "" "Du kan <a href=\"%s\">se mindre detaljer</a> eller gå tilbake og <a href=\"/" "reports\">se alle kommunene</a>." -#: web/reports.cgi:270 +#: web/reports.cgi:271 #, perl-format msgid "" "You can <a href=\"%s\">see more details</a> or go back and <a href=\"/reports" @@ -1782,25 +1791,25 @@ msgstr "" "Du kan <a href=\"%s\">se flere detaljer</a> eller gå tilbake og <a href=\"/" "reports\">se alle kommunene</a>." -#: web/reports.cgi:285 +#: web/reports.cgi:286 msgid "Old problems, state unknown" msgstr "Eldre saker med ukjent status" -#: web/reports.cgi:291 +#: web/reports.cgi:292 msgid "Old fixed" msgstr "Eldre saker som er løst" -#: web/reports.cgi:294 +#: web/reports.cgi:295 #, perl-format msgid "%s - Summary reports" msgstr "%s - oppsummeringsrapporter" -#: web/reports.cgi:294 +#: web/reports.cgi:295 #, perl-format msgid "Problems within %s, FixMyStreet" msgstr "Problemer innenfor %s, Fiksgatami" -#: web/reports.cgi:334 +#: web/reports.cgi:335 msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" @@ -1905,6 +1914,8 @@ msgstr "" msgid "" "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" msgstr "" +"De siste rapporter for {{COUNCIL}} innenfor {{WARD}} bydel rapporter av " +"brukere" #: db/alert_types_eha.pl:27 #, perl-brace-format @@ -1964,7 +1975,7 @@ msgstr "Nye problemer nær {{POSTCODE}} på FiksGataMi" #: db/alert_types.pl:34 #, perl-brace-format msgid "New problems to {{COUNCIL}} on FixMyStreet" -msgstr "Nye problemer til {{COUNCIL}} på FiksGataMi" +msgstr "Nye problemer i {{COUNCIL}} på FiksGataMi" #: db/alert_types.pl:35 #, perl-brace-format @@ -1974,7 +1985,7 @@ msgstr "De siste problemer for {{COUNCIL}} rapportert av brukere" #: db/alert_types.pl:38 #, perl-brace-format msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" -msgstr "" +msgstr "Nye problemer for {{COUNCIL}} innenfor {{WARD}} bydel på FiksGataMi" #: db/alert_types.pl:39 #, perl-brace-format @@ -1993,268 +2004,450 @@ msgid "The latest problems within {{NAME}}" msgstr "De siste problemer innenfor {{NAME}}" #: web-admin/index.cgi:68 web-admin/index.cgi:123 web-admin/index.cgi:124 -#, fuzzy msgid "Summary" -msgstr "Oppsummeringsrapporter" +msgstr "Oppsummering" #: web-admin/index.cgi:69 web-admin/index.cgi:182 web-admin/index.cgi:183 -#, fuzzy msgid "Council contacts" -msgstr "Kontakt oss" +msgstr "Administrasjonskontakter" + +#: web-admin/index.cgi:70 web-admin/index.cgi:464 +msgid "Search Reports" +msgstr "Søk i rapporter" -#: web-admin/index.cgi:71 web-admin/index.cgi:782 web-admin/index.cgi:783 +#: web-admin/index.cgi:71 web-admin/index.cgi:783 web-admin/index.cgi:784 msgid "Timeline" -msgstr "" +msgstr "Tidslinje" #: web-admin/index.cgi:84 -#, fuzzy msgid "FixMyStreet administration" -msgstr "Fiksgatami-oppdateringer" +msgstr "Fiksgatami-administrasjon" #: web-admin/index.cgi:100 -#, fuzzy msgid "FixMyStreet admin:" -msgstr "FiksGataMi" +msgstr "FiksGataMi-admin:" + +#: web-admin/index.cgi:153 +#, perl-format +msgid "<strong>%d</strong> live problems" +msgstr "<strong>%d</strong> aktive problemer" + +#: web-admin/index.cgi:154 +#, perl-format +msgid "%d live updates" +msgstr "%d aktive oppdateringer" + +#: web-admin/index.cgi:155 +#, perl-format +msgid "%d confirmed alerts, %d unconfirmed" +msgstr "%d bekreftede varsler, %d ubekreftede" + +#: web-admin/index.cgi:156 +#, perl-format +msgid "%d questionnaires sent – %d answered (%d%%)" +msgstr "%d spørreskjema sendt – %d besvart (%d%%)" + +#: web-admin/index.cgi:157 +#, perl-format +msgid "%d council contacts – %d confirmed, %d unconfirmed" +msgstr "%d administrasjonskontakter – %d bekreftet, %d ubekreftet" #: web-admin/index.cgi:162 msgid "Graph of problem creation by status over time" -msgstr "" +msgstr "Graf over problemoppretting fordelt på status over tid" #: web-admin/index.cgi:165 msgid "Problem breakdown by state" -msgstr "" +msgstr "Problemfordeling for tilstand" #: web-admin/index.cgi:170 msgid "Update breakdown by state" -msgstr "" +msgstr "Oppdateringsfordeling for tilstand" #: web-admin/index.cgi:186 msgid "Diligency prize league table" msgstr "" +#: web-admin/index.cgi:190 +#, perl-format +msgid "%d edits by %d" +msgstr "%d redigeringer av %d" + #: web-admin/index.cgi:193 -#, fuzzy msgid "No edits have yet been made." -msgstr "Ingen saker er rapporter" +msgstr "Ingenting er redigert." #: web-admin/index.cgi:197 -#, fuzzy msgid "Councils" -msgstr "kommune" +msgstr "Administrasjoner" -#: web-admin/index.cgi:210 web-admin/index.cgi:585 -#, fuzzy +#: web-admin/index.cgi:211 web-admin/index.cgi:586 msgid "None" -msgstr "Nei" +msgstr "Ingen" + +#: web-admin/index.cgi:223 +#, perl-format +msgid "%d addresses" +msgstr "%d adresser" -#: web-admin/index.cgi:228 +#: web-admin/index.cgi:229 msgid "No info at all" -msgstr "" +msgstr "Helt uten informasjon" -#: web-admin/index.cgi:230 +#: web-admin/index.cgi:231 msgid "Currently has 1+ deleted" -msgstr "" +msgstr "For tiden har 1+ slettet" -#: web-admin/index.cgi:232 +#: web-admin/index.cgi:233 msgid "Some unconfirmeds" -msgstr "" +msgstr "Noen ubekreftede" -#: web-admin/index.cgi:234 +#: web-admin/index.cgi:235 msgid "All confirmed" -msgstr "" +msgstr "Alle bekreftet" -#: web-admin/index.cgi:264 web-admin/index.cgi:274 web-admin/index.cgi:291 +#: web-admin/index.cgi:265 web-admin/index.cgi:275 web-admin/index.cgi:292 msgid "*unknown*" -msgstr "" +msgstr "*ukjent*" -#: web-admin/index.cgi:267 web-admin/index.cgi:295 -#, fuzzy +#: web-admin/index.cgi:268 web-admin/index.cgi:296 msgid "Values updated" -msgstr "Send meg oppdateringer" +msgstr "Verdier oppdatert" -#: web-admin/index.cgi:277 +#: web-admin/index.cgi:278 msgid "New category contact added" -msgstr "" +msgstr "Ny kategorikontakt lagt til" -#: web-admin/index.cgi:314 web-admin/index.cgi:397 +#: web-admin/index.cgi:315 web-admin/index.cgi:398 #, perl-format msgid "Council contacts for %s" -msgstr "" +msgstr "Administrasjonskontakter for %s" -#: web-admin/index.cgi:327 -#, fuzzy +#: web-admin/index.cgi:328 msgid " List all reported problems" -msgstr "Nylig meldte problemer" +msgstr " List alle rapporterte problemer" -#: web-admin/index.cgi:329 +#: web-admin/index.cgi:330 msgid "Text only version" -msgstr "" +msgstr "Tekst-versjon" -#: web-admin/index.cgi:335 -#, fuzzy +#: web-admin/index.cgi:336 web-admin/index.cgi:477 msgid "Category" msgstr "Kategori" -#: web-admin/index.cgi:335 web-admin/index.cgi:437 -#, fuzzy +#: web-admin/index.cgi:336 web-admin/index.cgi:438 web-admin/index.cgi:477 +#: web-admin/index.cgi:656 msgid "Email" -msgstr "Epost:" +msgstr "Epost" -#: web-admin/index.cgi:335 web-admin/index.cgi:367 web-admin/index.cgi:420 -#: web-admin/index.cgi:437 web-admin/index.cgi:736 -#, fuzzy +#: web-admin/index.cgi:336 web-admin/index.cgi:368 web-admin/index.cgi:421 +#: web-admin/index.cgi:438 web-admin/index.cgi:737 msgid "Confirmed" -msgstr "Bekreftelse" +msgstr "Bekreftet" -#: web-admin/index.cgi:335 web-admin/index.cgi:369 web-admin/index.cgi:422 -#: web-admin/index.cgi:437 +#: web-admin/index.cgi:336 web-admin/index.cgi:370 web-admin/index.cgi:423 +#: web-admin/index.cgi:438 msgid "Deleted" -msgstr "" +msgstr "Slettet" -#: web-admin/index.cgi:335 +#: web-admin/index.cgi:336 msgid "Last editor" -msgstr "" +msgstr "Sist redigert av" -#: web-admin/index.cgi:335 web-admin/index.cgi:437 -#, fuzzy +#: web-admin/index.cgi:336 web-admin/index.cgi:438 msgid "Note" -msgstr "Nei" +msgstr "Merk" -#: web-admin/index.cgi:335 web-admin/index.cgi:437 +#: web-admin/index.cgi:336 web-admin/index.cgi:438 msgid "When edited" -msgstr "" +msgstr "Når redigert" -#: web-admin/index.cgi:335 -#, fuzzy +#: web-admin/index.cgi:336 msgid "Confirm" -msgstr "Bekreftelse" +msgstr "Bekreftet" -#: web-admin/index.cgi:352 -#, fuzzy +#: web-admin/index.cgi:353 msgid "Update statuses" -msgstr "Oppdateringer" +msgstr "Oppdater statuser" -#: web-admin/index.cgi:357 +#: web-admin/index.cgi:358 msgid "Add new category" -msgstr "" +msgstr "Legg til ny kategori" -#: web-admin/index.cgi:360 web-admin/index.cgi:414 -#, fuzzy +#: web-admin/index.cgi:361 web-admin/index.cgi:415 msgid "Category: " -msgstr "Kategori" +msgstr "Kategori: " -#: web-admin/index.cgi:363 web-admin/index.cgi:417 -#, fuzzy +#: web-admin/index.cgi:364 web-admin/index.cgi:418 msgid "Email: " -msgstr "Epost:" +msgstr "Epost: " -#: web-admin/index.cgi:372 web-admin/index.cgi:425 +#: web-admin/index.cgi:373 web-admin/index.cgi:426 msgid "Note: " -msgstr "" +msgstr "Merk: " -#: web-admin/index.cgi:379 -#, fuzzy +#: web-admin/index.cgi:380 msgid "Create category" -msgstr "Kategori" +msgstr "Lat categori" -#: web-admin/index.cgi:431 +#: web-admin/index.cgi:432 msgid "Save changes" -msgstr "" +msgstr "Lagre endringer" -#: web-admin/index.cgi:435 +#: web-admin/index.cgi:436 msgid "History" -msgstr "" +msgstr "Historie" -#: web-admin/index.cgi:437 +#: web-admin/index.cgi:438 msgid "Editor" -msgstr "" +msgstr "Oppdatert av" -#: web-admin/index.cgi:441 web-admin/index.cgi:442 -#, fuzzy +#: web-admin/index.cgi:442 web-admin/index.cgi:443 msgid "yes" -msgstr "Ja" +msgstr "ja" -#: web-admin/index.cgi:441 web-admin/index.cgi:442 +#: web-admin/index.cgi:442 web-admin/index.cgi:443 msgid "no" -msgstr "" +msgstr "nei" -#: web-admin/index.cgi:469 +#: web-admin/index.cgi:470 msgid "Search:" +msgstr "Søk:" + +#: web-admin/index.cgi:477 web-admin/index.cgi:656 +msgid "ID" +msgstr "ID" + +#: web-admin/index.cgi:477 +msgid "Title" +msgstr "Tittel" + +#: web-admin/index.cgi:477 +msgid "Council" +msgstr "Administrasjon" + +#: web-admin/index.cgi:477 web-admin/index.cgi:656 +msgid "Cobrand" msgstr "" -#: web-admin/index.cgi:541 -#, fuzzy +#: web-admin/index.cgi:477 web-admin/index.cgi:656 +msgid "Created" +msgstr "Opprettet" + +#: web-admin/index.cgi:477 web-admin/index.cgi:656 +msgid "State" +msgstr "Tilstand" + +#: web-admin/index.cgi:477 +msgid "When sent" +msgstr "Når sendt" + +#: web-admin/index.cgi:477 web-admin/index.cgi:656 +msgid "*" +msgstr "*" + +#: web-admin/index.cgi:499 web-admin/index.cgi:633 +msgid "Confirmed:" +msgstr "Bekreftet:" + +#: web-admin/index.cgi:500 +msgid "Fixed:" +msgstr "Løst:" + +#: web-admin/index.cgi:501 +msgid "Last update:" +msgstr "Last oppdatering:" + +#: web-admin/index.cgi:517 web-admin/index.cgi:675 +msgid "Edit" +msgstr "Rediger" + +#: web-admin/index.cgi:542 msgid "That problem will now be resent." -msgstr "ditt problem vil ikke bli publisert" +msgstr "Det problemet vil nå bli sendt på nytt." -#: web-admin/index.cgi:547 +#: web-admin/index.cgi:548 msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "" +msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." -#: web-admin/index.cgi:576 web-admin/index.cgi:696 -#, fuzzy +#: web-admin/index.cgi:577 web-admin/index.cgi:697 msgid "Updated!" -msgstr "Oppdateringer" +msgstr "Oppdatert!" -#: web-admin/index.cgi:580 -#, fuzzy, perl-format +#: web-admin/index.cgi:581 +#, perl-format msgid "Editing problem %d" -msgstr "Ser på en sak" +msgstr "Rediger problem %d" -#: web-admin/index.cgi:608 web-admin/index.cgi:736 -#, fuzzy -msgid "State:" -msgstr "Oppdatering:" +#: web-admin/index.cgi:591 +msgid "used map" +msgstr "brukte kart" + +#: web-admin/index.cgi:591 +msgid "didn't use map" +msgstr "brukte ikke kart" + +#: web-admin/index.cgi:603 web-admin/index.cgi:733 +msgid "Remove photo (can't be undone!)" +msgstr "Fjern bilde (kan ikke gjøres om!)" #: web-admin/index.cgi:608 +msgid "Anonymous:" +msgstr "Anonym:" + +#: web-admin/index.cgi:609 web-admin/index.cgi:737 +msgid "State:" +msgstr "Tilstand:" + +#: web-admin/index.cgi:609 msgid "Open" -msgstr "" +msgstr "Åpen" -#: web-admin/index.cgi:608 -#, fuzzy +#: web-admin/index.cgi:609 msgid "Fixed" -msgstr "(løst)" +msgstr "Løst" -#: web-admin/index.cgi:608 web-admin/index.cgi:736 -#, fuzzy +#: web-admin/index.cgi:609 web-admin/index.cgi:737 msgid "Hidden" -msgstr "Gjem nåler" +msgstr "Gjemt" -#: web-admin/index.cgi:608 web-admin/index.cgi:736 +#: web-admin/index.cgi:609 web-admin/index.cgi:737 msgid "Unconfirmed" -msgstr "" +msgstr "Ubekreftet" -#: web-admin/index.cgi:608 +#: web-admin/index.cgi:609 msgid "Partial" -msgstr "" +msgstr "Delvis" -#: web-admin/index.cgi:611 +#: web-admin/index.cgi:612 msgid "You really want to resend?" -msgstr "" +msgstr "Ønsker du virkelig å sende på nytt?" -#: web-admin/index.cgi:611 -#, fuzzy +#: web-admin/index.cgi:612 msgid "Resend report" -msgstr "Gjem utdaterte rapporter" +msgstr "Send rapport på nytt" -#: web-admin/index.cgi:642 web-admin/index.cgi:756 -#, fuzzy -msgid "Submit changes" -msgstr "Send inn" +#: web-admin/index.cgi:621 +msgid "View report on site" +msgstr "Se rapport på nettstedet" -#: web-admin/index.cgi:674 -msgid "Edit" +#: web-admin/index.cgi:624 +msgid "Co-ordinates:" +msgstr "Koordinater:" + +#: web-admin/index.cgi:624 +msgid "originally entered" +msgstr "" + +#: web-admin/index.cgi:625 +msgid "For council(s):" +msgstr "For administrasjon(er):" + +#: web-admin/index.cgi:625 +msgid "other areas:" +msgstr "andre områder:" + +#: web-admin/index.cgi:632 web-admin/index.cgi:753 +msgid "Created:" +msgstr "Opprettet:" + +#: web-admin/index.cgi:634 +msgid "Sent:" +msgstr "Sendt:" + +#: web-admin/index.cgi:635 +msgid "Last update:" +msgstr "Siste oppdatering:" + +#: web-admin/index.cgi:636 +msgid "Service:" +msgstr "Tjeneste:" + +#: web-admin/index.cgi:637 web-admin/index.cgi:751 +msgid "Cobrand:" +msgstr "" + +#: web-admin/index.cgi:638 web-admin/index.cgi:752 +msgid "Cobrand data:" msgstr "" -#: web-admin/index.cgi:701 -#, fuzzy +#: web-admin/index.cgi:639 +msgid "Going to send questionnaire?" +msgstr "Skal det sendes spørreskjema?" + +#: web-admin/index.cgi:643 web-admin/index.cgi:757 +msgid "Submit changes" +msgstr "Send inn endringer" + +#: web-admin/index.cgi:656 +msgid "Text" +msgstr "Tekst" + +#: web-admin/index.cgi:702 msgid "Problem marked as open." -msgstr "Denne rapporten er for tiden markert som åpen." +msgstr "Problem markert som åpent." -#: web-admin/index.cgi:717 -#, fuzzy, perl-format +#: web-admin/index.cgi:718 +#, perl-format msgid "Editing update %d" -msgstr "Legg til din oppdatering" +msgstr "Redigerer oppdatering %d" + +#: web-admin/index.cgi:746 +msgid "View update on site" +msgstr "Vis oppdateringer på nettstedet" + +#: web-admin/index.cgi:747 +msgid "Text:" +msgstr "Tekst:" + +#: web-admin/index.cgi:749 +msgid "(blank to go anonymous)" +msgstr "(blank for å være anonym)" + +#: web-admin/index.cgi:830 +#, perl-format +msgid "by %s" +msgstr "av %s" + +#: web-admin/index.cgi:832 +#, perl-format +msgid "Problem %d created" +msgstr "Problem %d opprettet" + +#: web-admin/index.cgi:836 +#, perl-format +msgid "Problem %s confirmed" +msgstr "Problem %s bekreftet" + +#: web-admin/index.cgi:840 +#, perl-format +msgid "Problem %s sent to council %s" +msgstr "Problem %s sendt til administrasjon %s" + +#: web-admin/index.cgi:842 +#, perl-format +msgid "Questionnaire %d sent for problem %d" +msgstr "Spørreskjema %d sendt for problem %d" + +#: web-admin/index.cgi:844 +#, perl-format +msgid "Questionnaire %d answered for problem %d, %s to %s" +msgstr "Spørreskjema %d fylt inn for problem %d, %s til %s" + +#: web-admin/index.cgi:849 +#, perl-format +msgid "Update %s created for problem %d; by %s" +msgstr "Oppdatering %s opprettet for problem %d, av %s" + +#: web-admin/index.cgi:853 +#, perl-format +msgid "Alert %d created for %s, type %s, parameters %s / %s" +msgstr "Varsel %d opprettet for %s, type %s, parameter %s / %s" + +#: web-admin/index.cgi:856 +#, perl-format +msgid "Alert %d disabled (created %s)" +msgstr "Varsel %d koblet ut (opprettet %s)" #. Please leave the first word "Subject:" untranslated #: templates/emails/alert-confirm @@ -2973,9 +3166,9 @@ msgstr "" "[ Denne meldingen ble sendt inn via FiksGataMi, et prosjekt hos foreningen " "NUUG.\n" "Hvis det er en mer passende epostadresse for meldinger om\n" -"<?=$values['category_footer']?>, vær såsnill å gi oss beskjed ved å besøke " +"<?=$values['category_footer']?>, vær så snill å gi oss beskjed ved å besøke " "<http://www.fiksgatami.no/contact>.\n" -"Dette vil bidra til å forbedre tjenesten for de lokale folkene. Vi\n" +"Dette vil bidra til å forbedre tjenesten for lokalbefolkningen. Vi\n" "tar også gjerne imot andre tilbakemeldinger om du har noen. ]\n" "\n" diff --git a/perllib/Cobrands/Barnet/Util.pm b/perllib/Cobrands/Barnet/Util.pm index eb8b91649..0e5ddcf68 100644 --- a/perllib/Cobrands/Barnet/Util.pm +++ b/perllib/Cobrands/Barnet/Util.pm @@ -54,7 +54,7 @@ sub site_title { sub enter_postcode_text { my ($self,$q) = @_; - return 'Enter a Barnet postcode, or street name and area:'; + return 'Enter a Barnet postcode, or street name and area'; } =item council_check COUNCILS QUERY CONTEXT @@ -79,7 +79,7 @@ sub council_check { } my $url = 'http://www.fixmystreet.com/'; $url .= 'alert' if $context eq 'alert'; - $url .= '?pc=' . URI::Escape::uri_escape($q->param('pc')) if $q->param('pc'); + $url .= '?pc=' . URI::Escape::uri_escape_utf8($q->param('pc')) if $q->param('pc'); my $error_msg = "That location is not covered by Barnet. Please visit <a href=\"$url\">the main FixMyStreet site</a>."; return (0, $error_msg); diff --git a/perllib/Cobrands/Fiksgatami/Util.pm b/perllib/Cobrands/Fiksgatami/Util.pm index 9fb448be5..38366f0e1 100644 --- a/perllib/Cobrands/Fiksgatami/Util.pm +++ b/perllib/Cobrands/Fiksgatami/Util.pm @@ -24,7 +24,7 @@ sub set_lang_and_domain { sub enter_postcode_text { my ($self, $q) = @_; - return _('Enter a nearby postcode, or street name and area:'); + return _('Enter a nearby postcode, or street name and area'); } # Is also adding language parameter @@ -34,6 +34,12 @@ sub disambiguate_location { return $s; } +sub geocoded_string_check { + my ($self, $s) = @_; + return 1 if $s =~ /, Norge/; + return 0; +} + sub area_types { return ( 'NKO', 'NFY' ); } diff --git a/perllib/FixMyStreet/Alert.pm b/perllib/FixMyStreet/Alert.pm index 6b50e62e6..29932a0a5 100644 --- a/perllib/FixMyStreet/Alert.pm +++ b/perllib/FixMyStreet/Alert.pm @@ -253,12 +253,10 @@ sub generate_rss ($$$;$$$$) { throw FixMyStreet::Alert::Error('Unknown alert type') unless $alert_type; # Do our own encoding - my $rss = new XML::RSS( version => '2.0', encoding => 'UTF-8', stylesheet=> $xsl, encode_output => undef ); $rss->add_module(prefix=>'georss', uri=>'http://www.georss.org/georss'); - # XXX: Not generic # Only apply a site restriction if the alert uses the problem table $site_restriction = '' unless $alert_type->{item_table} eq 'problem'; my $query = 'select * from ' . $alert_type->{item_table} . ' where ' @@ -274,19 +272,19 @@ sub generate_rss ($$$;$$$$) { $q->execute(); } - my @months = ('', 'January','February','March','April','May','June', - 'July','August','September','October','November','December'); while (my $row = $q->fetchrow_hashref) { - # XXX: How to do this properly? name might be null in comment table, hence needing this - my $pubDate; + $row->{name} ||= 'anonymous'; - # And we want pretty dates... :-/ + + my $pubDate; if ($row->{confirmed}) { $row->{confirmed} =~ /^(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/; $pubDate = mySociety::Locale::in_gb_locale { strftime("%a, %d %b %Y %H:%M:%S %z", $6, $5, $4, $3, $2-1, $1-1900, -1, -1, 0) }; - $row->{confirmed} = ordinal($3+0) . ' ' . $months[$2]; + $row->{confirmed} = strftime("%e %B", $6, $5, $4, $3, $2-1, $1-1900, -1, -1, 0); + $row->{confirmed} =~ s/^\s+//; + $row->{confirmed} =~ s/^(\d+)/ordinal($1)/e if $mySociety::Locale::lang eq 'en-gb'; } (my $title = _($alert_type->{item_title})) =~ s/{{(.*?)}}/$row->{$1}/g; @@ -301,7 +299,6 @@ sub generate_rss ($$$;$$$$) { ); $item{pubDate} = $pubDate if $pubDate; - # XXX: Not-very-generic extensions, at all my $display_photos = Cobrand::allow_photo_display($cobrand); if ($display_photos && $row->{photo}) { $item{description} .= ent("\n<br><img src=\"". Cobrand::url($cobrand, $url, $http_q) . "/photo?id=$row->{id}\">"); diff --git a/perllib/FixMyStreet/Geocode.pm b/perllib/FixMyStreet/Geocode.pm index 17a4d8539..803e32a85 100644 --- a/perllib/FixMyStreet/Geocode.pm +++ b/perllib/FixMyStreet/Geocode.pm @@ -106,6 +106,7 @@ sub string { || mySociety::Config::get('COUNTRY') ne 'GB'; $url .= '&sensor=false&key=' . mySociety::Config::get('GOOGLE_MAPS_API_KEY'); $js = LWP::Simple::get($url); + $js = encode_utf8($js) if utf8::is_utf8($js); File::Path::mkpath($cache_dir); File::Slurp::write_file($cache_file, $js) if $js && $js !~ /"code":6[12]0/; } diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm index 820a4ce63..7953d16e2 100644 --- a/perllib/FixMyStreet/Map/OSM.pm +++ b/perllib/FixMyStreet/Map/OSM.pm @@ -13,7 +13,7 @@ use mySociety::Web qw(ent); sub header_js { return ' -<script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js"></script> +<script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script> <script type="text/javascript" src="/js/map-OpenStreetMap.js"></script> '; } diff --git a/perllib/Page.pm b/perllib/Page.pm index 279c5a79a..2ce44f410 100644 --- a/perllib/Page.pm +++ b/perllib/Page.pm @@ -56,7 +56,7 @@ sub do_fastcgi { try { my $W = new mySociety::WatchUpdate(); - while (my $q = new mySociety::Web()) { + while (my $q = new mySociety::Web(unicode => 1)) { next if $lm && $q->Maybe304($lm); $lastmodified = $lm; microsite($q); @@ -305,7 +305,7 @@ sub footer { my ($q, %params) = @_; my $pc = $q->param('pc') || ''; - $pc = '?pc=' . URI::Escape::uri_escape($pc) if $pc; + $pc = '?pc=' . URI::Escape::uri_escape_utf8($pc) if $pc; my $creditline = _('Built by <a href="http://www.mysociety.org/">mySociety</a>, using some <a href="http://github.com/mysociety/fixmystreet">clever</a> <a href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.'); if (mySociety::Config::get('COUNTRY') eq 'NO') { @@ -483,13 +483,13 @@ sub prettify_epoch { if (strftime('%Y%m%d', @s) eq strftime('%Y%m%d', @t)) { $tt = "$tt " . _('today'); } elsif (strftime('%Y %U', @s) eq strftime('%Y %U', @t)) { - $tt = "$tt, " . strftime('%A', @s); + $tt = "$tt, " . decode_utf8(strftime('%A', @s)); } elsif ($short) { - $tt = "$tt, " . strftime('%e %b %Y', @s); + $tt = "$tt, " . decode_utf8(strftime('%e %b %Y', @s)); } elsif (strftime('%Y', @s) eq strftime('%Y', @t)) { - $tt = "$tt, " . strftime('%A %e %B %Y', @s); + $tt = "$tt, " . decode_utf8(strftime('%A %e %B %Y', @s)); } else { - $tt = "$tt, " . strftime('%a %e %B %Y', @s); + $tt = "$tt, " . decode_utf8(strftime('%a %e %B %Y', @s)); } return $tt; } diff --git a/perllib/Problems.pm b/perllib/Problems.pm index 74ac34f75..111583fd5 100644 --- a/perllib/Problems.pm +++ b/perllib/Problems.pm @@ -101,7 +101,8 @@ sub recent_photos { my ($num, $lat, $lon, $dist) = @_; my $probs; if (defined $lat) { - my $key = "recent_photos:$site_key:$num:$lat:$lon:$dist"; + my $dist2 = $dist; # Create a copy of the variable to stop it being stringified into a locale in the next line! + my $key = "recent_photos:$site_key:$num:$lat:$lon:$dist2"; $probs = Memcached::get($key); unless ($probs) { $probs = mySociety::Locale::in_gb_locale { diff --git a/templates/website/faq-eha.cy.html b/templates/website/cobrands/emptyhomes/faq-cy index 1a446055e..1a446055e 100644 --- a/templates/website/faq-eha.cy.html +++ b/templates/website/cobrands/emptyhomes/faq-cy diff --git a/templates/website/faq-eha.html b/templates/website/cobrands/emptyhomes/faq-en-gb index aa70a26ee..aa70a26ee 100755 --- a/templates/website/faq-eha.html +++ b/templates/website/cobrands/emptyhomes/faq-en-gb diff --git a/templates/website/cobrands/fiksgatami/faq-nb b/templates/website/cobrands/fiksgatami/faq-nb new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/website/cobrands/fiksgatami/faq-nb diff --git a/templates/website/faq.html b/templates/website/faq-en-gb index 0c5fa7aea..0c5fa7aea 100755 --- a/templates/website/faq.html +++ b/templates/website/faq-en-gb diff --git a/web-admin/index.cgi b/web-admin/index.cgi index 02ba5d710..b29c290da 100755 --- a/web-admin/index.cgi +++ b/web-admin/index.cgi @@ -19,7 +19,7 @@ use FindBin; use lib "$FindBin::Bin/../perllib"; use lib "$FindBin::Bin/../commonlib/perllib"; use Encode; -use POSIX qw(strftime); +use POSIX qw(strftime strcoll); use Digest::MD5 qw(md5_hex); use Page; @@ -67,7 +67,7 @@ sub allowed_pages($) { $pages = { 'summary' => [_('Summary'), 0], 'councilslist' => [_('Council contacts'), 1], - 'reports' => ['Reports', 2], + 'reports' => [_('Search Reports'), 2], 'timeline' => [_('Timeline'), 3], 'councilcontacts' => [undef, undef], 'counciledit' => [undef, undef], @@ -150,11 +150,11 @@ sub admin_summary ($) { my $questionnaires_pc = $questionnaires{total} ? $questionnaires{1} / $questionnaires{total} * 100 : 'na'; print $q->ul( - $q->li("<strong>$total_problems_live</strong> live problems"), - $q->li("$comments{confirmed} live updates"), - $q->li("$alerts{1} confirmed alerts, $alerts{0} unconfirmed"), - $q->li("$questionnaires{total} questionnaires sent – $questionnaires{1} answered ($questionnaires_pc%)"), - $q->li("$contacts{total} council contacts – $contacts{1} confirmed, $contacts{0} unconfirmed"), + $q->li(sprintf(_("<strong>%d</strong> live problems"), $total_problems_live)), + $q->li(sprintf(_("%d live updates"), $comments{confirmed})), + $q->li(sprintf(_("%d confirmed alerts, %d unconfirmed"), $alerts{1}, $alerts{0})), + $q->li(sprintf(_("%d questionnaires sent – %d answered (%d%%)"), $questionnaires{total}, $questionnaires{1}, $questionnaires_pc)), + $q->li(sprintf(_("%d council contacts – %d confirmed, %d unconfirmed"), $contacts{total}, $contacts{1}, $contacts{0})), ); if (Cobrand::admin_show_creation_graph($cobrand)) { @@ -187,7 +187,7 @@ sub admin_councils_list ($) { my $edit_activity = dbh()->selectall_arrayref("select count(*) as c, editor from contacts_history group by editor order by c desc"); if (@$edit_activity) { print $q->ul( - map { $q->li($_->[0] . " edits by " . $_->[1]) } @$edit_activity + map { $q->li( sprintf(_('%d edits by %d'), $_->[0], $_->[1])) } @$edit_activity ); } else { print $q->p(_('No edits have yet been made.')); @@ -198,7 +198,8 @@ sub admin_councils_list ($) { my $cobrand = Page::get_cobrand($q); my @area_types = Cobrand::area_types($cobrand); my $areas = mySociety::MaPit::call('areas', \@area_types); - my @councils_ids = sort { $areas->{$a}->{name} cmp $areas->{$b}->{name} } keys %$areas; + my @councils_ids = sort { strcoll($areas->{$a}->{name}, $areas->{$b}->{name}) } keys %$areas; + @councils_ids = grep { $_ ne 301 } @councils_ids; my $bci_info = dbh()->selectall_hashref(" select area_id, count(*) as c, count(case when deleted then 1 else null end) as deleted, count(case when confirmed then 1 else null end) as confirmed @@ -219,7 +220,7 @@ sub admin_councils_list ($) { push @li, $q->li($q->a({ href => NewURL($q, area_id => $_, page => 'councilcontacts') }, $areas->{$_}->{name}) . $parent . ' ' . ($bci_info->{$_} && $q->{site} ne 'emptyhomes' ? - $bci_info->{$_}->{c} . ' addresses' + sprintf(_('%d addresses'), $bci_info->{$_}->{c}) : '')); } print $q->ul(@li); @@ -460,7 +461,7 @@ sub admin_council_edit ($$$) { sub admin_reports { my $q = shift; - my $title = 'Reports'; + my $title = _('Search Reports'); my $cobrand = Page::get_cobrand($q); my $pages = allowed_pages($q); print html_head($q, $title); @@ -473,7 +474,7 @@ sub admin_reports { if (my $search = $q->param('search')) { my $results = Problems::problem_search($search); print $q->start_table({border=>1, cellpadding=>2, cellspacing=>0}); - print $q->Tr({}, $q->th({}, ['ID', 'Title', 'Name', 'Email', 'Council', 'Category', 'Anonymous', 'Cobrand', 'Created', 'State', 'When sent', '*'])); + print $q->Tr({}, $q->th({}, [_('ID'), _('Title'), _('Name'), _('Email'), _('Council'), _('Category'), _('Anonymous'), _('Cobrand'), _('Created'), _('State'), _('When sent'), _('*') ])); my $cobrand_data; foreach (@$results) { my $url = $_->{id}; @@ -495,11 +496,11 @@ sub admin_reports { (my $whensent = $_->{whensent} || ' ') =~ s/\..*//; my $state = $_->{state}; $state .= '<small>'; - $state .= "<br>Confirmed: $confirmed" if $_->{state} eq 'confirmed' || $_->{state} eq 'fixed'; - $state .= '<br>Fixed: ' . $lastupdate if $_->{state} eq 'fixed'; - $state .= "<br>Last update: $lastupdate" if $_->{state} eq 'confirmed'; + $state .= "<br>" . _('Confirmed:') . " $confirmed" if $_->{state} eq 'confirmed' || $_->{state} eq 'fixed'; + $state .= '<br>' . _('Fixed:') . ' ' . $lastupdate if $_->{state} eq 'fixed'; + $state .= "<br>" . _('Last update:') . " $lastupdate" if $_->{state} eq 'confirmed'; $state .= '</small>'; - my $anonymous = $_->{anonymous} ? 'Yes' : 'No'; + my $anonymous = $_->{anonymous} ? _('Yes') : _('No'); my $cobrand = $_->{cobrand}; $cobrand .= "<br>" . $_->{cobrand_data}; my $counciltext = ''; @@ -513,7 +514,7 @@ sub admin_reports { print $q->Tr($attr, $q->td([ $url, ent($_->{title}), ent($_->{name}), ent($_->{email}), $counciltext, $category, $anonymous, $cobrand, $created, $state, $whensent, - $q->a({ -href => NewURL($q, page=>'report_edit', id=>$_->{id}) }, 'Edit') + $q->a({ -href => NewURL($q, page=>'report_edit', id=>$_->{id}) }, _('Edit')) ])); } print $q->end_table; @@ -587,7 +588,7 @@ sub admin_edit_report { my $latitude = $row{latitude}; my $longitude = $row{longitude}; my $questionnaire = $row{send_questionnaire} ? _('Yes') : _('No'); - my $used_map = $row{used_map} ? 'used map' : "didn't use map"; + my $used_map = $row{used_map} ? _('used map') : _("didn't use map"); (my $whensent = $row{whensent} || ' ') =~ s/\..*//; (my $confirmed = $row{confirmed} || '-') =~ s/ (.*?)\..*/ $1/; my $photo = ''; @@ -599,12 +600,12 @@ sub admin_edit_report { } $photo = '<li><img align="top" src="' . Cobrand::base_url_for_emails($cobrand, $cobrand_data) . '/photo?id=' . $row{id} . '"> <input type="checkbox" id="remove_photo" name="remove_photo" value="1"> -<label for="remove_photo">Remove photo (can\'t be undone!)</label>' if $row{photo}; +<label for="remove_photo">' . _("Remove photo (can't be undone!)") . '</label>' if $row{photo}; my $url_base = Cobrand::base_url_for_emails($cobrand, $cobrand_data); my $url = $url_base . '/report/' . $row{id}; - my $anon = $q->label({-for=>'anonymous'}, 'Anonymous:') . ' ' . $q->popup_menu(-id => 'anonymous', -name => 'anonymous', -values => { 1=>'Yes', 0=>'No' }, -default => $row{anonymous}); + my $anon = $q->label({-for=>'anonymous'}, _('Anonymous:')) . ' ' . $q->popup_menu(-id => 'anonymous', -name => 'anonymous', -values => { 1=>_('Yes'), 0=>_('No') }, -default => $row{anonymous}); my $state = $q->label({-for=>'state'}, _('State:')) . ' ' . $q->popup_menu(-id => 'state', -name => 'state', -values => { confirmed => _('Open'), fixed => _('Fixed'), hidden => _('Hidden'), unconfirmed => _('Unconfirmed'), partial => _('Partial') }, -default => $row{state}); my $resend = ''; @@ -615,30 +616,30 @@ sub admin_edit_report { print $q->hidden('id'); print $q->hidden('token', get_token($q)); print $q->hidden('submit', 1); - print <<EOF; + print " <ul> -<li><a href="$url">View report on site</a> -<li><label for="title">Subject:</label> <input size=60 type="text" id="title" name="title" value="$row_h{title}"> -<li><label for="detail">Details:</label><br><textarea name="detail" id="detail" cols=60 rows=10>$row_h{detail}</textarea> -<li>Co-ordinates: $latitude,$longitude (originally entered $row_h{postcode}, $used_map) -<li>For council(s): $council (other areas: $areas) +<li><a href='$url'>" . _('View report on site') . "</a> +<li><label for='title'>" . _('Subject:') . "</label> <input size=60 type='text' id='title' name='title' value='$row_h{title}'> +<li><label for='detail'>" . _('Details:') . "</label><br><textarea name='detail' id='detail' cols=60 rows=10>$row_h{detail}</textarea> +<li>" . _('Co-ordinates:') . " $latitude,$longitude (" . _('originally entered') . " $row_h{postcode}, $used_map) +<li>" . _('For council(s):') . " $council (" . _('other areas:') . " $areas) <li>$anon <li>$state -<li>Category: $row{category} -<li>Name: <input type="text" name="name" id="name" value="$row_h{name}"> -<li>Email: <input type="text" id="email" name="email" value="$row_h{email}"> -<li>Phone: $row_h{phone} -<li>Created: $row{created} -<li>Confirmed: $confirmed -<li>Sent: $whensent $resend -<li>Last update: $row{lastupdate} -<li>Service: $row{service} -<li>Cobrand: $row{cobrand} -<li>Cobrand data: $row{cobrand_data} -<li>Going to send questionnaire? $questionnaire +<li>" . _('Category:') . " $row{category} +<li>" . _('Name:') . " <input type='text' name='name' id='name' value='$row_h{name}'> +<li>" . _('Email:') . " <input type='text' id='email' name='email' value='$row_h{email}'> +<li>" . _('Phone:') . " $row_h{phone} +<li>" . _('Created:') . " $row{created} +<li>" . _('Confirmed:') . " $confirmed +<li>" . _('Sent:') . " $whensent $resend +<li>" . _('Last update:') . " $row{lastupdate} +<li>" . _('Service:') . " $row{service} +<li>" . _('Cobrand:') . " $row{cobrand} +<li>" . _('Cobrand data:') . " $row{cobrand_data} +<li>" . _('Going to send questionnaire?') . " $questionnaire $photo </ul> -EOF +"; print $q->submit(_('Submit changes')); print $q->end_form; @@ -652,7 +653,7 @@ sub admin_show_updates { my ($q, $updates) = @_; my $cobrand = Page::get_cobrand($q); print $q->start_table({border=>1, cellpadding=>2, cellspacing=>0}); - print $q->Tr({}, $q->th({}, ['ID', 'State', 'Name', 'Email', 'Created', 'Cobrand', 'Text', '*'])); + print $q->Tr({}, $q->th({}, [ _('ID'), _('State'), _('Name'), _('Email'), _('Created'), _('Cobrand'), _('Text'), _('*') ])); my $base_url = ''; my $cobrand_data; foreach (@$updates) { @@ -729,7 +730,7 @@ sub admin_edit_update { my $photo = ''; $photo = '<li><img align="top" src="' . Cobrand::base_url_for_emails($cobrand, $cobrand_data) . '/photo?c=' . $row{id} . '"> <input type="checkbox" id="remove_photo" name="remove_photo" value="1"> -<label for="remove_photo">Remove photo (can\'t be undone!)</label>' if $row{photo}; +<label for="remove_photo">' . _("Remove photo (can't be undone!)") . '</label>' if $row{photo}; my $url = Cobrand::base_url_for_emails($cobrand, $cobrand_data) . '/report/' . $row{problem_id} . '#update_' . $row{id}; @@ -740,19 +741,19 @@ sub admin_edit_update { print $q->hidden('id'); print $q->hidden('token', get_token($q)); print $q->hidden('submit', 1); - print <<EOF; + print " <ul> -<li><a href="$url">View update on site</a> -<li><label for="text">Text:</label><br><textarea name="text" id="text" cols=60 rows=10>$row_h{text}</textarea> +<li><a href='$url'>" . _('View update on site') . "</a> +<li><label for='text'>" . _('Text:') . "</label><br><textarea name='text' id='text' cols=60 rows=10>$row_h{text}</textarea> <li>$state -<li>Name: <input type="text" name="name" id="name" value="$name"> (blank to go anonymous) -<li>Email: <input type="text" id="email" name="email" value="$row_h{email}"> -<li>Cobrand: $row{cobrand} -<li>Cobrand data: $row{cobrand_data} -<li>Created: $row{created} +<li>" . _('Name:') . " <input type='text' name='name' id='name' value='$name'> " . _('(blank to go anonymous)') . " +<li>" . _('Email:') . " <input type='text' id='email' name='email' value='$row_h{email}'> +<li>" . _('Cobrand:') . " $row{cobrand} +<li>" . _('Cobrand data:') . " $row{cobrand_data} +<li>" . _('Created:') . " $row{created} $photo </ul> -EOF +"; print $q->submit(_('Submit changes')); print $q->end_form; print html_tail($q); @@ -817,41 +818,42 @@ sub admin_timeline { my $date = ''; my $cobrand_data; foreach (reverse sort keys %time) { - my $curdate = strftime('%A, %e %B %Y', localtime($_)); + my $curdate = decode_utf8(strftime('%A, %e %B %Y', localtime($_))); if ($date ne $curdate) { print '</dl>' if $date; print "<h2>$curdate</h2> <dl>"; $date = $curdate; } - print '<dt><b>', strftime('%H:%M:%S', localtime($_)), ':</b></dt> <dd>'; + print '<dt><b>', decode_utf8(strftime('%H:%M:%S', localtime($_))), ':</b></dt> <dd>'; foreach (@{$time{$_}}) { my $type = $_->{type}; + my $name_str = '; ' . sprintf(_("by %s"), ent($_->{name})) . " <" . ent($_->{email}) . ">, '" . ent($_->{title}) . "'"; if ($type eq 'problemCreated') { - print "Problem $_->{id} created; by " . ent($_->{name}) . " <" . ent($_->{email}) . ">, '" . ent($_->{title}) . "'"; + print sprintf(_("Problem %d created"), $_->{id}) . $name_str; } elsif ($type eq 'problemConfirmed') { $cobrand_data = get_cobrand_data_from_hash($cobrand, $_); my $url = Cobrand::base_url_for_emails($cobrand, $cobrand_data) . "/report/$_->{id}"; - print "Problem <a href='$url'>$_->{id}</a> confirmed; by " . ent($_->{name}) ." <" . ent($_->{email}) . ">, '" . ent($_->{title}) ."'"; + print sprintf(_("Problem %s confirmed"), "<a href='$url'>$_->{id}</a>") . $name_str; } elsif ($type eq 'problemSent') { $cobrand_data = get_cobrand_data_from_hash($cobrand, $_); my $url = Cobrand::base_url_for_emails($cobrand, $cobrand_data) . "/report/$_->{id}"; - print "Problem <a href='$url'>$_->{id}</a> sent to council $_->{council}; by " . ent($_->{name}) . " <" . ent($_->{email}) . ">, '" . ent($_->{title}) . "'"; + print sprintf(_("Problem %s sent to council %s"), "<a href='$url'>$_->{id}</a>", $_->{council}); } elsif ($type eq 'quesSent') { - print "Questionnaire $_->{id} sent for problem $_->{problem_id}"; + print sprintf(_("Questionnaire %d sent for problem %d"), $_->{id}, $_->{problem_id}); } elsif ($type eq 'quesAnswered') { - print "Questionnaire $_->{id} answered for problem $_->{problem_id}, $_->{old_state} to $_->{new_state}"; + print sprintf(_("Questionnaire %d answered for problem %d, %s to %s"), $_->{id}, $_->{problem_id}, $_->{old_state}, $_->{new_state}); } elsif ($type eq 'update') { $cobrand_data = get_cobrand_data_from_hash($cobrand, $_); my $url = Cobrand::base_url_for_emails($cobrand, $cobrand_data) . "/report/$_->{problem_id}#$_->{id}"; my $name = ent($_->{name} || 'anonymous'); - print "Update <a href='$url'>$_->{id}</a> created for problem $_->{problem_id}; by $name <" . ent($_->{email}) . ">"; + print sprintf(_("Update %s created for problem %d; by %s"), "<a href='$url'>$_->{id}</a>", $_->{problem_id}, $name) . " <" . ent($_->{email}) . ">"; } elsif ($type eq 'alertSub') { my $param = $_->{parameter} || ''; my $param2 = $_->{parameter2} || ''; - print "Alert $_->{id} created for " . ent($_->{email}) . ", type $_->{alert_type}, parameters $param / $param2"; + print sprintf(_("Alert %d created for %s, type %s, parameters %s / %s"), $_->{id}, ent($_->{email}), $_->{alert_type}, $param, $param2); } elsif ($type eq 'alertDel') { - my $sub = strftime('%H:%M:%S %e %B %Y', localtime($_->{whensubscribed})); - print "Alert $_->{id} disabled (created $sub)"; + my $sub = decode_utf8(strftime('%H:%M:%S %e %B %Y', localtime($_->{whensubscribed}))); + print sprintf(_("Alert %d disabled (created %s)"), $_->{id}, $sub); } print '<br>'; } diff --git a/web/alert.cgi b/web/alert.cgi index e2a4efaac..dd4676644 100755 --- a/web/alert.cgi +++ b/web/alert.cgi @@ -90,9 +90,6 @@ sub alert_list { }; } - # truncate the lat,lon for nicer urls - ( $lat, $lon ) = map { Utils::truncate_coordinate($_) } ( $lat, $lon ); - return FixMyStreet::Geocode::list_choices($error, '/alert', $q) if ref($error) eq 'ARRAY'; return alert_front_page($q, $error) if $error; @@ -105,6 +102,9 @@ sub alert_list { $pretty_pc =~ s/ / /; } + # truncate the lat,lon for nicer urls + ( $lat, $lon ) = map { Utils::truncate_coordinate($_) } ( $lat, $lon ); + my $errors = ''; $errors = '<ul class="error"><li>' . join('</li><li>', @errors) . '</li></ul>' if @errors; @@ -296,9 +296,9 @@ feed, or enter your email address to subscribe to an email alert.')); EOF my $rss_feed; if ($pretty_pc_text) { - $rss_feed = Cobrand::url($cobrand, "/rss/pc/$pretty_pc_text/", $q); + $rss_feed = Cobrand::url($cobrand, "/rss/pc/$pretty_pc_text", $q); } else { - $rss_feed = Cobrand::url($cobrand, "/rss/l/$lat,$lon/", $q); + $rss_feed = Cobrand::url($cobrand, "/rss/l/$lat,$lon", $q); } my $default_link = Cobrand::url($cobrand, "/alert?type=local;feed=local:$lat:$lon", $q); @@ -307,10 +307,10 @@ EOF $out .= " <a href='$rss_feed'><img src='/i/feed.png' width='16' height='16' title='" . _('RSS feed of nearby problems') . "' alt='" . _('RSS feed') . "' border='0'></a>"; $out .= '</p> <p id="rss_local_alt">' . _('(alternatively the RSS feed can be customised, within'); - my $rss_feed_2k = Cobrand::url($cobrand, $rss_feed.'2', $q); - my $rss_feed_5k = Cobrand::url($cobrand, $rss_feed.'5', $q); - my $rss_feed_10k = Cobrand::url($cobrand, $rss_feed.'10', $q); - my $rss_feed_20k = Cobrand::url($cobrand, $rss_feed.'20', $q); + my $rss_feed_2k = Cobrand::url($cobrand, $rss_feed.'/2', $q); + my $rss_feed_5k = Cobrand::url($cobrand, $rss_feed.'/5', $q); + my $rss_feed_10k = Cobrand::url($cobrand, $rss_feed.'/10', $q); + my $rss_feed_20k = Cobrand::url($cobrand, $rss_feed.'/20', $q); $out .= <<EOF; <a href="$rss_feed_2k">2km</a> / <a href="$rss_feed_5k">5km</a> / <a href="$rss_feed_10k">10km</a> / <a href="$rss_feed_20k">20km</a>) @@ -437,8 +437,8 @@ sub alert_rss { $url .= "?" . $extra_params if ($extra_params); print $q->redirect($url); return; - } elsif ($feed =~ /^local:(\d+):(\d+)$/) { - $url = $base_url . '/rss/n/' . $1 . ',' . $2; + } elsif ($feed =~ /^local:([\d\.-]+):([\d\.-]+)$/) { + $url = $base_url . '/rss/l/' . $1 . ',' . $2; $url .= "?" . $extra_params if ($extra_params); print $q->redirect($url); return; diff --git a/web/cobrands/fiksgatami/css.css b/web/cobrands/fiksgatami/css.css index 8029e6698..4db2a94e6 100644 --- a/web/cobrands/fiksgatami/css.css +++ b/web/cobrands/fiksgatami/css.css @@ -1,3 +1,64 @@ #front_stats div { - width: 6em; + width: 6.5em; } + +body { + font-family: Helmet, Freesans, "Helvetica Neue", Arial, sans-serif; +} + +a:link { + color: #215d93; +} +a:visited { + color: #518dc3; +} +a:hover, a:active { + color: #cc0000; +} + +blockquote { + border-left: solid 4px #1a4f7f; +} + +.a { + color: #000000; + background-color: #a9cff1; +} + +#header { + padding: 0.1em 0.5em 0.15em; + border-bottom: solid 2px #1a4f7f; + background-color: #99bfe1; + color: #1a4f7f; +} + +#my { + color: #0a3f6f; + background-color: #99bfe1; +} + +#header a:link, #header a:visited { + color: #1a4f7f; + background-color: #99bfe1; +} + +#navigation a:link, #navigation a:visited { + color: #1a4f7f; +} +#navigation a:hover, #navigation a:active { + background-color: #1a4f7f; + color: #99bfe1; +} + +#footer { + border-top: solid 1px #1a4f7f; +} + +#postcodeForm { + background-color: #99bfe1; +} + +#front_stats div { + background-color: #99bfe1; +} + diff --git a/web/faq.cgi b/web/faq.cgi index 2046f6955..4d9c7413a 100755 --- a/web/faq.cgi +++ b/web/faq.cgi @@ -16,16 +16,8 @@ my $lastmodified = (stat $0)[9]; sub main { my $q = shift; print Page::header($q, title=>_('Frequently Asked Questions')); - if ($q->{site} eq 'emptyhomes') { - my $lang = $mySociety::Locale::lang; - if ($lang eq 'cy') { - print File::Slurp::read_file("$FindBin::Bin/../templates/website/faq-eha.cy.html"); - } else { - print File::Slurp::read_file("$FindBin::Bin/../templates/website/faq-eha.html"); - } - } else { - print File::Slurp::read_file("$FindBin::Bin/../templates/website/faq.html"); - } + my $lang = $mySociety::Locale::lang; + print Page::template_include("faq-$lang", $q, Page::template_root($q)); print Page::footer($q); } Page::do_fastcgi(\&main, $lastmodified); diff --git a/web/index.cgi b/web/index.cgi index 7e177e0a2..8fab1d079 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -12,9 +12,9 @@ use Utils; use Encode; use Error qw(:try); use File::Slurp; -use LWP::Simple; use RABX; use CGI::Carp; +use POSIX qw(strcoll); use URI::Escape; # use Carp::Always; @@ -118,7 +118,7 @@ sub front_page { my $cobrand_form_elements = Cobrand::form_elements($cobrand, 'postcodeForm', $q); my $form_action = Cobrand::url($cobrand, '/', $q); my $question = Cobrand::enter_postcode_text($cobrand, $q); - $question = _("Enter a nearby GB postcode, or street name and area:") + $question = _("Enter a nearby GB postcode, or street name and area") unless $question; my %params = ('context' => 'front-page'); $params{status_code} = $status_code if $status_code; @@ -127,7 +127,7 @@ sub front_page { pc_h => $pc_h, cobrand_form_elements => $cobrand_form_elements, form_action => $form_action, - question => $question, + question => "$question:", ); my $cobrand_front_page = Page::template_include('front-page', $q, Page::template_root($q), %vars); return ($cobrand_front_page, %params) if $cobrand_front_page; @@ -165,7 +165,7 @@ EOF } my $activate = _("Go"); $out .= <<EOF; -<label for="pc">$question</label> +<label for="pc">$question:</label> <input type="text" name="pc" value="$pc_h" id="pc" size="10" maxlength="200"> <input type="submit" value="$activate" id="submit"> $cobrand_form_elements @@ -552,7 +552,7 @@ please specify the closest point on land.')) unless %$all_councils; my $categories = select_all("select area_id, category from contacts where deleted='f' and area_id in (" . join(',', keys %$all_councils) . ')'); if ($q->{site} ne 'emptyhomes') { - @$categories = sort { $a->{category} cmp $b->{category} } @$categories; + @$categories = sort { strcoll($a->{category}, $b->{category}) } @$categories; foreach (@$categories) { $council_ok{$_->{area_id}} = 1; next if $_->{category} eq _('Other'); @@ -638,7 +638,7 @@ If this is not the correct location, simply click on the map again. ')); $vars{page_heading} = $q->h1(_('Reporting a problem')); if ($details eq 'all') { - my $council_list = join('</strong> or <strong>', map { $_->{name} } values %$all_councils); + my $council_list = join('</strong>' . _(' or ') . '<strong>', map { $_->{name} } values %$all_councils); if ($q->{site} eq 'emptyhomes'){ $vars{text_help} = '<p>' . sprintf(_('All the information you provide here will be sent to <strong>%s</strong>. On the site, we will show the subject and details of the problem, plus your @@ -945,7 +945,7 @@ sub display_location { my $rss_url; if ($pc_h) { - $rss_url = "/rss/pc/" . URI::Escape::uri_escape($pc_h); + $rss_url = "/rss/pc/" . URI::Escape::uri_escape_utf8($pc_h); } else { $rss_url = "/rss/l/$short_lat,$short_lon"; } diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index c5aa318b0..6e350537a 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -4,7 +4,7 @@ YAHOO.util.Event.onContentReady('map', function() { new OpenLayers.Control.ArgParser(), //new OpenLayers.Control.LayerSwitcher(), new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PanZoom() + new OpenLayers.Control.PanZoomFMS() ], displayProjection: new OpenLayers.Projection("EPSG:4326") }); @@ -50,6 +50,43 @@ YAHOO.util.Event.onContentReady('map', function() { }); +/* Overridding the buttonDown function of PanZoom so that it does + zoomTo(0) rather than zoomToMaxExtent() +*/ +OpenLayers.Control.PanZoomFMS = OpenLayers.Class(OpenLayers.Control.PanZoom, { + buttonDown: function (evt) { + if (!OpenLayers.Event.isLeftClick(evt)) { + return; + } + + switch (this.action) { + case "panup": + this.map.pan(0, -this.getSlideFactor("h")); + break; + case "pandown": + this.map.pan(0, this.getSlideFactor("h")); + break; + case "panleft": + this.map.pan(-this.getSlideFactor("w"), 0); + break; + case "panright": + this.map.pan(this.getSlideFactor("w"), 0); + break; + case "zoomin": + this.map.zoomIn(); + break; + case "zoomout": + this.map.zoomOut(); + break; + case "zoomworld": + this.map.zoomTo(0); + break; + } + + OpenLayers.Event.stop(evt); + } +}); + OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { defaultHandlerOptions: { 'single': true, diff --git a/web/questionnaire.cgi b/web/questionnaire.cgi index 1eb62d03e..fdb1c08a4 100755 --- a/web/questionnaire.cgi +++ b/web/questionnaire.cgi @@ -305,9 +305,10 @@ EOF (please note it will not be sent to the council). For example, what was your experience of getting the problem fixed?')); if ($allow_photo_upload) { - $vars{photo_input} = <<EOF; + my $photo = _('Photo:'); + $vars{photo_input} = <<EOF; <div id="fileupload_normalUI"> -<label for="form_photo">Photo:</label> +<label for="form_photo">$photo</label> <input type="file" name="photo" id="form_photo"> </div> EOF @@ -318,14 +319,17 @@ EOF ); $vars{another_yes} = $another{yes}; $vars{another_no} = $another{no}; + my $another_qn = _('Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?'); + my $yes = _('Yes'); + my $no = _('No'); $vars{another_questionnaire} = <<EOF if $q->{site} ne 'emptyhomes'; <div id="another_qn"> -<p>Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?</p> +<p>$another_qn</p> <p> <input type="radio" name="another" id="another_yes" value="Yes"$another{yes}> -<label for="another_yes">Yes</label> +<label for="another_yes">$yes</label> <input type="radio" name="another" id="another_no" value="No"$another{no}> -<label for="another_no">No</label> +<label for="another_no">$no</label> </p> </div> EOF diff --git a/web/reports.cgi b/web/reports.cgi index f0ecf9c7a..784c52917 100755 --- a/web/reports.cgi +++ b/web/reports.cgi @@ -12,6 +12,7 @@ use strict; use Standard; use Encode; +use POSIX qw(strcoll); use URI::Escape; use FixMyStreet::Alert; use mySociety::MaPit; @@ -201,7 +202,7 @@ sub main { print '<th>' . _('Old problems,<br>state unknown') . '</th>'; } print '<th>' . _('Recently fixed') . '</th><th>' . _('Older fixed') . '</th></tr>'; - foreach (sort { $areas_info->{$a}->{name} cmp $areas_info->{$b}->{name} } keys %$areas_info) { + foreach (sort { strcoll($areas_info->{$a}->{name}, $areas_info->{$b}->{name}) } keys %$areas_info) { next if mySociety::Config::get('COUNTRY') eq 'NO' && $_ eq 301; # Only want one Oslo print '<tr align="center"'; ++$c; diff --git a/web/rss.cgi b/web/rss.cgi index 1ca2a1fe2..1273a2a5e 100755 --- a/web/rss.cgi +++ b/web/rss.cgi @@ -108,6 +108,7 @@ sub rss_local_problems { $error = shift; }; if ($error) { + print $q->redirect(-location => "$base/alert"); return ''; } else { ( $lat, $lon ) = map { Utils::truncate_coordinate($_) } ( $lat, $lon ); |