diff options
148 files changed, 3503 insertions, 2199 deletions
@@ -13,12 +13,23 @@ already been reported and leave updates. Users can also subscribe to email or RSS alerts of problems in their area. It was created in 2007 by [mySociety](http://www.mysociety.org/) for reporting -problems to UK councils and has been copied around the world. The FixMyStreet -Platform is now at version 1.0. +problems to UK councils and has been copied around the world. The FixMyStreet +Platform is now at version 1.1.1. ## Releases -* v1.0 (24th October 2012) - Official launch of the FixMyStreet platform +* v1.1.1 (22nd February 2013) + - Hotfix to fix missed iPhone width bug +* v1.1 (22nd February 2013) + - Addition of bodies so that the organisations that reports are sent to can + cover multiple MapIt administrative areas, or multiple bodies can cover + one area, and other related scenarios + - Admin display improvements + - Internationalisation improvements, especially with text in JavaScript + - Various minor updates and fixes (e.g. a --debug option on send-reports, + and coping if MapIt has its debug switched on) +* v1.0 (24th October 2012) + - Official launch of the FixMyStreet platform ## Installation diff --git a/bin/install-as-user b/bin/install-as-user index 2e0816966..b9dfa3973 100755 --- a/bin/install-as-user +++ b/bin/install-as-user @@ -101,7 +101,7 @@ fi # Install the required Perl modules - this may take a very long time: -cd "$FMS_REPOSITORY" +cd "$REPOSITORY" bin/install_perl_modules # Generate po and mo files (these invocations taken from Kagee's script): diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh index 6ebac7970..d0b3738f3 100644 --- a/bin/site-specific-install.sh +++ b/bin/site-specific-install.sh @@ -1,5 +1,8 @@ #!/bin/sh +# Set this to the version we want to check out +VERSION=v1.1.1 + PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh misuse() { @@ -25,6 +28,9 @@ misuse() { install_nginx +# Check out the current released version +su -l -c "cd '$REPOSITORY' && git checkout '$VERSION'" "$UNIX_USER" + install_website_packages su -l -c "touch '$DIRECTORY/admin-htpasswd'" "$UNIX_USER" diff --git a/bin/update-schema b/bin/update-schema new file mode 100644 index 000000000..f728f8c56 --- /dev/null +++ b/bin/update-schema @@ -0,0 +1,134 @@ +#!/usr/bin/perl +# +# This script should hopefully work out at what state the database is and, if +# the commit argument is provided, run the right schema files to bring it up to +# date. Let us know if it doesn't work; as with any upgrade script, do take a +# backup of your database before running. +# +# update-schema [--commit] + +use strict; +use warnings; + +# Horrible boilerplate to set up appropriate library paths. +use FindBin; +use lib "$FindBin::Bin/../commonlib/perllib"; + +use mySociety::Config; +use mySociety::DBHandle qw(dbh); +use mySociety::MaPit; + +mySociety::Config::set_file("$FindBin::Bin/../conf/general"); +mySociety::DBHandle::configure( + Name => mySociety::Config::get('FMS_DB_NAME'), + User => mySociety::Config::get('FMS_DB_USER'), + Password => mySociety::Config::get('FMS_DB_PASS'), + Host => mySociety::Config::get('FMS_DB_HOST', undef), + Port => mySociety::Config::get('FMS_DB_PORT', undef) +); + +my $commit = 0; +$commit = 1 if @ARGV && $ARGV[0] eq '--commit'; + +my $nothing = 1; +my $current_version = get_db_version(); +print "Current database version = $current_version\n"; +print "= Dry run =\n" unless $commit; + +for my $path (glob("$FindBin::Bin/../db/schema_*")) { + my ($name) = $path =~ /schema_(.*)\.sql$/; + next if $name le $current_version; + next if $name =~ /$current_version-/; # For number only match + print "* $name\n"; + $nothing = 0; + next unless $commit; + + open(FP, $path) or die $!; + my @statements; + my $s = ''; + my $in_function = 0; + while(<FP>) { + next if /^--/; # Ignore comments + $s .= $_; + # Functions may have semicolons within them + $in_function = 1 if /create function/i; + $in_function = 0 if /language 'plpgsql'/i; + if ($s =~ /;/ && !$in_function) { + push @statements, $s; + $s = ''; + } + } + close FP; + + foreach my $st (@statements) { + dbh()->do($st); + } +} + +if ( $commit && $current_version lt '0028' ) { + print "Bodies created, fetching names from mapit\n"; + my $area_ids = dbh()->selectcol_arrayref('SELECT area_id FROM body_areas'); + if ( @$area_ids ) { + my $areas = mySociety::MaPit::call('areas', $area_ids); + foreach (values %$areas) { + dbh()->do('UPDATE body SET name=? WHERE id=?', {}, $_->{name}, $_->{id}); + } + dbh()->do('COMMIT'); + } +} + +print "Nothing to do\n" if $nothing; + +# --- + +# By querying the database schema, we can see where we're currently at +# (assuming schema change files are never half-applied, which should be the case) +sub get_db_version { + return '0028' if table_exists('body'); + return '0027' if column_exists('problem', 'subcategory'); + return '0026' if column_exists('open311conf', 'send_extended_statuses'); + return '0025' if column_like('alert_type', "ref='new_problems'", 'item_where', 'duplicate'); + return '0024' if column_exists('contacts', 'non_public'); + return '0023' if column_exists('open311conf', 'can_be_devolved'); + return '0022' if column_exists('problem', 'interest_count'); + return '0021' if column_exists('problem', 'external_source'); + return '0020' if column_exists('open311conf', 'suppress_alerts'); + return '0019' if column_exists('users', 'title'); + return '0018' if column_exists('open311conf', 'comment_user_id'); + return '0017' if column_exists('open311conf', 'send_comments'); + return '0016' if column_exists('comment', 'send_fail_count'); + return '0015-add_send_method_used_column_to_problem' if column_exists('problem', 'send_method_used'); + return '0015-add_extra_to_comment' if column_exists('comment', 'extra'); + return '0014' if column_exists('problem', 'send_fail_count'); + return '0013-add_send_method_column_to_open311conf' if column_exists('open311conf', 'send_method'); + return '0013-add_external_id_to_comment' if column_exists('comment', 'external_id'); + return '0012' if column_exists('problem', 'geocode'); + return '0011' if column_exists('contacts', 'extra'); + return '0010' if table_exists('open311conf'); + return '0009-update_alerts_problem_state_queries' if column_like('alert_type', "ref='new_problems'", 'item_where', 'investigating'); + return '0009-add_extra_to_problem' if column_exists('problem', 'extra'); + return '0008' if 0; + return '0007' if column_exists('comment', 'problem_state'); + return '0006' if 0; + return '0005-add_council_user_flag' if column_exists('users', 'from_council'); + return '0005-add_abuse_flags_to_users_and_reports' if column_exists('problem', 'flagged'); + return '0000'; +} + +# Returns true if a table exists +sub table_exists { + my $table = shift; + return dbh()->selectrow_array('select count(*) from pg_tables where tablename = ?', {}, $table); +} + +# Returns true if a column of table exists +sub column_exists { + my ( $table, $column ) = @_; + return dbh()->selectrow_array('select count(*) from pg_class, pg_attribute WHERE pg_class.relname=? AND pg_attribute.attname=? AND pg_class.oid=pg_attribute.attrelid AND pg_attribute.attnum > 0', {}, $table, $column); +} + +# Returns true if a column of a row in a table contains some text +sub column_like { + my ( $table, $where, $column, $contents ) = @_; + return dbh()->selectrow_array("select count(*) from $table WHERE $where AND $column LIKE ?", {}, "%$contents%"); +} diff --git a/bin/zurich-overdue-alert b/bin/zurich-overdue-alert index aa9f6fe60..3ba8b9163 100755 --- a/bin/zurich-overdue-alert +++ b/bin/zurich-overdue-alert @@ -72,6 +72,7 @@ sub send_alert { { _template_ => $template, _parameters_ => $h, + _line_indent => $cobrand->email_indent, To => $to, From => [ FixMyStreet->config('CONTACT_EMAIL'), FixMyStreet->config('CONTACT_NAME') ], }, diff --git a/commonlib b/commonlib -Subproject 98ea3736edb949184eef7d575c9caa12748b35b +Subproject d34573a26f0894c28ac118fa27c6945223fcf85 diff --git a/conf/crontab.ugly b/conf/crontab.ugly index 4eb6d5a26..c85d3f119 100644 --- a/conf/crontab.ugly +++ b/conf/crontab.ugly @@ -25,14 +25,17 @@ my @sending = qw( demo.fixmybarangay.com www.fixmybarangay.com zurich.fixmystreet.staging.mysociety.org + www.zueriwieneu.ch seesomething.mysociety.org ); my @no_alerts = qw( zurich.fixmystreet.staging.mysociety.org + www.zueriwieneu.ch seesomething.mysociety.org ); my @no_open311 = qw( zurich.fixmystreet.staging.mysociety.org + www.zueriwieneu.ch seesomething.mysociety.org ); my %sending = map { $_ => 1 } @sending; @@ -75,6 +78,6 @@ my %no_alerts = map { $_ => 1 } @no_alerts; 43 2 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/problem-creation-graph 00 8 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/check-for-zombies !!(*= $user *)!! -!!(* if ($vhost =~ /zurich/) { *)!! +!!(* if ($vhost =~ /zurich|zueri/) { *)!! 30 0 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper zurich-overdue-alert !!(* } *)!! diff --git a/db/schema_0022-add_interest_count_to_problems.sql b/db/schema_0022-add_interest_count_to_problems.sql index 62092aa0a..4a4703ae1 100644 --- a/db/schema_0022-add_interest_count_to_problems.sql +++ b/db/schema_0022-add_interest_count_to_problems.sql @@ -1,6 +1,6 @@ begin; ALTER table problem - ADD COLUMN interest_count integer; + ADD COLUMN interest_count integer DEFAULT 0; commit; diff --git a/db/schema_0026-change_interest_count_default.sql b/db/schema_0026-change_interest_count_default.sql deleted file mode 100644 index 7c78f6fe8..000000000 --- a/db/schema_0026-change_interest_count_default.sql +++ /dev/null @@ -1,9 +0,0 @@ -BEGIN; - - ALTER TABLE problem - ALTER COLUMN interest_count SET DEFAULT 0; - - UPDATE problem SET interest_count = 0 - WHERE interest_count IS NULL; - -COMMIT; diff --git a/db/schema_0027-rename_open311conf.sql b/db/schema_0027-rename_open311conf.sql deleted file mode 100644 index cef020648..000000000 --- a/db/schema_0027-rename_open311conf.sql +++ /dev/null @@ -1,12 +0,0 @@ -begin; - -ALTER TABLE open311conf RENAME TO body; -ALTER INDEX open311conf_pkey RENAME TO body_pkey; -ALTER INDEX open311conf_area_id_key RENAME TO body_area_id_key; -ALTER TABLE body ALTER COLUMN endpoint DROP NOT NULL; -ALTER TABLE body DROP CONSTRAINT open311conf_comment_user_id_fkey; -ALTER TABLE body ADD CONSTRAINT body_comment_user_id_fkey - FOREIGN KEY (comment_user_id) REFERENCES users(id); -ALTER SEQUENCE open311conf_id_seq RENAME TO body_id_seq; - -commit; diff --git a/db/schema_0028-add-bodies.sql b/db/schema_0028-add-bodies.sql new file mode 100644 index 000000000..b56738cf3 --- /dev/null +++ b/db/schema_0028-add-bodies.sql @@ -0,0 +1,87 @@ +BEGIN; + +-- Remove unused function +drop function ms_current_date(); + +-- Rename open311conf to create the new body table +ALTER TABLE open311conf RENAME TO body; +ALTER INDEX open311conf_pkey RENAME TO body_pkey; +ALTER INDEX open311conf_area_id_key RENAME TO body_area_id_key; +ALTER TABLE body ALTER COLUMN endpoint DROP NOT NULL; +ALTER TABLE body DROP CONSTRAINT open311conf_comment_user_id_fkey; +ALTER TABLE body ADD CONSTRAINT body_comment_user_id_fkey + FOREIGN KEY (comment_user_id) REFERENCES users(id); +ALTER SEQUENCE open311conf_id_seq RENAME TO body_id_seq; + +-- Update contacts column to be better named +ALTER TABLE contacts RENAME area_id TO body_id; +ALTER TABLE contacts_history RENAME area_id TO body_id; +ALTER INDEX contacts_area_id_category_idx RENAME TO contacts_body_id_category_idx; + +-- Data migration from contacts +UPDATE body SET id = area_id; +INSERT INTO body (id, area_id) + SELECT DISTINCT body_id, body_id FROM contacts WHERE body_id not in (SELECT id FROM body); +SELECT setval('body_id_seq', (SELECT MAX(id) FROM body) ); + +ALTER TABLE contacts ADD CONSTRAINT contacts_body_id_fkey + FOREIGN KEY (body_id) REFERENCES body(id); + +DROP TRIGGER contacts_update_trigger ON contacts; +DROP TRIGGER contacts_insert_trigger ON contacts; +DROP FUNCTION contacts_updated(); +create function contacts_updated() + returns trigger as ' + begin + insert into contacts_history (contact_id, body_id, category, email, editor, whenedited, note, confirmed, deleted) values (new.id, new.body_id, new.category, new.email, new.editor, new.whenedited, new.note, new.confirmed, new.deleted); + return new; + end; +' language 'plpgsql'; +create trigger contacts_update_trigger after update on contacts + for each row execute procedure contacts_updated(); +create trigger contacts_insert_trigger after insert on contacts + for each row execute procedure contacts_updated(); + +-- Give bodies a name +ALTER TABLE body ADD name text; +UPDATE body SET name=''; +ALTER table body ALTER COLUMN name SET NOT NULL; + +-- Update users column to be better named +ALTER TABLE users RENAME COLUMN from_council TO from_body; +ALTER TABLE users ADD CONSTRAINT users_from_body_fkey + FOREIGN KEY (from_body) REFERENCES body(id); + +-- Rename problem's council column +ALTER TABLE problem RENAME COLUMN council TO bodies_str; + +-- Update alert types that used 'council' column +UPDATE alert_type set item_where = 'problem.non_public = ''f'' and problem.state in +(''confirmed'', ''investigating'', ''planned'', ''in progress'', + ''fixed'', ''fixed - council'', ''fixed - user'', ''closed'', + ''action scheduled'', ''not responsible'', ''duplicate'', ''unable to fix'', + ''internal referral'' ) AND +(bodies_str like ''%''||?||''%'' or bodies_str is null) and +areas like ''%,''||?||'',%''' WHERE ref = 'council_problems'; +UPDATE alert_type set item_where = 'problem.non_public = ''f'' and problem.state in +(''confirmed'', ''investigating'', ''planned'', ''in progress'', + ''fixed'', ''fixed - council'', ''fixed - user'', ''closed'', + ''action scheduled'', ''not responsible'', ''duplicate'', ''unable to fix'', + ''internal referral'' ) AND +(bodies_str like ''%''||?||''%'' or bodies_str is null) and +areas like ''%,''||?||'',%''' WHERE ref = 'ward_problems'; + +-- Move to many-many relationship between bodies and areas +create table body_areas ( + body_id integer not null references body(id), + area_id integer not null +); +create unique index body_areas_body_id_area_id_idx on body_areas(body_id, area_id); +INSERT INTO body_areas (body_id, area_id) + SELECT id, area_id FROM body; +ALTER TABLE body DROP COLUMN area_id; + +-- Allow bodies to have a hierarchy +ALTER TABLE body ADD parent INTEGER REFERENCES body(id); + +COMMIT; diff --git a/db/schema_0028-rename_from_council.sql b/db/schema_0028-rename_from_council.sql deleted file mode 100644 index 027a257a4..000000000 --- a/db/schema_0028-rename_from_council.sql +++ /dev/null @@ -1,5 +0,0 @@ -begin; - -ALTER TABLE users RENAME COLUMN from_council TO from_body; - -commit; diff --git a/db/schema_0029-rename_contacts_area_id.sql b/db/schema_0029-rename_contacts_area_id.sql deleted file mode 100644 index 861ace5c5..000000000 --- a/db/schema_0029-rename_contacts_area_id.sql +++ /dev/null @@ -1,31 +0,0 @@ -begin; - -ALTER TABLE contacts RENAME area_id TO body_id; -ALTER TABLE contacts_history RENAME area_id TO body_id; -ALTER INDEX contacts_area_id_category_idx RENAME TO contacts_body_id_category_idx; - --- Data migration -UPDATE body SET id = area_id; -INSERT INTO body (id, area_id) - SELECT DISTINCT body_id, body_id FROM contacts WHERE body_id not in (SELECT id FROM body); -SELECT setval('body_id_seq', (SELECT MAX(id) FROM body) ); - -ALTER TABLE contacts ADD CONSTRAINT contacts_body_id_fkey - FOREIGN KEY (body_id) REFERENCES body(id); - -DROP TRIGGER contacts_update_trigger ON contacts; -DROP TRIGGER contacts_insert_trigger ON contacts; -DROP FUNCTION contacts_updated(); -create function contacts_updated() - returns trigger as ' - begin - insert into contacts_history (contact_id, body_id, category, email, editor, whenedited, note, confirmed, deleted) values (new.id, new.body_id, new.category, new.email, new.editor, new.whenedited, new.note, new.confirmed, new.deleted); - return new; - end; -' language 'plpgsql'; -create trigger contacts_update_trigger after update on contacts - for each row execute procedure contacts_updated(); -create trigger contacts_insert_trigger after insert on contacts - for each row execute procedure contacts_updated(); - -commit; diff --git a/db/schema_0030-add-body-name.sql b/db/schema_0030-add-body-name.sql deleted file mode 100644 index 30ac26e98..000000000 --- a/db/schema_0030-add-body-name.sql +++ /dev/null @@ -1,7 +0,0 @@ -begin; - -ALTER TABLE body ADD name text; -UPDATE body SET name=''; -ALTER table body ALTER COLUMN name SET NOT NULL; - -commit; diff --git a/db/schema_0031-rename-problem-council-column.sql b/db/schema_0031-rename-problem-council-column.sql deleted file mode 100644 index 87542a192..000000000 --- a/db/schema_0031-rename-problem-council-column.sql +++ /dev/null @@ -1,5 +0,0 @@ -begin; - -ALTER TABLE problem RENAME COLUMN council TO bodies_str; - -commit; diff --git a/db/schema_0032-add-from_body-reference.sql b/db/schema_0032-add-from_body-reference.sql deleted file mode 100644 index 4fa526963..000000000 --- a/db/schema_0032-add-from_body-reference.sql +++ /dev/null @@ -1,6 +0,0 @@ -begin; - -ALTER TABLE users ADD CONSTRAINT users_from_body_fkey - FOREIGN KEY (from_body) REFERENCES body(id); - -commit; diff --git a/db/schema_0033-body-areas-many-many.sql b/db/schema_0033-body-areas-many-many.sql deleted file mode 100644 index e03f3fa44..000000000 --- a/db/schema_0033-body-areas-many-many.sql +++ /dev/null @@ -1,15 +0,0 @@ -begin; - -create table body_areas ( - body_id integer not null references body(id), - area_id integer not null -); -create unique index body_areas_body_id_area_id_idx on body_areas(body_id, area_id); - -INSERT INTO body_areas (body_id, area_id) - SELECT id, area_id FROM body; - -ALTER TABLE body DROP COLUMN area_id; - -commit; - diff --git a/db/schema_0034-add-body-parent.sql b/db/schema_0034-add-body-parent.sql deleted file mode 100644 index 9360fbcb3..000000000 --- a/db/schema_0034-add-body-parent.sql +++ /dev/null @@ -1,5 +0,0 @@ -begin; - -ALTER TABLE body ADD parent INTEGER REFERENCES body(id); - -commit; diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 667f3b57a..495564477 100644 --- a/locale/FixMyStreet.po +++ b/locale/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-02-13 11:17+0000\n" +"POT-Creation-Date: 2013-03-11 18:53+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" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:649 perllib/FixMyStreet/DB/ResultSet/Problem.pm:355 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 msgid " and " msgstr "" @@ -53,15 +53,15 @@ msgstr "" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "" -#: templates/web/default/report/_support.html:3 -msgid "%d supporters" +#: templates/web/default/pagination.html:10 +msgid "%d to %d of %d" msgstr "" #: templates/web/default/reports/body.html:0 templates/web/default/reports/body.html:20 msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:698 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "" @@ -69,7 +69,7 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "%s, reported at %s" msgstr "" @@ -101,11 +101,11 @@ msgstr "" msgid "(alternatively the RSS feed can be customised, within" msgstr "" -#: templates/web/default/around/around_map_list_items.html:12 templates/web/default/around/on_map_list_items.html:9 templates/web/fixmystreet/report/_item.html:20 templates/web/zurich/report/_item.html:19 +#: templates/web/default/around/around_map_list_items.html:12 templates/web/default/around/on_map_list_items.html:9 templates/web/fixmystreet/report/_item.html:22 templates/web/zurich/report/_item.html:21 msgid "(closed)" msgstr "" -#: templates/web/default/around/around_map_list_items.html:10 templates/web/default/around/on_map_list_items.html:7 templates/web/fixmystreet/report/_item.html:18 templates/web/zurich/report/_item.html:17 +#: templates/web/default/around/around_map_list_items.html:10 templates/web/default/around/on_map_list_items.html:7 templates/web/fixmystreet/report/_item.html:20 templates/web/zurich/report/_item.html:19 msgid "(fixed)" msgstr "" @@ -113,7 +113,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/default/reports/_list-entry.html:4 templates/web/fixmystreet/report/_item.html:14 +#: templates/web/default/reports/_list-entry.html:4 templates/web/fixmystreet/report/_item.html:16 msgid "(not sent to council)" msgstr "" @@ -121,7 +121,7 @@ msgstr "" msgid "(optional)" msgstr "" -#: templates/web/default/reports/_list-entry.html:2 templates/web/fixmystreet/report/_item.html:13 +#: templates/web/default/reports/_list-entry.html:2 templates/web/fixmystreet/report/_item.html:15 msgid "(sent to both)" msgstr "" @@ -133,18 +133,14 @@ msgstr "" msgid "(we never show your email)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 perllib/FixMyStreet/App/Controller/Report/New.pm:661 perllib/FixMyStreet/DB/Result/Problem.pm:431 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 perllib/FixMyStreet/App/Controller/Report/New.pm:661 perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 perllib/FixMyStreet/DB/Result/Problem.pm:437 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "" -#: templates/web/default/report/_support.html:3 -msgid "1 supporter" -msgstr "" - #: templates/web/default/questionnaire/completed.html:20 msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" msgstr "" @@ -225,7 +221,7 @@ msgstr "" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/fixmystreet/auth/general.html:50 +#: templates/web/fixmystreet/auth/general.html:50 templates/web/zurich/auth/general.html:49 msgid "<strong>No</strong> let me sign in by email" msgstr "" @@ -261,7 +257,7 @@ msgstr "" msgid "Add new category" msgstr "" -#: templates/web/default/admin/users.html:35 +#: templates/web/default/admin/users.html:36 msgid "Add user" msgstr "" @@ -285,15 +281,15 @@ msgstr "" msgid "Alert me to future updates" msgstr "" -#: templates/web/default/reports/index.html:3 templates/web/fixmybarangay/reports/index.html:3 templates/web/zurich/reports/index.html:15 +#: templates/web/default/reports/index.html:3 templates/web/fixmybarangay/reports/index.html:3 templates/web/zurich/admin/stats.html:5 templates/web/zurich/reports/index.html:15 msgid "All Reports" msgstr "" -#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21 templates/web/bromley/header.html:77 templates/web/default/footer.html:11 templates/web/emptyhomes/header.html:32 templates/web/fiksgatami/footer.html:7 templates/web/fiksgatami/nn/footer.html:7 templates/web/fixmybarangay/footer.html:20 templates/web/fixmystreet/footer.html:48 templates/web/oxfordshire/footer.html:23 templates/web/oxfordshire/header.html:67 templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/footer.html:19 templates/web/zurich/nav_over_content.html:6 +#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21 templates/web/bromley/header.html:77 templates/web/default/footer.html:11 templates/web/emptyhomes/header.html:32 templates/web/fiksgatami/footer.html:7 templates/web/fiksgatami/nn/footer.html:7 templates/web/fixmybarangay/footer.html:20 templates/web/fixmystreet/footer.html:48 templates/web/oxfordshire/footer.html:23 templates/web/oxfordshire/header.html:67 templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:19 templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "" -#: templates/web/default/admin/stats.html:5 +#: templates/web/default/admin/stats.html:5 templates/web/zurich/admin/stats.html:8 msgid "All reports between %s and %s" msgstr "" @@ -317,11 +313,11 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "" -#: templates/web/default/admin/flagged.html:15 templates/web/default/admin/list_updates.html:10 templates/web/default/admin/reports.html:18 +#: templates/web/default/admin/flagged.html:15 templates/web/default/admin/list_updates.html:11 templates/web/default/admin/reports.html:17 msgid "Anonymous" msgstr "" -#: templates/web/default/admin/report_edit.html:34 templates/web/default/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:37 templates/web/default/admin/update_edit.html:17 msgid "Anonymous:" msgstr "" @@ -341,19 +337,19 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:109 +#: templates/web/zurich/admin/report_edit.html:117 templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/report_edit.html:126 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:150 templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/report_edit.html:103 templates/web/zurich/admin/report_edit.html:158 msgid "Assign to subdivision:" msgstr "" -#: templates/web/zurich/report/updates.html:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:98 templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -365,7 +361,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:386 templates/web/zurich/report/_item.html:9 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" @@ -381,11 +377,11 @@ msgstr "" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 perllib/FixMyStreet/Cobrand/Zurich.pm:144 templates/web/default/admin/bodies.html:1 templates/web/zurich/header.html:63 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 perllib/FixMyStreet/Cobrand/Zurich.pm:204 templates/web/default/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" -#: templates/web/default/admin/reports.html:16 templates/web/default/admin/users.html:14 +#: templates/web/default/admin/reports.html:15 templates/web/default/admin/users.html:14 msgid "Body" msgstr "" @@ -405,7 +401,7 @@ msgstr "" msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:68 templates/web/default/admin/bodies.html:11 templates/web/default/admin/body.html:35 templates/web/default/admin/flagged.html:14 templates/web/default/admin/index.html:36 templates/web/default/admin/reports.html:17 templates/web/default/report/new/category.html:10 templates/web/fixmystreet/report/new/fill_in_details_form.html:74 templates/web/seesomething/report/new/category.html:6 templates/web/southampton/report/new/category.html:3 templates/web/zurich/admin/body.html:13 templates/web/zurich/admin/index-dm.html:22 templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports.html:14 templates/web/zurich/report/new/fill_in_details_form.html:50 +#: templates/web/bromley/report/new/fill_in_details_form.html:68 templates/web/default/admin/bodies.html:11 templates/web/default/admin/body.html:35 templates/web/default/admin/flagged.html:14 templates/web/default/admin/index.html:36 templates/web/default/admin/reports.html:16 templates/web/default/report/new/category.html:10 templates/web/fixmystreet/report/new/fill_in_details_form.html:74 templates/web/seesomething/report/new/category.html:6 templates/web/southampton/report/new/category.html:3 templates/web/zurich/admin/body.html:13 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:50 templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "" @@ -413,11 +409,11 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/default/admin/body.html:75 templates/web/default/admin/body_edit.html:23 templates/web/default/admin/report_edit.html:33 templates/web/default/report/new/fill_in_details_form.html:67 templates/web/emptyhomes/report/new/fill_in_details_form.html:50 templates/web/zurich/admin/body.html:36 templates/web/zurich/admin/report_edit-sdm.html:29 templates/web/zurich/admin/report_edit.html:108 +#: templates/web/default/admin/body.html:75 templates/web/default/admin/body_edit.html:23 templates/web/default/admin/report_edit.html:36 templates/web/default/report/new/fill_in_details_form.html:67 templates/web/emptyhomes/report/new/fill_in_details_form.html:50 templates/web/zurich/admin/body.html:36 templates/web/zurich/admin/report_edit-sdm.html:42 templates/web/zurich/admin/report_edit.html:116 msgid "Category:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:348 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 msgid "Category: %s" msgstr "" @@ -429,11 +425,11 @@ msgstr "" msgid "Click map to report a problem" msgstr "" -#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:28 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/fixmystreet/report/banner.html:15 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:12 templates/web/zurich/admin/report_edit.html:85 templates/web/zurich/admin/report_edit.html:87 templates/web/zurich/report/banner.html:13 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:75 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:31 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/fixmystreet/report/banner.html:15 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:12 templates/web/zurich/admin/report_edit.html:90 templates/web/zurich/admin/report_edit.html:92 templates/web/zurich/admin/stats.html:31 templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:791 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Closed by council" msgstr "" @@ -449,19 +445,19 @@ msgstr "" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" -#: templates/web/default/admin/report_edit.html:17 templates/web/zurich/admin/report_edit-sdm.html:22 templates/web/zurich/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:17 templates/web/zurich/admin/report_edit-sdm.html:33 templates/web/zurich/admin/report_edit.html:46 msgid "Co-ordinates:" msgstr "" -#: templates/web/default/admin/flagged.html:16 templates/web/default/admin/list_updates.html:13 templates/web/default/admin/reports.html:19 +#: templates/web/default/admin/flagged.html:16 templates/web/default/admin/list_updates.html:14 templates/web/default/admin/reports.html:18 msgid "Cobrand" msgstr "" -#: templates/web/default/admin/report_edit.html:47 templates/web/default/admin/update_edit.html:44 +#: templates/web/default/admin/report_edit.html:50 templates/web/default/admin/update_edit.html:44 msgid "Cobrand data:" msgstr "" -#: templates/web/default/admin/report_edit.html:46 templates/web/default/admin/update_edit.html:43 +#: templates/web/default/admin/report_edit.html:49 templates/web/default/admin/update_edit.html:43 msgid "Cobrand:" msgstr "" @@ -489,7 +485,7 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/default/admin/body.html:37 templates/web/default/admin/body.html:85 templates/web/default/admin/body_edit.html:32 templates/web/default/admin/body_edit.html:84 +#: templates/web/default/admin/body.html:37 templates/web/default/admin/body.html:85 templates/web/default/admin/body_edit.html:32 templates/web/default/admin/body_edit.html:84 templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "" @@ -497,7 +493,7 @@ msgstr "" msgid "Confirmed reports between %s and %s" msgstr "" -#: templates/web/default/admin/problem_row.html:25 templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/problem_row.html:25 templates/web/default/admin/report_edit.html:45 msgid "Confirmed:" msgstr "" @@ -517,7 +513,7 @@ msgstr "" msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1224 perllib/FixMyStreet/App/Controller/Admin.pm:1252 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1264 perllib/FixMyStreet/App/Controller/Admin.pm:1292 msgid "Could not find user" msgstr "" @@ -525,7 +521,7 @@ msgstr "" msgid "Could not look up location" msgstr "" -#: templates/web/default/admin/flagged.html:13 templates/web/default/admin/list_updates.html:12 +#: templates/web/default/admin/flagged.html:13 templates/web/default/admin/list_updates.html:13 msgid "Council" msgstr "" @@ -537,7 +533,7 @@ msgstr "" msgid "Council:" msgstr "" -#: templates/web/default/admin/stats.html:12 templates/web/default/admin/stats.html:32 +#: templates/web/default/admin/stats.html:12 templates/web/default/admin/stats.html:32 templates/web/zurich/admin/stats.html:45 templates/web/zurich/admin/stats.html:50 msgid "Count" msgstr "" @@ -549,11 +545,11 @@ msgstr "" msgid "Create category" msgstr "" -#: templates/web/default/admin/flagged.html:17 templates/web/default/admin/list_updates.html:9 templates/web/default/admin/reports.html:20 templates/web/zurich/admin/list_updates.html:6 +#: templates/web/default/admin/flagged.html:17 templates/web/default/admin/list_updates.html:10 templates/web/default/admin/reports.html:19 templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "" -#: templates/web/default/admin/report_edit.html:41 templates/web/default/admin/update_edit.html:45 templates/web/zurich/admin/report_edit-sdm.html:34 templates/web/zurich/admin/report_edit.html:55 templates/web/zurich/admin/update_edit.html:29 +#: templates/web/default/admin/report_edit.html:44 templates/web/default/admin/update_edit.html:45 templates/web/zurich/admin/report_edit-sdm.html:47 templates/web/zurich/admin/report_edit.html:61 templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -565,11 +561,15 @@ msgstr "" msgid "Dashboard" msgstr "" +#: templates/web/zurich/admin/stats.html:35 +msgid "Dealt with by subdivision within 5 working days" +msgstr "" + #: templates/web/default/admin/body.html:38 templates/web/default/admin/body.html:88 templates/web/default/admin/body_edit.html:37 templates/web/default/admin/body_edit.html:85 msgid "Deleted" msgstr "" -#: templates/web/zurich/admin/index-dm.html:21 templates/web/zurich/admin/index-sdm.html:19 templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/index-dm.html:22 templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports.html:12 msgid "Description" msgstr "" @@ -577,7 +577,7 @@ msgstr "" msgid "Details" msgstr "" -#: templates/web/default/admin/report_edit.html:14 templates/web/default/report/new/fill_in_details_form.html:61 templates/web/emptyhomes/report/new/fill_in_details_form.html:79 templates/web/zurich/admin/report_edit-sdm.html:14 templates/web/zurich/admin/report_edit.html:22 templates/web/zurich/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:14 templates/web/default/report/new/fill_in_details_form.html:61 templates/web/emptyhomes/report/new/fill_in_details_form.html:79 templates/web/zurich/admin/report_edit-sdm.html:25 templates/web/zurich/admin/report_edit.html:25 templates/web/zurich/admin/report_edit.html:35 msgid "Details:" msgstr "" @@ -605,7 +605,7 @@ msgstr "" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:35 templates/web/default/admin/problem_row.html:31 templates/web/default/admin/users.html:28 templates/web/zurich/admin/problem_row.html:35 +#: templates/web/default/admin/list_updates.html:36 templates/web/default/admin/problem_row.html:31 templates/web/default/admin/users.html:28 templates/web/zurich/admin/problem_row.html:36 msgid "Edit" msgstr "" @@ -613,7 +613,7 @@ msgstr "" msgid "Edit body details" msgstr "" -#: templates/web/default/admin/report_edit.html:1 templates/web/zurich/admin/report_edit-sdm.html:1 templates/web/zurich/admin/report_edit.html:1 templates/web/zurich/admin/report_edit.html:4 +#: templates/web/default/admin/report_edit.html:1 templates/web/zurich/admin/report_edit-sdm.html:1 templates/web/zurich/admin/report_edit-sdm.html:4 templates/web/zurich/admin/report_edit.html:1 templates/web/zurich/admin/report_edit.html:4 msgid "Editing problem %d" msgstr "" @@ -629,15 +629,15 @@ msgstr "" msgid "Editor" msgstr "" -#: templates/web/bromley/report/display.html:128 templates/web/default/admin/bodies.html:9 templates/web/default/admin/body.html:36 templates/web/default/admin/body_edit.html:83 templates/web/default/admin/flagged.html:12 templates/web/default/admin/flagged.html:35 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/reports.html:15 templates/web/default/admin/users.html:13 templates/web/fixmystreet/auth/general.html:20 templates/web/fixmystreet/report/update-form.html:76 templates/web/seesomething/auth/general.html:20 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:14 +#: templates/web/bromley/report/display.html:128 templates/web/default/admin/bodies.html:9 templates/web/default/admin/body.html:36 templates/web/default/admin/body_edit.html:83 templates/web/default/admin/flagged.html:12 templates/web/default/admin/flagged.html:35 templates/web/default/admin/list_updates.html:9 templates/web/default/admin/reports.html:14 templates/web/default/admin/users.html:13 templates/web/fixmystreet/auth/general.html:20 templates/web/fixmystreet/report/update-form.html:76 templates/web/seesomething/auth/general.html:20 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:14 templates/web/zurich/auth/general.html:24 templates/web/zurich/auth/general.html:52 msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1240 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1237 msgid "Email already in abuse list" msgstr "" @@ -649,11 +649,11 @@ msgstr "" msgid "Email me updates" msgstr "" -#: templates/web/default/admin/body.html:80 templates/web/default/admin/body_edit.html:26 templates/web/default/admin/report_edit.html:39 templates/web/default/admin/update_edit.html:27 templates/web/default/admin/user-form.html:6 templates/web/default/alert/updates.html:13 templates/web/default/report/display.html:38 templates/web/zurich/admin/body.html:41 templates/web/zurich/admin/report_edit-sdm.html:31 templates/web/zurich/admin/report_edit.html:51 +#: templates/web/default/admin/body.html:80 templates/web/default/admin/body_edit.html:26 templates/web/default/admin/report_edit.html:42 templates/web/default/admin/update_edit.html:27 templates/web/default/admin/user-form.html:6 templates/web/default/alert/updates.html:13 templates/web/default/report/display.html:38 templates/web/zurich/admin/body.html:41 templates/web/zurich/admin/report_edit-sdm.html:44 templates/web/zurich/admin/report_edit.html:57 msgid "Email:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:301 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 msgid "Email: %s" msgstr "" @@ -717,7 +717,7 @@ msgstr "" msgid "Enter a new password:" msgstr "" -#: templates/web/bromley/report/display.html:150 templates/web/bromley/report/new/fill_in_details_form.html:189 templates/web/fixmystreet/auth/general.html:61 templates/web/fixmystreet/report/new/fill_in_details_form.html:211 templates/web/fixmystreet/report/update-form.html:122 +#: templates/web/bromley/report/display.html:150 templates/web/bromley/report/new/fill_in_details_form.html:189 templates/web/fixmystreet/auth/general.html:61 templates/web/fixmystreet/report/new/fill_in_details_form.html:211 templates/web/fixmystreet/report/update-form.html:122 templates/web/zurich/auth/general.html:63 msgid "Enter a password" msgstr "" @@ -737,7 +737,7 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:51 msgid "Extra data:" msgstr "" @@ -786,15 +786,15 @@ msgid "" "for the county council." msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:84 templates/web/default/admin/index.html:36 templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:28 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:34 templates/web/fixmystreet/report/banner.html:12 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:84 templates/web/default/admin/index.html:36 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:31 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:34 templates/web/fixmystreet/report/banner.html:12 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:32 msgid "Fixed" msgstr "" -#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:32 msgid "Fixed - Council" msgstr "" -#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:32 msgid "Fixed - User" msgstr "" @@ -810,11 +810,11 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 templates/web/default/admin/users.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "" -#: templates/web/default/admin/report_edit.html:50 templates/web/default/admin/user-form.html:14 +#: templates/web/default/admin/report_edit.html:53 templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "" @@ -830,7 +830,7 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -#: templates/web/default/faq/faq-en-gb.html:1 templates/web/emptyhomes/faq/faq-cy.html:1 templates/web/emptyhomes/faq/faq-en-gb.html:1 templates/web/fiksgatami/faq/faq-nb.html:1 templates/web/fiksgatami/nn/faq/faq-nn.html:1 templates/web/fixmybarangay/faq/faq-en-gb.html:1 templates/web/fixmystreet/faq/faq-en-gb.html:1 templates/web/fixmystreet/static/privacy.html:1 templates/web/oxfordshire/faq/faq-en-gb.html:1 templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/default/faq/faq-en-gb.html:1 templates/web/emptyhomes/faq/faq-cy.html:1 templates/web/emptyhomes/faq/faq-en-gb.html:1 templates/web/fiksgatami/faq/faq-nb.html:1 templates/web/fiksgatami/nn/faq/faq-nn.html:1 templates/web/fixmybarangay/faq/faq-en-gb.html:1 templates/web/fixmystreet/faq/faq-en-gb.html:1 templates/web/fixmystreet/static/privacy.html:1 templates/web/oxfordshire/faq/faq-en-gb.html:1 msgid "Frequently Asked Questions" msgstr "" @@ -858,15 +858,15 @@ msgstr "" msgid "Give me an RSS feed" msgstr "" -#: templates/web/default/alert/index.html:34 templates/web/default/around/postcode_form.html:8 templates/web/fixmystreet/around/postcode_form.html:21 templates/web/seesomething/around/postcode_form.html:10 +#: templates/web/default/alert/index.html:34 templates/web/default/around/postcode_form.html:8 templates/web/fixmystreet/around/postcode_form.html:21 templates/web/seesomething/around/postcode_form.html:10 templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "" -#: templates/web/default/admin/report_edit.html:49 +#: templates/web/default/admin/report_edit.html:52 msgid "Going to send questionnaire?" msgstr "" -#: templates/web/default/admin/index.html:24 templates/web/zurich/admin/index.html:11 +#: templates/web/default/admin/index.html:24 msgid "Graph of problem creation by status over time" msgstr "" @@ -882,7 +882,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 templates/web/bromley/header.html:81 templates/web/default/footer.html:15 templates/web/emptyhomes/header.html:33 templates/web/fiksgatami/footer.html:9 templates/web/fiksgatami/nn/footer.html:9 templates/web/fixmybarangay/footer.html:24 templates/web/fixmystreet/footer.html:52 templates/web/oxfordshire/footer.html:27 templates/web/oxfordshire/header.html:75 templates/web/reading/footer.html:10 templates/web/seesomething/footer.html:13 templates/web/stevenage/footer.html:47 templates/web/zurich/footer.html:21 templates/web/zurich/nav_over_content.html:8 +#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 templates/web/bromley/header.html:81 templates/web/default/footer.html:15 templates/web/emptyhomes/header.html:33 templates/web/fiksgatami/footer.html:9 templates/web/fiksgatami/nn/footer.html:9 templates/web/fixmybarangay/footer.html:24 templates/web/fixmystreet/footer.html:52 templates/web/oxfordshire/footer.html:27 templates/web/oxfordshire/header.html:75 templates/web/reading/footer.html:10 templates/web/seesomething/footer.html:13 templates/web/stevenage/footer.html:47 templates/web/zurich/faq/faq-de-ch.html:1 templates/web/zurich/footer.html:21 templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "" @@ -894,7 +894,7 @@ msgstr "" msgid "Hi %s" msgstr "" -#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/report_edit.html:76 templates/web/zurich/admin/report_edit.html:80 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:32 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/report_edit.html:81 templates/web/zurich/admin/report_edit.html:85 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" @@ -922,7 +922,7 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:699 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -938,7 +938,7 @@ msgstr "" msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" msgstr "" -#: templates/web/default/admin/flagged.html:9 templates/web/default/admin/list_updates.html:5 templates/web/default/admin/reports.html:12 templates/web/zurich/admin/index-dm.html:20 templates/web/zurich/admin/index-sdm.html:18 templates/web/zurich/admin/list_updates.html:5 templates/web/zurich/admin/reports.html:12 +#: templates/web/default/admin/flagged.html:9 templates/web/default/admin/list_updates.html:6 templates/web/default/admin/reports.html:11 templates/web/zurich/admin/index-dm.html:21 templates/web/zurich/admin/index-sdm.html:19 templates/web/zurich/admin/list_updates.html:6 templates/web/zurich/admin/reports.html:11 msgid "ID" msgstr "" @@ -962,7 +962,7 @@ msgstr "" msgid "If you submit a report here it will be left on the site, but not reported to the council – please still leave your report, so that we can show to the council the activity in their area." msgstr "" -#: templates/web/default/auth/token.html:25 templates/web/default/email_sent.html:9 +#: templates/web/default/auth/token.html:22 templates/web/default/email_sent.html:9 msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." msgstr "" @@ -989,7 +989,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:28 templates/web/fixmystreet/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 templates/web/zurich/admin/report_edit.html:89 templates/web/zurich/report/banner.html:15 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:78 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:31 templates/web/fixmystreet/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 templates/web/zurich/admin/report_edit.html:94 templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" @@ -997,7 +997,7 @@ msgstr "" msgid "Incident Category" msgstr "" -#: templates/web/zurich/admin/report_edit.html:128 +#: templates/web/zurich/admin/report_edit.html:136 msgid "Include reporter personal details" msgstr "" @@ -1009,7 +1009,7 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:71 +#: templates/web/zurich/admin/report_edit-sdm.html:56 templates/web/zurich/admin/report_edit.html:76 msgid "Internal notes:" msgstr "" @@ -1017,7 +1017,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1051 msgid "Invalid end date" msgstr "" @@ -1025,11 +1025,11 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1001 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 msgid "Invalid start date" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:27 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:143 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:30 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:143 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 msgid "Investigating" msgstr "" @@ -1037,7 +1037,7 @@ msgstr "" msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn’t mean the council isn’t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step." msgstr "" -#: templates/web/bromley/report/display.html:168 templates/web/bromley/report/new/fill_in_details_form.html:209 templates/web/default/auth/general.html:44 templates/web/default/report/new/fill_in_details_form.html:149 templates/web/default/report/update-form.html:104 templates/web/fixmystreet/auth/general.html:46 templates/web/fixmystreet/report/new/fill_in_details_form.html:172 templates/web/fixmystreet/report/update-form.html:100 templates/web/seesomething/auth/general.html:35 +#: templates/web/bromley/report/display.html:168 templates/web/bromley/report/new/fill_in_details_form.html:209 templates/web/default/auth/general.html:44 templates/web/default/report/new/fill_in_details_form.html:149 templates/web/default/report/update-form.html:104 templates/web/fixmystreet/auth/general.html:46 templates/web/fixmystreet/report/new/fill_in_details_form.html:172 templates/web/fixmystreet/report/update-form.html:100 templates/web/seesomething/auth/general.html:35 templates/web/zurich/auth/general.html:39 msgid "Keep me signed in on this computer" msgstr "" @@ -1049,7 +1049,7 @@ msgstr "" msgid "Last editor" msgstr "" -#: templates/web/default/admin/report_edit.html:44 +#: templates/web/default/admin/report_edit.html:47 msgid "Last update:" msgstr "" @@ -1101,6 +1101,10 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "" +#: templates/web/zurich/admin/stats.html:34 +msgid "Moderated by division within one working day" +msgstr "" + #: templates/web/default/admin/stats.html:11 msgid "Month" msgstr "" @@ -1109,7 +1113,7 @@ msgstr "" msgid "More problems nearby" msgstr "" -#: templates/web/default/admin/bodies.html:7 templates/web/default/admin/body-form.html:4 templates/web/default/admin/flagged.html:11 templates/web/default/admin/flagged.html:34 templates/web/default/admin/list_updates.html:7 templates/web/default/admin/reports.html:14 templates/web/default/admin/users.html:12 templates/web/default/reports/index.html:15 templates/web/emptyhomes/reports/index.html:10 templates/web/fiksgatami/nn/reports/index.html:9 templates/web/fiksgatami/reports/index.html:9 templates/web/fixmybarangay/reports/index.html:15 templates/web/fixmystreet/auth/general.html:56 templates/web/fixmystreet/report/new/fill_in_details_form.html:120 templates/web/fixmystreet/report/new/fill_in_details_form.html:187 templates/web/fixmystreet/report/update-form.html:136 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/default/admin/bodies.html:7 templates/web/default/admin/body-form.html:4 templates/web/default/admin/flagged.html:11 templates/web/default/admin/flagged.html:34 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/reports.html:13 templates/web/default/admin/users.html:12 templates/web/default/reports/index.html:15 templates/web/emptyhomes/reports/index.html:10 templates/web/fiksgatami/nn/reports/index.html:9 templates/web/fiksgatami/reports/index.html:9 templates/web/fixmybarangay/reports/index.html:15 templates/web/fixmystreet/auth/general.html:56 templates/web/fixmystreet/report/new/fill_in_details_form.html:120 templates/web/fixmystreet/report/new/fill_in_details_form.html:187 templates/web/fixmystreet/report/update-form.html:136 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/auth/general.html:58 templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "Name" msgstr "" @@ -1117,11 +1121,11 @@ msgstr "" msgid "Name (optional)" msgstr "" -#: templates/web/default/admin/report_edit.html:38 templates/web/default/admin/update_edit.html:26 templates/web/default/admin/user-form.html:5 templates/web/zurich/admin/report_edit-sdm.html:30 templates/web/zurich/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:41 templates/web/default/admin/update_edit.html:26 templates/web/default/admin/user-form.html:5 templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:56 templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Name: %s" msgstr "" @@ -1141,7 +1145,7 @@ msgstr "" msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:266 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1223,7 +1227,7 @@ msgstr "" msgid "New state" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit-sdm.html:59 msgid "New update:" msgstr "" @@ -1231,7 +1235,11 @@ msgstr "" msgid "New!" msgstr "" -#: templates/web/default/admin/body.html:50 templates/web/default/admin/body.html:51 templates/web/default/admin/body.html:52 templates/web/default/admin/body_edit.html:4 templates/web/default/admin/list_updates.html:30 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/problem_row.html:21 templates/web/default/admin/report_edit.html:36 templates/web/default/admin/report_edit.html:49 templates/web/default/admin/update_edit.html:19 templates/web/default/questionnaire/creator_fixed.html:16 templates/web/default/questionnaire/index.html:111 templates/web/default/questionnaire/index.html:68 templates/web/fixmystreet/questionnaire/index.html:101 templates/web/fixmystreet/questionnaire/index.html:62 +#: templates/web/default/pagination.html:13 +msgid "Next" +msgstr "" + +#: templates/web/default/admin/body.html:50 templates/web/default/admin/body.html:51 templates/web/default/admin/body.html:52 templates/web/default/admin/body_edit.html:4 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/list_updates.html:33 templates/web/default/admin/problem_row.html:21 templates/web/default/admin/report_edit.html:39 templates/web/default/admin/report_edit.html:52 templates/web/default/admin/update_edit.html:19 templates/web/default/questionnaire/creator_fixed.html:16 templates/web/default/questionnaire/index.html:111 templates/web/default/questionnaire/index.html:68 templates/web/fixmystreet/questionnaire/index.html:101 templates/web/fixmystreet/questionnaire/index.html:62 msgid "No" msgstr "" @@ -1243,7 +1251,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:414 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "" @@ -1259,7 +1267,7 @@ msgstr "" msgid "No flagged users found" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:52 +#: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" msgstr "" @@ -1275,7 +1283,7 @@ msgstr "" msgid "No result returned" msgstr "" -#: templates/web/default/report/_support.html:3 +#: templates/web/default/report/_support.html:2 templates/web/default/report/_support.html:4 msgid "No supporters" msgstr "" @@ -1283,7 +1291,7 @@ msgstr "" msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:24 templates/web/zurich/admin/report_edit-sdm.html:33 templates/web/zurich/admin/report_edit.html:54 +#: templates/web/default/admin/report_edit.html:24 templates/web/zurich/admin/report_edit-sdm.html:46 templates/web/zurich/admin/report_edit.html:60 msgid "None" msgstr "" @@ -1291,7 +1299,7 @@ msgstr "" msgid "Not Responsible" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:10 +#: templates/web/zurich/admin/report_edit-sdm.html:21 msgid "Not for my subdivision" msgstr "" @@ -1371,7 +1379,7 @@ msgstr "" msgid "Older problems" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:26 templates/web/default/admin/update_edit.html:22 templates/web/default/dashboard/index.html:142 templates/web/default/report/update-form.html:30 templates/web/fixmystreet/report/update-form.html:28 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/report_edit.html:76 templates/web/zurich/admin/report_edit.html:78 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/update_edit.html:22 templates/web/default/dashboard/index.html:142 templates/web/default/report/update-form.html:30 templates/web/fixmystreet/report/update-form.html:28 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/report_edit.html:81 templates/web/zurich/admin/report_edit.html:83 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 msgid "Open" msgstr "" @@ -1399,7 +1407,7 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 perllib/FixMyStreet/App/Controller/Report/New.pm:661 perllib/FixMyStreet/App/Controller/Report/New.pm:662 perllib/FixMyStreet/DB/Result/Problem.pm:591 perllib/FixMyStreet/DB/Result/Problem.pm:601 perllib/FixMyStreet/DB/Result/Problem.pm:611 perllib/FixMyStreet/DB/Result/Problem.pm:623 perllib/FixMyStreet/DB/ResultSet/Problem.pm:343 perllib/FixMyStreet/DB/ResultSet/Problem.pm:356 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 perllib/FixMyStreet/App/Controller/Report/New.pm:661 perllib/FixMyStreet/App/Controller/Report/New.pm:662 perllib/FixMyStreet/DB/Result/Problem.pm:578 perllib/FixMyStreet/DB/Result/Problem.pm:588 perllib/FixMyStreet/DB/Result/Problem.pm:598 perllib/FixMyStreet/DB/Result/Problem.pm:610 perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 msgid "Other" msgstr "" @@ -1407,7 +1415,7 @@ msgstr "" msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." msgstr "" -#: templates/web/default/admin/list_updates.html:11 +#: templates/web/default/admin/list_updates.html:12 msgid "Owner" msgstr "" @@ -1419,11 +1427,11 @@ msgstr "" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:32 msgid "Partial" msgstr "" -#: templates/web/bromley/report/display.html:147 templates/web/bromley/report/new/fill_in_details_form.html:186 templates/web/fixmystreet/auth/general.html:59 templates/web/fixmystreet/report/new/fill_in_details_form.html:208 templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/bromley/report/display.html:147 templates/web/bromley/report/new/fill_in_details_form.html:186 templates/web/fixmystreet/auth/general.html:59 templates/web/fixmystreet/report/new/fill_in_details_form.html:208 templates/web/fixmystreet/report/update-form.html:119 templates/web/zurich/auth/general.html:32 templates/web/zurich/auth/general.html:61 msgid "Password (optional)" msgstr "" @@ -1435,11 +1443,11 @@ msgstr "" msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:265 templates/web/default/admin/report_edit.html:40 templates/web/default/report/new/fill_in_details_form.html:215 templates/web/emptyhomes/report/new/fill_in_details_form.html:138 templates/web/zurich/admin/report_edit-sdm.html:33 templates/web/zurich/admin/report_edit.html:54 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 templates/web/default/admin/report_edit.html:43 templates/web/default/report/new/fill_in_details_form.html:215 templates/web/emptyhomes/report/new/fill_in_details_form.html:138 templates/web/zurich/admin/report_edit-sdm.html:46 templates/web/zurich/admin/report_edit.html:60 templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "" -#: templates/web/bromley/report/display.html:111 templates/web/bromley/report/new/fill_in_details_form.html:104 templates/web/fixmystreet/report/new/fill_in_details_form.html:92 templates/web/fixmystreet/report/update-form.html:59 templates/web/seesomething/report/new/fill_in_details_form.html:52 templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/bromley/report/display.html:111 templates/web/bromley/report/new/fill_in_details_form.html:104 templates/web/fixmystreet/report/new/fill_in_details_form.html:92 templates/web/fixmystreet/report/update-form.html:59 templates/web/seesomething/report/new/fill_in_details_form.html:52 templates/web/zurich/admin/stats.html:37 templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" msgstr "" @@ -1455,7 +1463,7 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:27 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:143 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 templates/web/zurich/admin/report_edit.html:76 templates/web/zurich/admin/report_edit.html:79 +#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:30 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:143 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 templates/web/zurich/admin/report_edit.html:81 templates/web/zurich/admin/report_edit.html:84 msgid "Planned" msgstr "" @@ -1471,19 +1479,19 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/default/auth/token.html:17 +#: templates/web/default/auth/token.html:14 msgid "Please check your email" msgstr "" -#: templates/web/default/auth/general.html:14 templates/web/default/auth/general.html:8 templates/web/fixmystreet/auth/general.html:15 templates/web/fixmystreet/auth/general.html:9 templates/web/seesomething/auth/general.html:15 templates/web/seesomething/auth/general.html:9 +#: templates/web/default/auth/general.html:14 templates/web/default/auth/general.html:8 templates/web/fixmystreet/auth/general.html:15 templates/web/fixmystreet/auth/general.html:9 templates/web/seesomething/auth/general.html:15 templates/web/seesomething/auth/general.html:9 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 perllib/FixMyStreet/App/Controller/Report/New.pm:852 perllib/FixMyStreet/App/Controller/Report/New.pm:871 perllib/FixMyStreet/App/Controller/Report/New.pm:914 perllib/FixMyStreet/DB/Result/Problem.pm:433 templates/web/default/js/translation_strings.html:9 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 perllib/FixMyStreet/App/Controller/Report/New.pm:852 perllib/FixMyStreet/App/Controller/Report/New.pm:871 perllib/FixMyStreet/App/Controller/Report/New.pm:914 perllib/FixMyStreet/DB/Result/Problem.pm:420 templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:439 +#: perllib/FixMyStreet/DB/Result/Problem.pm:426 msgid "Please choose a property type" msgstr "" @@ -1514,7 +1522,7 @@ msgstr "" msgid "Please do not give address or personal information in this section." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:147 templates/web/default/js/translation_strings.html:2 +#: perllib/FixMyStreet/DB/Result/Comment.pm:145 templates/web/default/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" @@ -1522,7 +1530,7 @@ msgstr "" msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:408 templates/web/default/js/translation_strings.html:3 +#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:395 templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" @@ -1534,11 +1542,11 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:411 templates/web/default/js/translation_strings.html:4 templates/web/seesomething/js/translation_strings.html:2 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 templates/web/default/js/translation_strings.html:4 templates/web/seesomething/js/translation_strings.html:2 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:96 perllib/FixMyStreet/DB/Result/User.pm:112 templates/web/default/auth/general.html:13 templates/web/default/auth/general.html:8 templates/web/default/js/translation_strings.html:11 templates/web/default/js/translation_strings.html:15 templates/web/fixmystreet/auth/general.html:14 templates/web/fixmystreet/auth/general.html:9 templates/web/seesomething/auth/general.html:14 templates/web/seesomething/auth/general.html:9 templates/web/seesomething/js/translation_strings.html:9 +#: perllib/FixMyStreet/App/Controller/Contact.pm:96 perllib/FixMyStreet/DB/Result/User.pm:112 templates/web/default/auth/general.html:13 templates/web/default/auth/general.html:8 templates/web/default/js/translation_strings.html:11 templates/web/default/js/translation_strings.html:15 templates/web/fixmystreet/auth/general.html:14 templates/web/fixmystreet/auth/general.html:9 templates/web/seesomething/auth/general.html:14 templates/web/seesomething/auth/general.html:9 templates/web/seesomething/js/translation_strings.html:9 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "" @@ -1550,11 +1558,11 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 templates/web/default/js/translation_strings.html:7 templates/web/seesomething/js/translation_strings.html:4 +#: perllib/FixMyStreet/DB/Result/Problem.pm:413 templates/web/default/js/translation_strings.html:7 templates/web/seesomething/js/translation_strings.html:4 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:95 perllib/FixMyStreet/DB/Result/Comment.pm:144 perllib/FixMyStreet/DB/Result/Problem.pm:419 perllib/FixMyStreet/DB/Result/User.pm:108 templates/web/default/js/translation_strings.html:6 +#: perllib/FixMyStreet/App/Controller/Contact.pm:95 perllib/FixMyStreet/DB/Result/Comment.pm:142 perllib/FixMyStreet/DB/Result/Problem.pm:406 perllib/FixMyStreet/DB/Result/User.pm:108 templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -1691,7 +1699,11 @@ msgstr "" msgid "Posted by %s at %s" msgstr "" -#: templates/web/default/admin/body.html:97 templates/web/default/admin/body_edit.html:40 templates/web/default/admin/report_edit.html:51 +#: templates/web/default/pagination.html:7 +msgid "Previous" +msgstr "" + +#: templates/web/default/admin/body.html:97 templates/web/default/admin/body_edit.html:40 templates/web/default/admin/report_edit.html:54 msgid "Private" msgstr "" @@ -1715,11 +1727,11 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/default/admin/index.html:28 templates/web/zurich/admin/index.html:15 +#: templates/web/default/admin/index.html:28 templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:916 msgid "Problem marked as open." msgstr "" @@ -1771,7 +1783,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 +#: templates/web/default/admin/report_edit.html:26 templates/web/emptyhomes/report/new/fill_in_details_form.html:115 msgid "Property address:" msgstr "" @@ -1803,15 +1815,15 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:160 +#: templates/web/zurich/admin/report_edit.html:168 templates/web/zurich/admin/report_edit.html:176 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:67 +#: templates/web/zurich/admin/report_edit.html:72 templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:170 +#: templates/web/zurich/admin/report_edit.html:184 msgid "Publish the response" msgstr "" @@ -1907,7 +1919,7 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:62 templates/web/default/admin/update_edit.html:51 templates/web/zurich/admin/update_edit.html:35 +#: templates/web/default/admin/report_edit.html:64 templates/web/default/admin/update_edit.html:51 templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" @@ -1947,7 +1959,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:606 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:46 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" msgstr "" @@ -1955,23 +1967,23 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported by %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 templates/web/default/contact/index.html:47 templates/web/fixmystreet/contact/index.html:48 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 templates/web/default/contact/index.html:47 templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:620 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported by %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:594 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported by %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:601 msgid "Reported by %s in the %s category by %s at %s" msgstr "" @@ -1979,11 +1991,11 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:589 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 msgid "Reported in the %s category by %s at %s" msgstr "" @@ -1991,11 +2003,11 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1092 perllib/FixMyStreet/Cobrand/Zurich.pm:137 templates/web/seesomething/admin/stats.html:1 templates/web/zurich/header.html:59 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 perllib/FixMyStreet/Cobrand/Zurich.pm:197 templates/web/seesomething/admin/stats.html:1 templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:445 +#: perllib/FixMyStreet/DB/Result/Problem.pm:432 msgid "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" @@ -2011,7 +2023,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:46 msgid "Resend report" msgstr "" @@ -2027,11 +2039,11 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: templates/web/default/admin/report_edit.html:58 templates/web/zurich/admin/report_edit.html:63 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 perllib/FixMyStreet/App/Controller/Admin.pm:1342 templates/web/default/admin/report_edit.html:60 templates/web/zurich/admin/report_edit.html:68 msgid "Rotate Left" msgstr "" -#: templates/web/default/admin/report_edit.html:59 templates/web/zurich/admin/report_edit.html:64 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 templates/web/default/admin/report_edit.html:61 templates/web/zurich/admin/report_edit.html:69 msgid "Rotate Right" msgstr "" @@ -2047,7 +2059,7 @@ msgstr "" msgid "Search Users" msgstr "" -#: templates/web/zurich/header.html:73 +#: templates/web/zurich/header.html:77 msgid "Search reports" msgstr "" @@ -2067,15 +2079,15 @@ msgstr "" msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:46 msgid "Sent:" msgstr "" -#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:48 templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "" @@ -2112,7 +2124,7 @@ msgstr "" msgid "Show pins" msgstr "" -#: templates/web/default/auth/general.html:3 templates/web/default/auth/general.html:49 templates/web/fixmybarangay/header.html:70 templates/web/fixmystreet/auth/general.html:3 templates/web/fixmystreet/auth/general.html:42 templates/web/fixmystreet/auth/general.html:62 templates/web/fixmystreet/header.html:54 templates/web/oxfordshire/header.html:115 templates/web/seesomething/auth/general.html:3 templates/web/seesomething/auth/general.html:39 templates/web/stevenage/header.html:101 +#: templates/web/default/auth/general.html:3 templates/web/default/auth/general.html:49 templates/web/fixmybarangay/header.html:70 templates/web/fixmystreet/auth/general.html:3 templates/web/fixmystreet/auth/general.html:42 templates/web/fixmystreet/auth/general.html:62 templates/web/fixmystreet/header.html:54 templates/web/oxfordshire/header.html:115 templates/web/seesomething/auth/general.html:3 templates/web/seesomething/auth/general.html:39 templates/web/stevenage/header.html:101 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35 msgid "Sign in" msgstr "" @@ -2120,7 +2132,7 @@ msgstr "" msgid "Sign in by email" msgstr "" -#: templates/web/default/auth/general.html:1 templates/web/fixmystreet/auth/general.html:1 templates/web/seesomething/auth/general.html:1 +#: templates/web/default/auth/general.html:1 templates/web/fixmystreet/auth/general.html:1 templates/web/seesomething/auth/general.html:1 templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "" @@ -2176,19 +2188,19 @@ msgstr "" msgid "Start month:" msgstr "" -#: templates/web/bromley/report/display.html:78 templates/web/default/admin/flagged.html:18 templates/web/default/admin/list_updates.html:6 templates/web/default/admin/reports.html:21 templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/bromley/report/display.html:78 templates/web/default/admin/flagged.html:18 templates/web/default/admin/list_updates.html:7 templates/web/default/admin/reports.html:20 templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "" -#: templates/web/default/admin/report_edit.html:25 templates/web/default/admin/update_edit.html:21 templates/web/default/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:41 templates/web/zurich/admin/report_edit.html:74 templates/web/zurich/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:28 templates/web/default/admin/update_edit.html:21 templates/web/default/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:54 templates/web/zurich/admin/report_edit.html:79 templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1097 templates/web/default/admin/stats.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 perllib/FixMyStreet/Cobrand/Zurich.pm:212 templates/web/default/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" msgstr "" -#: templates/web/zurich/admin/index-dm.html:25 templates/web/zurich/admin/index-sdm.html:23 templates/web/zurich/admin/reports.html:17 +#: templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 msgid "Status" msgstr "" @@ -2196,7 +2208,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:352 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 msgid "Subcategory: %s" msgstr "" @@ -2208,7 +2220,7 @@ msgstr "" msgid "Subject" msgstr "" -#: templates/web/default/admin/report_edit.html:13 templates/web/default/contact/index.html:83 templates/web/default/report/new/fill_in_details_form.html:52 templates/web/emptyhomes/report/new/fill_in_details_form.html:70 templates/web/zurich/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:13 templates/web/default/contact/index.html:83 templates/web/default/report/new/fill_in_details_form.html:52 templates/web/emptyhomes/report/new/fill_in_details_form.html:70 templates/web/zurich/admin/report_edit.html:34 msgid "Subject:" msgstr "" @@ -2216,7 +2228,7 @@ msgstr "" msgid "Submit" msgstr "" -#: templates/web/default/admin/report_edit.html:65 templates/web/default/admin/update_edit.html:54 templates/web/default/admin/user-form.html:17 templates/web/zurich/admin/report_edit-sdm.html:51 templates/web/zurich/admin/report_edit.html:172 templates/web/zurich/admin/update_edit.html:38 +#: templates/web/default/admin/report_edit.html:67 templates/web/default/admin/update_edit.html:54 templates/web/default/admin/user-form.html:17 templates/web/zurich/admin/report_edit-sdm.html:64 templates/web/zurich/admin/report_edit.html:186 templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -2224,7 +2236,7 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:6 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-dm.html:6 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/report_edit.html:76 templates/web/zurich/admin/report_edit.html:77 templates/web/zurich/admin/reports.html:15 templates/web/zurich/report/banner.html:9 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:6 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-dm.html:6 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/report_edit.html:81 templates/web/zurich/admin/report_edit.html:82 templates/web/zurich/admin/reports.html:13 templates/web/zurich/report/banner.html:9 msgid "Submitted" msgstr "" @@ -2240,7 +2252,7 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 perllib/FixMyStreet/Cobrand/Zurich.pm:136 templates/web/default/admin/index.html:1 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/header.html:56 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 perllib/FixMyStreet/Cobrand/Zurich.pm:196 templates/web/default/admin/index.html:1 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:57 msgid "Summary" msgstr "" @@ -2248,7 +2260,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1094 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Survey" msgstr "" @@ -2256,7 +2268,7 @@ msgstr "" msgid "Survey Results" msgstr "" -#: templates/web/default/admin/list_updates.html:14 templates/web/zurich/admin/list_updates.html:7 +#: templates/web/default/admin/list_updates.html:15 templates/web/zurich/admin/list_updates.html:8 msgid "Text" msgstr "" @@ -2312,7 +2324,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:121 +#: perllib/FixMyStreet/App/Controller/Location.pm:123 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2320,7 +2332,7 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:642 +#: perllib/FixMyStreet/App/Controller/Admin.pm:670 msgid "That problem will now be resent." msgstr "" @@ -2351,7 +2363,7 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/default/auth/token.html:22 templates/web/default/email_sent.html:6 +#: templates/web/default/auth/token.html:19 templates/web/default/email_sent.html:6 msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" @@ -2439,7 +2451,7 @@ msgstr "" msgid "The subject and details of the problem will be public, plus your name if you give us permission." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:274 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -2451,7 +2463,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 perllib/FixMyStreet/App/Controller/Report/Update.pm:134 templates/web/default/auth/general.html:23 templates/web/fixmystreet/auth/general.html:24 templates/web/seesomething/auth/general.html:24 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 perllib/FixMyStreet/App/Controller/Report/Update.pm:134 templates/web/default/auth/general.html:23 templates/web/fixmystreet/auth/general.html:24 templates/web/seesomething/auth/general.html:24 templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -2475,11 +2487,11 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" @@ -2499,6 +2511,10 @@ msgstr "" msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." msgstr "" +#: templates/web/default/auth/token.html:9 +msgid "This may be because the link is too old or already used, or the address was not copied correctly." +msgstr "" + #: templates/web/default/report/banner.html:15 msgid "This problem has been closed" msgstr "" @@ -2519,7 +2535,7 @@ msgstr "" msgid "This problem is old and of unknown status." msgstr "" -#: templates/web/zurich/report/_main.html:14 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:65 perllib/FixMyStreet/Cobrand/Zurich.pm:66 templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -2535,19 +2551,19 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:298 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 templates/web/default/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" -#: templates/web/default/admin/flagged.html:10 templates/web/default/admin/reports.html:13 +#: templates/web/default/admin/flagged.html:10 templates/web/default/admin/reports.html:12 msgid "Title" msgstr "" @@ -2559,11 +2575,11 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:273 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/default/admin/index.html:36 templates/web/default/admin/questionnaire.html:24 templates/web/default/admin/stats.html:24 templates/web/default/admin/stats.html:43 +#: templates/web/default/admin/index.html:36 templates/web/default/admin/questionnaire.html:24 templates/web/default/admin/stats.html:24 templates/web/default/admin/stats.html:43 templates/web/zurich/admin/stats.html:30 msgid "Total" msgstr "" @@ -2579,7 +2595,7 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:32 templates/web/zurich/admin/report_edit.html:52 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:32 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:45 templates/web/zurich/admin/report_edit.html:58 templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "" @@ -2647,19 +2663,19 @@ msgstr "" msgid "Update:" msgstr "" -#: templates/web/zurich/admin/index-dm.html:24 templates/web/zurich/admin/index-sdm.html:22 templates/web/zurich/admin/reports.html:16 +#: templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:734 perllib/FixMyStreet/App/Controller/Admin.pm:868 perllib/FixMyStreet/App/Controller/Admin.pm:919 perllib/FixMyStreet/App/Controller/Admin.pm:958 perllib/FixMyStreet/Cobrand/Zurich.pm:326 perllib/FixMyStreet/Cobrand/Zurich.pm:381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:762 perllib/FixMyStreet/App/Controller/Admin.pm:906 perllib/FixMyStreet/App/Controller/Admin.pm:959 perllib/FixMyStreet/App/Controller/Admin.pm:998 perllib/FixMyStreet/Cobrand/Zurich.pm:423 perllib/FixMyStreet/Cobrand/Zurich.pm:487 msgid "Updated!" msgstr "" -#: templates/web/default/admin/list_updates.html:1 templates/web/default/report/update.html:3 templates/web/fixmystreet/report/update.html:3 templates/web/zurich/admin/list_updates.html:1 templates/web/zurich/report/updates.html:2 +#: templates/web/default/admin/list_updates.html:2 templates/web/default/report/update.html:3 templates/web/fixmystreet/report/update.html:3 templates/web/zurich/admin/list_updates.html:2 templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:152 +#: perllib/FixMyStreet/DB/Result/Comment.pm:150 msgid "Updates are limited to 2000 characters in length. Please shorten your update" msgstr "" @@ -2671,15 +2687,15 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1256 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1296 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1228 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1268 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1095 perllib/FixMyStreet/Cobrand/Zurich.pm:151 templates/web/default/admin/flagged.html:30 templates/web/zurich/header.html:68 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 perllib/FixMyStreet/Cobrand/Zurich.pm:211 templates/web/default/admin/flagged.html:30 templates/web/zurich/header.html:69 msgid "Users" msgstr "" @@ -2687,7 +2703,7 @@ msgstr "" msgid "Values updated" msgstr "" -#: templates/web/default/admin/report_edit.html:12 templates/web/default/admin/update_edit.html:12 templates/web/zurich/admin/report_edit-sdm.html:13 templates/web/zurich/admin/report_edit.html:19 templates/web/zurich/admin/update_edit.html:10 +#: templates/web/default/admin/report_edit.html:12 templates/web/default/admin/update_edit.html:12 templates/web/zurich/admin/report_edit-sdm.html:24 templates/web/zurich/admin/report_edit.html:22 templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "" @@ -2715,7 +2731,11 @@ msgstr "" 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 "" -#: templates/web/default/auth/token.html:19 +#: templates/web/default/auth/token.html:8 +msgid "We have not been able to confirm your account - sorry." +msgstr "" + +#: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." msgstr "" @@ -2731,7 +2751,7 @@ msgstr "" msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -2759,7 +2779,7 @@ msgstr "" msgid "When edited" msgstr "" -#: templates/web/default/admin/flagged.html:19 templates/web/default/admin/reports.html:22 +#: templates/web/default/admin/flagged.html:19 templates/web/default/admin/reports.html:21 msgid "When sent" msgstr "" @@ -2791,7 +2811,7 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/default/admin/body.html:50 templates/web/default/admin/body.html:51 templates/web/default/admin/body.html:52 templates/web/default/admin/body_edit.html:5 templates/web/default/admin/list_updates.html:30 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/problem_row.html:21 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:49 templates/web/default/admin/update_edit.html:18 templates/web/default/admin/users.html:26 templates/web/default/questionnaire/creator_fixed.html:14 templates/web/default/questionnaire/index.html:109 templates/web/default/questionnaire/index.html:66 templates/web/fixmystreet/questionnaire/index.html:60 templates/web/fixmystreet/questionnaire/index.html:99 +#: templates/web/default/admin/body.html:50 templates/web/default/admin/body.html:51 templates/web/default/admin/body.html:52 templates/web/default/admin/body_edit.html:5 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/list_updates.html:33 templates/web/default/admin/problem_row.html:21 templates/web/default/admin/report_edit.html:38 templates/web/default/admin/report_edit.html:52 templates/web/default/admin/update_edit.html:18 templates/web/default/admin/users.html:26 templates/web/default/questionnaire/creator_fixed.html:14 templates/web/default/questionnaire/index.html:109 templates/web/default/questionnaire/index.html:66 templates/web/fixmystreet/questionnaire/index.html:60 templates/web/fixmystreet/questionnaire/index.html:99 msgid "Yes" msgstr "" @@ -2871,7 +2891,7 @@ msgstr "" msgid "You must now click the link in the email we've just sent you." msgstr "" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:46 msgid "You really want to resend?" msgstr "" @@ -2887,7 +2907,7 @@ msgstr "" msgid "Your email (optional)" msgstr "" -#: templates/web/bromley/report/display.html:132 templates/web/fixmystreet/auth/general.html:26 templates/web/fixmystreet/report/update-form.html:80 templates/web/seesomething/auth/general.html:26 +#: templates/web/bromley/report/display.html:132 templates/web/fixmystreet/auth/general.html:26 templates/web/fixmystreet/report/update-form.html:80 templates/web/seesomething/auth/general.html:26 templates/web/zurich/auth/general.html:30 templates/web/zurich/auth/general.html:56 msgid "Your email address" msgstr "" @@ -2911,7 +2931,7 @@ msgstr "" msgid "Your last name" msgstr "" -#: templates/web/fixmystreet/auth/general.html:57 templates/web/fixmystreet/contact/index.html:65 templates/web/fixmystreet/report/new/fill_in_details_form.html:124 templates/web/fixmystreet/report/new/fill_in_details_form.html:192 templates/web/fixmystreet/report/update-form.html:140 templates/web/seesomething/report/new/fill_in_details_form.html:79 templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/fixmystreet/auth/general.html:57 templates/web/fixmystreet/contact/index.html:65 templates/web/fixmystreet/report/new/fill_in_details_form.html:124 templates/web/fixmystreet/report/new/fill_in_details_form.html:192 templates/web/fixmystreet/report/update-form.html:140 templates/web/seesomething/report/new/fill_in_details_form.html:79 templates/web/zurich/auth/general.html:59 templates/web/zurich/report/new/fill_in_details_form.html:104 msgid "Your name" msgstr "" @@ -2919,7 +2939,7 @@ msgstr "" msgid "Your name:" msgstr "" -#: templates/web/bromley/report/display.html:162 templates/web/bromley/report/new/fill_in_details_form.html:203 templates/web/fixmystreet/auth/general.html:41 templates/web/fixmystreet/report/new/fill_in_details_form.html:166 templates/web/fixmystreet/report/update-form.html:94 templates/web/seesomething/auth/general.html:30 +#: templates/web/bromley/report/display.html:162 templates/web/bromley/report/new/fill_in_details_form.html:203 templates/web/fixmystreet/auth/general.html:41 templates/web/fixmystreet/report/new/fill_in_details_form.html:166 templates/web/fixmystreet/report/update-form.html:94 templates/web/seesomething/auth/general.html:30 templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "" @@ -2959,15 +2979,15 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:197 +#: perllib/FixMyStreet/DB/Result/Comment.pm:195 msgid "duplicate report" msgstr "" @@ -2979,11 +2999,15 @@ msgstr "" msgid "from %d different users" msgstr "" -#: perllib/Utils.pm:268 +#: templates/web/fixmystreet/report/_item.html:12 templates/web/zurich/report/_item.html:16 +msgid "last updated %s" +msgstr "" + +#: perllib/Utils.pm:263 msgid "less than a minute" msgstr "" -#: templates/web/default/report/updates.html:37 +#: templates/web/default/report/updates.html:38 msgid "marked as %s" msgstr "" @@ -2999,7 +3023,7 @@ msgstr "" msgid "no further action" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 +#: perllib/FixMyStreet/DB/Result/Comment.pm:193 msgid "not the council's responsibility" msgstr "" @@ -3011,7 +3035,7 @@ msgstr "" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/zurich/admin/report_edit-sdm.html:16 templates/web/zurich/admin/report_edit-sdm.html:18 templates/web/zurich/admin/report_edit-sdm.html:23 templates/web/zurich/admin/report_edit-sdm.html:25 templates/web/zurich/admin/report_edit.html:24 templates/web/zurich/admin/report_edit.html:26 templates/web/zurich/admin/report_edit.html:35 templates/web/zurich/admin/report_edit.html:37 templates/web/zurich/admin/report_edit.html:44 templates/web/zurich/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/report_edit-sdm.html:29 templates/web/zurich/admin/report_edit-sdm.html:36 templates/web/zurich/admin/report_edit-sdm.html:38 templates/web/zurich/admin/report_edit.html:27 templates/web/zurich/admin/report_edit.html:29 templates/web/zurich/admin/report_edit.html:38 templates/web/zurich/admin/report_edit.html:40 templates/web/zurich/admin/report_edit.html:50 templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" @@ -3019,7 +3043,7 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/default/report/updates.html:28 templates/web/default/report/updates.html:35 +#: templates/web/default/report/updates.html:28 templates/web/default/report/updates.html:36 msgid "reopened" msgstr "" @@ -3035,15 +3059,19 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 +#: templates/web/default/report/updates.html:33 +msgid "third party responsibility" +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:240 +#: perllib/Utils.pm:235 msgid "today" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:22 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:54 msgid "used map" msgstr "" @@ -3066,14 +3094,21 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:287 +#: perllib/Utils.pm:282 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:289 +#: templates/web/default/report/_support.html:6 +#, perl-format +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "" +msgstr[1] "" + +#: perllib/Utils.pm:284 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -3094,7 +3129,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:283 +#: perllib/Utils.pm:278 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -3122,7 +3157,7 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:285 +#: perllib/Utils.pm:280 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index f9b98d01a..1f4b4ab5d 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-02-13 11:17+0000\n" +"POT-Creation-Date: 2013-03-11 18:53+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" @@ -20,8 +20,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:649 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:355 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 msgid " and " msgstr "" @@ -70,8 +70,8 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "" -#: templates/web/default/report/_support.html:3 -msgid "%d supporters" +#: templates/web/default/pagination.html:10 +msgid "%d to %d of %d" msgstr "" #: templates/web/default/reports/body.html:0 @@ -79,7 +79,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s - Adroddiadau cryno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:698 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "" @@ -87,7 +87,7 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 #, fuzzy msgid "%s, reported at %s" msgstr "Adroddwyd am %s gan %s am %s" @@ -137,15 +137,15 @@ msgstr "(fel arall, gellir addasu'r porthiant RSS yn bersonol, o fewn" #: templates/web/default/around/around_map_list_items.html:12 #: templates/web/default/around/on_map_list_items.html:9 -#: templates/web/fixmystreet/report/_item.html:20 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/fixmystreet/report/_item.html:22 +#: templates/web/zurich/report/_item.html:21 msgid "(closed)" msgstr "" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 -#: templates/web/fixmystreet/report/_item.html:18 -#: templates/web/zurich/report/_item.html:17 +#: templates/web/fixmystreet/report/_item.html:20 +#: templates/web/zurich/report/_item.html:19 msgid "(returned to use)" msgstr "(wedi'i adfer i'w ddefnyddio)" @@ -155,7 +155,7 @@ msgid " " msgstr " " #: templates/web/default/reports/_list-entry.html:4 -#: templates/web/fixmystreet/report/_item.html:14 +#: templates/web/fixmystreet/report/_item.html:16 #, fuzzy msgid "(not sent to council)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -167,7 +167,7 @@ msgid "(optional)" msgstr "(dewisol)" #: templates/web/default/reports/_list-entry.html:2 -#: templates/web/fixmystreet/report/_item.html:13 +#: templates/web/fixmystreet/report/_item.html:15 #, fuzzy msgid "(sent to both)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -183,20 +183,16 @@ msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" #: perllib/FixMyStreet/App/Controller/Report/New.pm:634 #: perllib/FixMyStreet/App/Controller/Report/New.pm:661 -#: perllib/FixMyStreet/DB/Result/Problem.pm:431 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 #, fuzzy msgid "-- Pick a category --" msgstr "-- Dewiswch fath o eiddo --" #: perllib/FixMyStreet/App/Controller/Report/New.pm:615 -#: perllib/FixMyStreet/DB/Result/Problem.pm:437 +#: perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" -#: templates/web/default/report/_support.html:3 -msgid "1 supporter" -msgstr "" - #: templates/web/default/questionnaire/completed.html:20 #, fuzzy msgid "" @@ -376,6 +372,7 @@ msgid "<strong>No</strong> Let me confirm my update by email" msgstr "Adrodd am eiddo gwag a gweld y rhain" #: templates/web/fixmystreet/auth/general.html:50 +#: templates/web/zurich/auth/general.html:49 #, fuzzy msgid "<strong>No</strong> let me sign in by email" msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -433,7 +430,7 @@ msgstr "" msgid "Add new category" msgstr "" -#: templates/web/default/admin/users.html:35 +#: templates/web/default/admin/users.html:36 msgid "Add user" msgstr "" @@ -461,6 +458,7 @@ msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol" #: templates/web/default/reports/index.html:3 #: templates/web/fixmybarangay/reports/index.html:3 +#: templates/web/zurich/admin/stats.html:5 #: templates/web/zurich/reports/index.html:15 #, fuzzy msgid "All Reports" @@ -477,6 +475,7 @@ msgstr "Adroddiadau" #: templates/web/oxfordshire/header.html:67 #: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 #: templates/web/zurich/admin/index-dm.html:12 +#: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 #: templates/web/zurich/nav_over_content.html:6 #, fuzzy @@ -484,6 +483,7 @@ msgid "All reports" msgstr "Adroddiadau" #: templates/web/default/admin/stats.html:5 +#: templates/web/zurich/admin/stats.html:8 #, fuzzy msgid "All reports between %s and %s" msgstr "Adroddwyd am %s gan %s am %s" @@ -541,12 +541,12 @@ msgstr "" "ddefnyddio." #: templates/web/default/admin/flagged.html:15 -#: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/reports.html:18 +#: templates/web/default/admin/list_updates.html:11 +#: templates/web/default/admin/reports.html:17 msgid "Anonymous" msgstr "Di-enw" -#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/admin/update_edit.html:17 #, fuzzy msgid "Anonymous:" @@ -574,19 +574,21 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:109 +#: templates/web/zurich/admin/report_edit.html:117 +#: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/report_edit.html:126 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:150 -#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/report_edit.html:103 +#: templates/web/zurich/admin/report_edit.html:158 msgid "Assign to subdivision:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:98 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -602,8 +604,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:386 -#: templates/web/zurich/report/_item.html:9 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" @@ -622,14 +624,14 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:204 #: templates/web/default/admin/bodies.html:1 -#: templates/web/zurich/header.html:63 +#: templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" -#: templates/web/default/admin/reports.html:16 +#: templates/web/default/admin/reports.html:15 #: templates/web/default/admin/users.html:14 msgid "Body" msgstr "" @@ -662,15 +664,16 @@ msgstr "" #: templates/web/default/admin/body.html:35 #: templates/web/default/admin/flagged.html:14 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/reports.html:17 +#: templates/web/default/admin/reports.html:16 #: templates/web/default/report/new/category.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 #: templates/web/seesomething/report/new/category.html:6 #: templates/web/southampton/report/new/category.html:3 #: templates/web/zurich/admin/body.html:13 -#: templates/web/zurich/admin/index-dm.html:22 -#: templates/web/zurich/admin/index-sdm.html:20 -#: templates/web/zurich/admin/reports.html:14 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/stats.html:50 #: templates/web/zurich/report/new/fill_in_details_form.html:50 #, fuzzy msgid "Category" @@ -682,16 +685,16 @@ msgstr "" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/report_edit.html:36 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 -#: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit.html:108 +#: templates/web/zurich/admin/report_edit-sdm.html:42 +#: templates/web/zurich/admin/report_edit.html:116 msgid "Category:" msgstr "Categori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:348 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 #, fuzzy msgid "Category: %s" msgstr "Categori:" @@ -708,21 +711,23 @@ msgstr "" msgid "Click map to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:28 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:75 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/fixmystreet/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:85 -#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:90 +#: templates/web/zurich/admin/report_edit.html:92 +#: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:791 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 #, fuzzy msgid "Closed by council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -742,23 +747,23 @@ msgid "Closest nearby empty properties <small>(within %skm)</small>" msgstr "Yr eiddo gwag cyfagos agosaf <small>(within %skm)</small>" #: templates/web/default/admin/report_edit.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:46 msgid "Co-ordinates:" msgstr "" #: templates/web/default/admin/flagged.html:16 -#: templates/web/default/admin/list_updates.html:13 -#: templates/web/default/admin/reports.html:19 +#: templates/web/default/admin/list_updates.html:14 +#: templates/web/default/admin/reports.html:18 msgid "Cobrand" msgstr "" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:50 #: templates/web/default/admin/update_edit.html:44 msgid "Cobrand data:" msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:49 #: templates/web/default/admin/update_edit.html:43 msgid "Cobrand:" msgstr "" @@ -807,6 +812,7 @@ msgstr "Cadarnhau" #: templates/web/default/admin/body.html:85 #: templates/web/default/admin/body_edit.html:32 #: templates/web/default/admin/body_edit.html:84 +#: templates/web/zurich/admin/stats.html:40 #, fuzzy msgid "Confirmed" msgstr "Cadarnhau" @@ -817,7 +823,7 @@ msgid "Confirmed reports between %s and %s" msgstr "Adroddwyd am %s gan %s am %s" #: templates/web/default/admin/problem_row.html:25 -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:45 #, fuzzy msgid "Confirmed:" msgstr "Cadarnhau" @@ -848,8 +854,8 @@ msgstr "Cysylltwch â Ni" msgid "Contact the team" msgstr "Cysylltu â'r tîm" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1224 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1252 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 msgid "Could not find user" msgstr "" @@ -858,7 +864,7 @@ msgid "Could not look up location" msgstr "" #: templates/web/default/admin/flagged.html:13 -#: templates/web/default/admin/list_updates.html:12 +#: templates/web/default/admin/list_updates.html:13 #, fuzzy msgid "Council" msgstr "cyngor" @@ -876,6 +882,8 @@ msgstr "cyngor" #: templates/web/default/admin/stats.html:12 #: templates/web/default/admin/stats.html:32 +#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats.html:50 #, fuzzy msgid "Count" msgstr "Cysylltu" @@ -892,16 +900,16 @@ msgid "Create category" msgstr "Categori:" #: templates/web/default/admin/flagged.html:17 -#: templates/web/default/admin/list_updates.html:9 -#: templates/web/default/admin/reports.html:20 -#: templates/web/zurich/admin/list_updates.html:6 +#: templates/web/default/admin/list_updates.html:10 +#: templates/web/default/admin/reports.html:19 +#: templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:44 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:34 -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit-sdm.html:47 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -915,6 +923,10 @@ msgstr "" msgid "Dashboard" msgstr "" +#: templates/web/zurich/admin/stats.html:35 +msgid "Dealt with by subdivision within 5 working days" +msgstr "" + #: templates/web/default/admin/body.html:38 #: templates/web/default/admin/body.html:88 #: templates/web/default/admin/body_edit.html:37 @@ -922,9 +934,9 @@ msgstr "" msgid "Deleted" msgstr "" -#: templates/web/zurich/admin/index-dm.html:21 -#: templates/web/zurich/admin/index-sdm.html:19 -#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/index-dm.html:22 +#: templates/web/zurich/admin/index-sdm.html:20 +#: templates/web/zurich/admin/reports.html:12 msgid "Description" msgstr "" @@ -940,9 +952,9 @@ msgstr "Manylion:" #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/admin/report_edit-sdm.html:14 -#: templates/web/zurich/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Details:" msgstr "Manylion:" @@ -981,10 +993,10 @@ msgstr "Ddim yn gwybod" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:35 +#: templates/web/default/admin/list_updates.html:36 #: templates/web/default/admin/problem_row.html:31 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:35 +#: templates/web/zurich/admin/problem_row.html:36 msgid "Edit" msgstr "" @@ -995,6 +1007,7 @@ msgstr "" #: templates/web/default/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:1 +#: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:4 #, fuzzy @@ -1022,23 +1035,25 @@ msgstr "" #: templates/web/default/admin/body_edit.html:83 #: templates/web/default/admin/flagged.html:12 #: templates/web/default/admin/flagged.html:35 -#: templates/web/default/admin/list_updates.html:8 -#: templates/web/default/admin/reports.html:15 +#: templates/web/default/admin/list_updates.html:9 +#: templates/web/default/admin/reports.html:14 #: templates/web/default/admin/users.html:13 #: templates/web/fixmystreet/auth/general.html:20 #: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/seesomething/auth/general.html:20 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/auth/general.html:24 +#: templates/web/zurich/auth/general.html:52 #, fuzzy msgid "Email" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1240 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1237 msgid "Email already in abuse list" msgstr "" @@ -1052,18 +1067,18 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/admin/update_edit.html:27 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 -#: templates/web/zurich/admin/report_edit-sdm.html:31 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit.html:57 msgid "Email:" msgstr "E-bost:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:301 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 #, fuzzy msgid "Email: %s" msgstr "E-bost:" @@ -1147,6 +1162,7 @@ msgstr "Ychwanegwch neges" #: templates/web/fixmystreet/auth/general.html:61 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 #: templates/web/fixmystreet/report/update-form.html:122 +#: templates/web/zurich/auth/general.html:63 #, fuzzy msgid "Enter a password" msgstr "Ychwanegwch neges" @@ -1174,7 +1190,7 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:51 msgid "Extra data:" msgstr "" @@ -1262,8 +1278,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:84 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:28 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/default/report/update-form.html:30 @@ -1274,14 +1290,14 @@ msgstr "" msgid "Fixed" msgstr "" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 #, fuzzy msgid "Fixed - Council" msgstr "cyngor" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 #, fuzzy msgid "Fixed - User" msgstr "Cuddio hen adroddiadau " @@ -1299,12 +1315,12 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "" -#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:53 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "" @@ -1334,7 +1350,6 @@ msgstr "Adroddiadau" #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 #: templates/web/oxfordshire/faq/faq-en-gb.html:1 -#: templates/web/zurich/faq/faq-de-ch.html:1 msgid "Frequently Asked Questions" msgstr "Cwestiynau Cyffredin" @@ -1374,16 +1389,16 @@ msgstr "Rhowch borthiant RSS i mi" #: templates/web/default/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 #: templates/web/seesomething/around/postcode_form.html:10 +#: templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "Ewch" -#: templates/web/default/admin/report_edit.html:49 +#: templates/web/default/admin/report_edit.html:52 #, fuzzy msgid "Going to send questionnaire?" msgstr "Anfon yr holiadur" #: templates/web/default/admin/index.html:24 -#: templates/web/zurich/admin/index.html:11 msgid "Graph of empty property creation by status over time" msgstr "" @@ -1417,7 +1432,9 @@ msgstr "" #: templates/web/oxfordshire/header.html:75 #: templates/web/reading/footer.html:10 #: templates/web/seesomething/footer.html:13 -#: templates/web/stevenage/footer.html:47 templates/web/zurich/footer.html:21 +#: templates/web/stevenage/footer.html:47 +#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 msgid "FAQs" msgstr "Cwestiynau Cyffredin" @@ -1438,13 +1455,14 @@ msgstr "" msgid "Hi %s" msgstr "" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:80 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 #, fuzzy msgid "Hidden" @@ -1474,7 +1492,7 @@ msgstr "Sut i roi gwybod am eiddo gwag" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:699 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1501,12 +1519,12 @@ msgstr "" "URL o neges e-bost, gwnewch yn siwr eich bod wedi'i gopïo'n union.\n" #: templates/web/default/admin/flagged.html:9 -#: templates/web/default/admin/list_updates.html:5 -#: templates/web/default/admin/reports.html:12 -#: templates/web/zurich/admin/index-dm.html:20 -#: templates/web/zurich/admin/index-sdm.html:18 -#: templates/web/zurich/admin/list_updates.html:5 -#: templates/web/zurich/admin/reports.html:12 +#: templates/web/default/admin/list_updates.html:6 +#: templates/web/default/admin/reports.html:11 +#: templates/web/zurich/admin/index-dm.html:21 +#: templates/web/zurich/admin/index-sdm.html:19 +#: templates/web/zurich/admin/list_updates.html:6 +#: templates/web/zurich/admin/reports.html:11 msgid "ID" msgstr "" @@ -1547,7 +1565,7 @@ msgstr "" "fel y gallwn\n" "ddangos i'r cyngor y gweithgarwch yn ei ardal." -#: templates/web/default/auth/token.html:25 +#: templates/web/default/auth/token.html:22 #: templates/web/default/email_sent.html:9 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " @@ -1596,12 +1614,13 @@ msgid "" "present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:28 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:78 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:89 +#: templates/web/zurich/admin/report_edit.html:94 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" @@ -1611,7 +1630,7 @@ msgstr "" msgid "Incident Category" msgstr "Categori:" -#: templates/web/zurich/admin/report_edit.html:128 +#: templates/web/zurich/admin/report_edit.html:136 #, fuzzy msgid "Include reporter personal details" msgstr "Cofnodwch fanylion" @@ -1625,8 +1644,8 @@ msgstr "Cynnwys hen adroddiadau" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:71 +#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit.html:76 msgid "Internal notes:" msgstr "" @@ -1634,7 +1653,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1051 #, fuzzy msgid "Invalid end date" msgstr "Rhowch ddiweddariad" @@ -1643,14 +1662,14 @@ msgstr "Rhowch ddiweddariad" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1001 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 msgid "Invalid start date" msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/default/report/update-form.html:30 @@ -1694,6 +1713,7 @@ msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:172 #: templates/web/fixmystreet/report/update-form.html:100 #: templates/web/seesomething/auth/general.html:35 +#: templates/web/zurich/auth/general.html:39 msgid "Keep me signed in on this computer" msgstr "" @@ -1709,7 +1729,7 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" msgid "Last editor" msgstr "" -#: templates/web/default/admin/report_edit.html:44 +#: templates/web/default/admin/report_edit.html:47 #, fuzzy msgid "Last update:" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -1798,6 +1818,10 @@ msgstr "Neges:" msgid "Missing jurisdiction_id" msgstr "" +#: templates/web/zurich/admin/stats.html:34 +msgid "Moderated by division within one working day" +msgstr "" + #: templates/web/default/admin/stats.html:11 #, fuzzy msgid "Month" @@ -1811,8 +1835,8 @@ msgstr "Mwy o eiddo gwag cyfagos" #: templates/web/default/admin/body-form.html:4 #: templates/web/default/admin/flagged.html:11 #: templates/web/default/admin/flagged.html:34 -#: templates/web/default/admin/list_updates.html:7 -#: templates/web/default/admin/reports.html:14 +#: templates/web/default/admin/list_updates.html:8 +#: templates/web/default/admin/reports.html:13 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 #: templates/web/emptyhomes/reports/index.html:10 @@ -1824,6 +1848,7 @@ msgstr "Mwy o eiddo gwag cyfagos" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:187 #: templates/web/fixmystreet/report/update-form.html:136 #: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/auth/general.html:58 #: templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "Name" msgstr "Enw" @@ -1833,15 +1858,16 @@ msgstr "Enw" msgid "Name (optional)" msgstr "(dewisol)" -#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:30 -#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Enw:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 #, fuzzy msgid "Name: %s" msgstr "Enw:" @@ -1871,7 +1897,7 @@ msgid "" "Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:266 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1974,7 +2000,7 @@ msgstr "Adroddiadau newydd o fewn ffin {{NAME}} ar reportemptyhomes.com" msgid "New state" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit-sdm.html:59 #, fuzzy msgid "New update:" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -1985,16 +2011,20 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" msgid "New!" msgstr "Newydd!" +#: templates/web/default/pagination.html:13 +msgid "Next" +msgstr "" + #: templates/web/default/admin/body.html:50 #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:4 -#: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 +#: templates/web/default/admin/list_updates.html:33 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:36 -#: templates/web/default/admin/report_edit.html:49 +#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/report_edit.html:52 #: templates/web/default/admin/update_edit.html:19 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:111 @@ -2013,7 +2043,7 @@ msgstr "" msgid "No council" msgstr "cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:414 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "Ni ddewiswyd cyngor" @@ -2030,7 +2060,7 @@ msgstr "Ni ddaethpwyd o hyd i unrhyw eiddo gwag." msgid "No flagged users found" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:52 +#: templates/web/zurich/admin/report_edit-sdm.html:65 #, fuzzy msgid "No further updates" msgstr "Adroddiadau" @@ -2049,7 +2079,8 @@ msgstr "Ni roddwyd gwybod eto am unrhyw eiddo gwag." msgid "No result returned" msgstr "" -#: templates/web/default/report/_support.html:3 +#: templates/web/default/report/_support.html:2 +#: templates/web/default/report/_support.html:4 msgid "No supporters" msgstr "" @@ -2058,8 +2089,8 @@ msgid "Non Public" msgstr "" #: templates/web/default/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 #, fuzzy msgid "None" msgstr "Nac ydw" @@ -2073,7 +2104,7 @@ msgstr "Nac ydw" msgid "Not Responsible" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:10 +#: templates/web/zurich/admin/report_edit-sdm.html:21 msgid "Not for my subdivision" msgstr "" @@ -2178,16 +2209,17 @@ msgstr "Wedi'u hadfer i'w defnyddio ers amser" msgid "Older empty property reports" msgstr "Adroddiadau hŷn o eiddo gwag" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/update_edit.html:22 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:78 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:83 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2228,12 +2260,12 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 #: perllib/FixMyStreet/App/Controller/Report/New.pm:661 #: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: perllib/FixMyStreet/DB/Result/Problem.pm:623 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:343 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:356 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 msgid "Other" msgstr "Arall" @@ -2243,7 +2275,7 @@ msgid "" "\">available on GitHub</a>." msgstr "" -#: templates/web/default/admin/list_updates.html:11 +#: templates/web/default/admin/list_updates.html:12 #, fuzzy msgid "Owner" msgstr "Arall" @@ -2258,8 +2290,8 @@ msgstr "" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 msgid "Partial" msgstr "" @@ -2268,6 +2300,8 @@ msgstr "" #: templates/web/fixmystreet/auth/general.html:59 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:208 #: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/zurich/auth/general.html:32 +#: templates/web/zurich/auth/general.html:61 #, fuzzy msgid "Password (optional)" msgstr "(dewisol)" @@ -2286,12 +2320,13 @@ msgstr "" msgid "Phone number (optional)" msgstr "(dewisol)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:265 -#: templates/web/default/admin/report_edit.html:40 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 +#: templates/web/default/admin/report_edit.html:43 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Rhif ffôn:" @@ -2300,6 +2335,7 @@ msgstr "Rhif ffôn:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 #: templates/web/fixmystreet/report/update-form.html:59 #: templates/web/seesomething/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/admin/stats.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:68 #, fuzzy msgid "Photo" @@ -2321,15 +2357,15 @@ msgstr "Ffotograffau o adroddiadau cyfagos diweddar" msgid "Place pin on map" msgstr "" -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:84 msgid "Planned" msgstr "" @@ -2351,7 +2387,7 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/default/auth/token.html:17 +#: templates/web/default/auth/token.html:14 #, fuzzy msgid "Please check your email" msgstr "Rhowch eich cyfeiriad e-bost" @@ -2362,6 +2398,8 @@ msgstr "Rhowch eich cyfeiriad e-bost" #: templates/web/fixmystreet/auth/general.html:9 #: templates/web/seesomething/auth/general.html:15 #: templates/web/seesomething/auth/general.html:9 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:9 #, fuzzy msgid "Please check your email address is correct" msgstr "Rhowch gyfeiriad e-bost dilys" @@ -2370,12 +2408,12 @@ msgstr "Rhowch gyfeiriad e-bost dilys" #: perllib/FixMyStreet/App/Controller/Report/New.pm:852 #: perllib/FixMyStreet/App/Controller/Report/New.pm:871 #: perllib/FixMyStreet/App/Controller/Report/New.pm:914 -#: perllib/FixMyStreet/DB/Result/Problem.pm:433 +#: perllib/FixMyStreet/DB/Result/Problem.pm:420 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Dewiswch gategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:439 +#: perllib/FixMyStreet/DB/Result/Problem.pm:426 msgid "Please choose a property type" msgstr "Dewiswch fath o eiddo" @@ -2422,7 +2460,7 @@ msgstr "" msgid "Please do not give address or personal information in this section." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:147 +#: perllib/FixMyStreet/DB/Result/Comment.pm:145 #: templates/web/default/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Ychwanegwch neges" @@ -2434,7 +2472,7 @@ msgid "Please enter a password" msgstr "Ychwanegwch neges" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:408 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Rhowch enw'r pwnc" @@ -2452,7 +2490,7 @@ msgstr "Cofnodwch gyfeiriad e-bost dilys" msgid "Please enter a valid email address" msgstr "Cofnodwch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/DB/Result/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/default/js/translation_strings.html:4 #: templates/web/seesomething/js/translation_strings.html:2 msgid "Please enter some details" @@ -2469,6 +2507,8 @@ msgstr "Cofnodwch fanylion" #: templates/web/seesomething/auth/general.html:14 #: templates/web/seesomething/auth/general.html:9 #: templates/web/seesomething/js/translation_strings.html:9 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Cofnodwch eich cyfeiriad e-bost" @@ -2485,7 +2525,7 @@ msgstr "Cofnodwch eich cyfeiriad e-bost" msgid "Please enter your first name" msgstr "Cofnodwch eich enw" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:413 #: templates/web/default/js/translation_strings.html:7 #: templates/web/seesomething/js/translation_strings.html:4 #, fuzzy @@ -2497,8 +2537,8 @@ msgstr "" "ddangos ar y safle, cliciwch i ddileu'r tic o'r bocs" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 -#: perllib/FixMyStreet/DB/Result/Comment.pm:144 -#: perllib/FixMyStreet/DB/Result/Problem.pm:419 +#: perllib/FixMyStreet/DB/Result/Comment.pm:142 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" @@ -2710,9 +2750,13 @@ msgstr "Cofnodwyd gan %s am %s" msgid "Posted by %s at %s" msgstr "Cofnodwyd gan %s am %s" +#: templates/web/default/pagination.html:7 +msgid "Previous" +msgstr "" + #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:54 msgid "Private" msgstr "" @@ -2740,12 +2784,12 @@ msgid "Empty property %s sent to council %s" msgstr "Eiddo gwag yn %s" #: templates/web/default/admin/index.html:28 -#: templates/web/zurich/admin/index.html:15 +#: templates/web/zurich/admin/index.html:9 #, fuzzy msgid "Empty property breakdown by state" msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:916 #, fuzzy msgid "Empty property marked as open." msgstr "Ffurflen manylion eiddo gwag" @@ -2819,6 +2863,7 @@ msgstr "" "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael " "eu hadfer i'w defnyddio" +#: templates/web/default/admin/report_edit.html:26 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 #, fuzzy msgid "Property address:" @@ -2865,15 +2910,17 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:160 +#: templates/web/zurich/admin/report_edit.html:168 +#: templates/web/zurich/admin/report_edit.html:176 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:67 +#: templates/web/zurich/admin/report_edit.html:72 +#: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:170 +#: templates/web/zurich/admin/report_edit.html:184 msgid "Publish the response" msgstr "" @@ -3022,7 +3069,7 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:62 +#: templates/web/default/admin/report_edit.html:64 #: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" @@ -3086,7 +3133,7 @@ msgstr "Adroddiadau" msgid "Reported %s, to %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:606 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -3098,25 +3145,25 @@ msgstr "Adroddwyd yn ddi-enw am %s" msgid "Reported before" msgstr "Wedi adrodd o'r blaen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported by %s anonymously at %s" msgstr "Adroddwyd gan %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:620 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported by %s by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:594 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Adroddwyd am hyn gan %s yn y categori %s yn ddi-enw, am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:601 msgid "Reported by %s in the %s category by %s at %s" msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" @@ -3125,11 +3172,11 @@ msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" msgid "Reported in the %s category" msgstr "Adroddwyd yn y categori %s gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:589 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddiwyd yn y categori %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s gan %s am %s" @@ -3149,14 +3196,14 @@ msgstr "Adroddwyd yn y categori %s gan %s am %s" msgid "Reporting an empty property" msgstr "Adrodd am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1092 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 #: templates/web/seesomething/admin/stats.html:1 -#: templates/web/zurich/header.html:59 +#: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Adroddiadau" -#: perllib/FixMyStreet/DB/Result/Problem.pm:445 +#: perllib/FixMyStreet/DB/Result/Problem.pm:432 msgid "" "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" @@ -3174,7 +3221,7 @@ msgstr "Adroddiadau ar ac yng nghyffiniau'r map" msgid "Reports published" msgstr "Adroddiadau" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:46 #, fuzzy msgid "Resend report" msgstr "Cuddio hen adroddiadau " @@ -3193,13 +3240,16 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: templates/web/default/admin/report_edit.html:58 -#: templates/web/zurich/admin/report_edit.html:63 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1342 +#: templates/web/default/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:68 msgid "Rotate Left" msgstr "" -#: templates/web/default/admin/report_edit.html:59 -#: templates/web/zurich/admin/report_edit.html:64 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: templates/web/default/admin/report_edit.html:61 +#: templates/web/zurich/admin/report_edit.html:69 msgid "Rotate Right" msgstr "" @@ -3219,7 +3269,7 @@ msgstr "Adroddiadau cryno" msgid "Search Users" msgstr "Adroddiadau cryno" -#: templates/web/zurich/header.html:73 +#: templates/web/zurich/header.html:77 #, fuzzy msgid "Search reports" msgstr "Adroddiadau cryno" @@ -3251,16 +3301,17 @@ msgstr "" "porthiant RSS,\n" "neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost." -#: perllib/FixMyStreet/DB/Result/Problem.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:46 #, fuzzy msgid "Sent:" msgstr "Pwnc:" -#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:48 +#: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "" @@ -3338,6 +3389,8 @@ msgstr "Dangos pinnau" #: templates/web/seesomething/auth/general.html:3 #: templates/web/seesomething/auth/general.html:39 #: templates/web/stevenage/header.html:101 +#: templates/web/zurich/auth/general.html:18 +#: templates/web/zurich/auth/general.html:35 msgid "Sign in" msgstr "" @@ -3348,6 +3401,7 @@ msgstr "" #: templates/web/default/auth/general.html:1 #: templates/web/fixmystreet/auth/general.html:1 #: templates/web/seesomething/auth/general.html:1 +#: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "" @@ -3433,32 +3487,34 @@ msgstr "" #: templates/web/bromley/report/display.html:78 #: templates/web/default/admin/flagged.html:18 -#: templates/web/default/admin/list_updates.html:6 -#: templates/web/default/admin/reports.html:21 +#: templates/web/default/admin/list_updates.html:7 +#: templates/web/default/admin/reports.html:20 #: templates/web/fixmystreet/report/update-form.html:26 #, fuzzy msgid "State" msgstr "Diweddariad:" -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:41 -#: templates/web/zurich/admin/report_edit.html:74 +#: templates/web/zurich/admin/report_edit-sdm.html:54 +#: templates/web/zurich/admin/report_edit.html:79 #: templates/web/zurich/admin/update_edit.html:17 #, fuzzy msgid "State:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1097 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 #: templates/web/default/admin/stats.html:1 +#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 #, fuzzy msgid "Stats" msgstr "Diweddariad:" -#: templates/web/zurich/admin/index-dm.html:25 -#: templates/web/zurich/admin/index-sdm.html:23 -#: templates/web/zurich/admin/reports.html:17 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 #, fuzzy msgid "Status" msgstr "Diweddariad:" @@ -3468,7 +3524,7 @@ msgstr "Diweddariad:" msgid "Still open, via questionnaire, %s" msgstr "Anfon yr holiadur" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:352 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 #, fuzzy msgid "Subcategory: %s" msgstr "Categori:" @@ -3488,7 +3544,7 @@ msgstr "Pwnc:" #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:31 +#: templates/web/zurich/admin/report_edit.html:34 msgid "Subject:" msgstr "Pwnc:" @@ -3508,11 +3564,11 @@ msgstr "Pwnc:" msgid "Submit" msgstr "Anfon" -#: templates/web/default/admin/report_edit.html:65 +#: templates/web/default/admin/report_edit.html:67 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:51 -#: templates/web/zurich/admin/report_edit.html:172 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:186 #: templates/web/zurich/admin/update_edit.html:38 #, fuzzy msgid "Submit changes" @@ -3523,14 +3579,15 @@ msgstr "Anfon" msgid "Submit questionnaire" msgstr "Anfon yr holiadur" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:77 -#: templates/web/zurich/admin/reports.html:15 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 #, fuzzy msgid "Submitted" @@ -3557,12 +3614,13 @@ msgstr "" "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " "byw ynddo:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:136 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 -#: templates/web/zurich/admin/index.html:1 templates/web/zurich/header.html:56 +#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 +#: templates/web/zurich/header.html:57 #, fuzzy msgid "Summary" msgstr "Adroddiadau cryno" @@ -3577,7 +3635,7 @@ msgstr "Adroddiadau cryno" msgid "Summary reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1094 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Survey" msgstr "" @@ -3585,8 +3643,8 @@ msgstr "" msgid "Survey Results" msgstr "" -#: templates/web/default/admin/list_updates.html:14 -#: templates/web/zurich/admin/list_updates.html:7 +#: templates/web/default/admin/list_updates.html:15 +#: templates/web/zurich/admin/list_updates.html:8 msgid "Text" msgstr "" @@ -3698,7 +3756,7 @@ msgstr "" "Nid yw'n ymddangos bod cyngor yn gyfrifol am y lleoliad hwnnw, efallai ei " "fod ar y môr - chwiliwch am fan mwy penodol." -#: perllib/FixMyStreet/App/Controller/Location.pm:121 +#: perllib/FixMyStreet/App/Controller/Location.pm:123 #, fuzzy msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3710,7 +3768,7 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori." -#: perllib/FixMyStreet/App/Controller/Admin.pm:642 +#: perllib/FixMyStreet/App/Controller/Admin.pm:670 #, fuzzy msgid "That empty property will now be resent." msgstr "ni fydd eich eiddo gwag yn cael ei bostio" @@ -3766,7 +3824,7 @@ msgid "" "the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/default/auth/token.html:22 +#: templates/web/default/auth/token.html:19 #: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " @@ -3909,7 +3967,7 @@ msgid "" "if you give us permission." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:274 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 msgid "" "The user could not locate the empty property on a map, but to see the area " "around the location they entered" @@ -3934,6 +3992,7 @@ msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 #: templates/web/seesomething/auth/general.html:24 +#: templates/web/zurich/auth/general.html:28 msgid "" "There was an empty property with your email/password combination. If you " "cannot remember your password, or do not have one, please fill in the ‘" @@ -3965,7 +4024,7 @@ msgid "" "change without warnings in the future." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 msgid "" "This email has been sent to both councils covering the location of the empty " "property, as the user did not categorise it; please ignore it if you're not " @@ -3973,7 +4032,7 @@ msgid "" "empty property this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 msgid "" "This email has been sent to several councils covering the location of the " "empty property, as the category selected is provided for all of them; please " @@ -4013,6 +4072,12 @@ msgstr "" "Dyma grynodeb o'r holl adroddiadau ar y safle hwn; dewiswch gyngor penodol i " "weld yr adroddiadau a anfonwyd ato." +#: templates/web/default/auth/token.html:9 +msgid "" +"This may be because the link is too old or already used, or the address was " +"not copied correctly." +msgstr "" + #: templates/web/default/report/banner.html:15 #, fuzzy msgid "This empty property has been closed" @@ -4042,6 +4107,8 @@ msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" msgid "This empty property is old and of unknown status." msgstr "Mae'r eiddo gwag hwn yn hen ac nid yw ei statws yn hysbys." +#: perllib/FixMyStreet/Cobrand/Zurich.pm:65 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4060,12 +4127,12 @@ msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:298 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 #, fuzzy msgid "This report was submitted anonymously" msgstr "Rhoddodd %s wybod yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 msgid "" "This web page also contains a photo of the empty property, provided by the " "user." @@ -4073,13 +4140,13 @@ msgstr "" "Mae'r dudalen we hon hefyd yn cynnwys ffotograff o'r eiddo gwag, wedi'i " "ddarparu gan y defnyddiwr." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" #: templates/web/default/admin/flagged.html:10 -#: templates/web/default/admin/reports.html:13 +#: templates/web/default/admin/reports.html:12 msgid "Title" msgstr "" @@ -4102,7 +4169,7 @@ msgstr "" "ward chi,\n" "cofnodwch eich cod post Prydeinig neu enw stryd ac ardal:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:273 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "To view a map of the precise location of this issue" msgstr "Gweld map o union leoliad y broblem hon" @@ -4110,6 +4177,7 @@ msgstr "Gweld map o union leoliad y broblem hon" #: templates/web/default/admin/questionnaire.html:24 #: templates/web/default/admin/stats.html:24 #: templates/web/default/admin/stats.html:43 +#: templates/web/zurich/admin/stats.html:30 msgid "Total" msgstr "" @@ -4131,11 +4199,11 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/default/admin/update_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:32 -#: templates/web/zurich/admin/report_edit.html:52 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:58 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "" @@ -4223,32 +4291,32 @@ msgstr "Diweddariadau" msgid "Update:" msgstr "Diweddariad:" -#: templates/web/zurich/admin/index-dm.html:24 -#: templates/web/zurich/admin/index-sdm.html:22 -#: templates/web/zurich/admin/reports.html:16 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 #, fuzzy msgid "Updated" msgstr "Diweddariadau" -#: perllib/FixMyStreet/App/Controller/Admin.pm:734 -#: perllib/FixMyStreet/App/Controller/Admin.pm:868 -#: perllib/FixMyStreet/App/Controller/Admin.pm:919 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:326 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:762 +#: perllib/FixMyStreet/App/Controller/Admin.pm:906 +#: perllib/FixMyStreet/App/Controller/Admin.pm:959 +#: perllib/FixMyStreet/App/Controller/Admin.pm:998 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:487 #, fuzzy msgid "Updated!" msgstr "Diweddariadau" -#: templates/web/default/admin/list_updates.html:1 +#: templates/web/default/admin/list_updates.html:2 #: templates/web/default/report/update.html:3 #: templates/web/fixmystreet/report/update.html:3 -#: templates/web/zurich/admin/list_updates.html:1 +#: templates/web/zurich/admin/list_updates.html:2 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Diweddariadau" -#: perllib/FixMyStreet/DB/Result/Comment.pm:152 +#: perllib/FixMyStreet/DB/Result/Comment.pm:150 msgid "" "Updates are limited to 2000 characters in length. Please shorten your update" msgstr "" @@ -4266,18 +4334,18 @@ msgstr "Diweddariadau am {{title}}" msgid "Updates to this empty property, reportemptyhomes.com" msgstr "Diweddariadau i'r eiddo gwag hwn, reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1256 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1296 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1228 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1268 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1095 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:151 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 #: templates/web/default/admin/flagged.html:30 -#: templates/web/zurich/header.html:68 +#: templates/web/zurich/header.html:69 msgid "Users" msgstr "" @@ -4289,8 +4357,8 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" #: templates/web/default/admin/report_edit.html:12 #: templates/web/default/admin/update_edit.html:12 -#: templates/web/zurich/admin/report_edit-sdm.html:13 -#: templates/web/zurich/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:22 #: templates/web/zurich/admin/update_edit.html:10 #, fuzzy msgid "View report on site" @@ -4334,7 +4402,11 @@ msgstr "" "hyd at ddeg cyfatebiaeth, rhowch gynnig ar chwiliad gwahanol os nad yw'ch " "lleoliad chi yno." -#: templates/web/default/auth/token.html:19 +#: templates/web/default/auth/token.html:8 +msgid "We have not been able to confirm your account - sorry." +msgstr "" + +#: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." msgstr "" @@ -4360,7 +4432,7 @@ msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" msgid "We never show your email address or phone number." msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "" "We realise this empty property might be the responsibility of %s; however, " "we don't currently have any contact details for them. If you know of an " @@ -4417,7 +4489,7 @@ msgid "When edited" msgstr "" #: templates/web/default/admin/flagged.html:19 -#: templates/web/default/admin/reports.html:22 +#: templates/web/default/admin/reports.html:21 msgid "When sent" msgstr "" @@ -4472,12 +4544,12 @@ msgstr "" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:5 -#: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 +#: templates/web/default/admin/list_updates.html:33 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:49 +#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/report_edit.html:52 #: templates/web/default/admin/update_edit.html:18 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 @@ -4628,7 +4700,7 @@ msgstr "Rydych wedi cadarnhau'ch hysbysiad yn llwyddiannus." msgid "You must now click the link in the email we've just sent you." msgstr "" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:46 msgid "You really want to resend?" msgstr "" @@ -4665,6 +4737,8 @@ msgstr "(dewisol)" #: templates/web/fixmystreet/auth/general.html:26 #: templates/web/fixmystreet/report/update-form.html:80 #: templates/web/seesomething/auth/general.html:26 +#: templates/web/zurich/auth/general.html:30 +#: templates/web/zurich/auth/general.html:56 #, fuzzy msgid "Your email address" msgstr "Eich cyfeiriad e-bost:" @@ -4708,6 +4782,7 @@ msgstr "Eich enw:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 #: templates/web/fixmystreet/report/update-form.html:140 #: templates/web/seesomething/report/new/fill_in_details_form.html:79 +#: templates/web/zurich/auth/general.html:59 #: templates/web/zurich/report/new/fill_in_details_form.html:104 #, fuzzy msgid "Your name" @@ -4727,6 +4802,7 @@ msgstr "Eich enw:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:166 #: templates/web/fixmystreet/report/update-form.html:94 #: templates/web/seesomething/auth/general.html:30 +#: templates/web/zurich/auth/general.html:34 #, fuzzy msgid "Your password" msgstr "Adroddiadau" @@ -4783,17 +4859,17 @@ msgstr "" msgid "council" msgstr "cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "council ref: %s" msgstr "" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:27 -#: templates/web/zurich/admin/report_edit.html:48 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:197 +#: perllib/FixMyStreet/DB/Result/Comment.pm:195 #, fuzzy msgid "duplicate report" msgstr "Categori:" @@ -4809,11 +4885,17 @@ msgstr "" msgid "from %d different users" msgstr "" -#: perllib/Utils.pm:268 +#: templates/web/fixmystreet/report/_item.html:12 +#: templates/web/zurich/report/_item.html:16 +#, fuzzy +msgid "last updated %s" +msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" + +#: perllib/Utils.pm:263 msgid "less than a minute" msgstr "llai na munud" -#: templates/web/default/report/updates.html:37 +#: templates/web/default/report/updates.html:38 msgid "marked as %s" msgstr "" @@ -4832,7 +4914,7 @@ msgstr "" msgid "no further action" msgstr "Adroddiadau" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 +#: perllib/FixMyStreet/DB/Result/Comment.pm:193 msgid "not the council's responsibility" msgstr "" @@ -4848,16 +4930,16 @@ msgstr "" #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/zurich/admin/report_edit-sdm.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:18 -#: templates/web/zurich/admin/report_edit-sdm.html:23 -#: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit.html:35 -#: templates/web/zurich/admin/report_edit.html:37 -#: templates/web/zurich/admin/report_edit.html:44 -#: templates/web/zurich/admin/report_edit.html:46 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit-sdm.html:36 +#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" @@ -4866,7 +4948,7 @@ msgid "other areas:" msgstr "" #: templates/web/default/report/updates.html:28 -#: templates/web/default/report/updates.html:35 +#: templates/web/default/report/updates.html:36 msgid "reopened" msgstr "wedi'i ailagor" @@ -4897,18 +4979,22 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 +#: templates/web/default/report/updates.html:33 +msgid "third party responsibility" +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 #, fuzzy msgid "this type of local empty property" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" -#: perllib/Utils.pm:240 +#: perllib/Utils.pm:235 msgid "today" msgstr "heddiw" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:27 -#: templates/web/zurich/admin/report_edit.html:48 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "used map" msgstr "" @@ -4933,14 +5019,21 @@ 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/Utils.pm:287 +#: perllib/Utils.pm:282 #, fuzzy, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "awr" msgstr[1] "awr" -#: perllib/Utils.pm:289 +#: templates/web/default/report/_support.html:6 +#, perl-format +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "" +msgstr[1] "" + +#: perllib/Utils.pm:284 #, fuzzy, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4962,7 +5055,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:283 +#: perllib/Utils.pm:278 #, fuzzy, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4994,7 +5087,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:285 +#: perllib/Utils.pm:280 #, fuzzy, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index c1b27ac0a..4528607f8 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-02-13 11:17+0000\n" -"PO-Revision-Date: 2013-02-04 12:02+0100\n" +"POT-Creation-Date: 2013-03-11 18:53+0000\n" +"PO-Revision-Date: 2013-03-07 17:00+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" "Language: \n" @@ -16,8 +16,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:649 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:355 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 msgid " and " msgstr "und" @@ -63,16 +63,16 @@ msgstr "" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "" -#: templates/web/default/report/_support.html:3 -msgid "%d supporters" -msgstr "" +#: templates/web/default/pagination.html:10 +msgid "%d to %d of %d" +msgstr "%d bis %d von %d" #: templates/web/default/reports/body.html:0 #: templates/web/default/reports/body.html:20 msgid "%s - Summary reports" -msgstr "" +msgstr "Alle Meldungen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:698 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "" @@ -80,8 +80,7 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#, fuzzy +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "%s, reported at %s" msgstr "Gemeldet von %s um %s" @@ -124,17 +123,17 @@ msgstr "" #: templates/web/default/around/around_map_list_items.html:12 #: templates/web/default/around/on_map_list_items.html:9 -#: templates/web/fixmystreet/report/_item.html:20 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/fixmystreet/report/_item.html:22 +#: templates/web/zurich/report/_item.html:21 msgid "(closed)" msgstr "(erledigt)" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 -#: templates/web/fixmystreet/report/_item.html:18 -#: templates/web/zurich/report/_item.html:17 +#: templates/web/fixmystreet/report/_item.html:20 +#: templates/web/zurich/report/_item.html:19 msgid "(fixed)" -msgstr "(gelöst)" +msgstr "(erledigt)" #: templates/web/default/index.html:11 templates/web/default/index.html:15 #: templates/web/fixmystreet/around/intro.html:2 @@ -142,7 +141,7 @@ msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" #: templates/web/default/reports/_list-entry.html:4 -#: templates/web/fixmystreet/report/_item.html:14 +#: templates/web/fixmystreet/report/_item.html:16 msgid "(not sent to council)" msgstr "" @@ -153,33 +152,29 @@ msgid "(optional)" msgstr "(optional)" #: templates/web/default/reports/_list-entry.html:2 -#: templates/web/fixmystreet/report/_item.html:13 +#: templates/web/fixmystreet/report/_item.html:15 msgid "(sent to both)" msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:211 msgid "(we never show your email address or phone number)" -msgstr "(ihre E-Mail Adresse und Telefonnummer werden nie angezeigt)" +msgstr "(Ihre E-Mail Adresse und Telefonnummer werden nie angezeigt)" #: templates/web/default/report/update-form.html:158 msgid "(we never show your email)" -msgstr "(ihre E-Mail Adresse wird nie angezeigt)" +msgstr "(Ihre E-Mail Adresse wird nie angezeigt)" #: perllib/FixMyStreet/App/Controller/Report/New.pm:634 #: perllib/FixMyStreet/App/Controller/Report/New.pm:661 -#: perllib/FixMyStreet/DB/Result/Problem.pm:431 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" #: perllib/FixMyStreet/App/Controller/Report/New.pm:615 -#: perllib/FixMyStreet/DB/Result/Problem.pm:437 +#: perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "" -#: templates/web/default/report/_support.html:3 -msgid "1 supporter" -msgstr "" - #: templates/web/default/questionnaire/completed.html:20 msgid "" "<p style=\"font-size:150%\">Thank you very much for filling in our " @@ -274,7 +269,7 @@ msgstr "" #: templates/web/default/admin/index.html:14 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%d</strong> live problems" -msgstr "" +msgstr "<strong>%d</strong> Meldungen Total" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:183 msgid "<strong>No</strong> Let me confirm my report by email" @@ -285,8 +280,9 @@ msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" #: templates/web/fixmystreet/auth/general.html:50 +#: templates/web/zurich/auth/general.html:49 msgid "<strong>No</strong> let me sign in by email" -msgstr "Erstmalige Anmeldung" +msgstr "Neu Registrieren" #: templates/web/default/auth/general.html:55 msgid "<strong>No</strong>, I do not, let me sign in by email:" @@ -338,7 +334,7 @@ msgstr "Adresse hinzufügen" msgid "Add new category" msgstr "Füge neue Kategorie hinzu" -#: templates/web/default/admin/users.html:35 +#: templates/web/default/admin/users.html:36 msgid "Add user" msgstr "User hinzufügen" @@ -366,6 +362,7 @@ msgstr "" #: templates/web/default/reports/index.html:3 #: templates/web/fixmybarangay/reports/index.html:3 +#: templates/web/zurich/admin/stats.html:5 #: templates/web/zurich/reports/index.html:15 msgid "All Reports" msgstr "Alle Meldungen" @@ -381,14 +378,16 @@ msgstr "Alle Meldungen" #: templates/web/oxfordshire/header.html:67 #: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 #: templates/web/zurich/admin/index-dm.html:12 +#: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Alle Meldungen" #: templates/web/default/admin/stats.html:5 +#: templates/web/zurich/admin/stats.html:8 msgid "All reports between %s and %s" -msgstr "Gemeldet von %s um %s" +msgstr "Alle Meldungen von %s bis %s" #: templates/web/default/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" @@ -431,12 +430,12 @@ msgid "An update marked this problem as fixed." msgstr "" #: templates/web/default/admin/flagged.html:15 -#: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/reports.html:18 +#: templates/web/default/admin/list_updates.html:11 +#: templates/web/default/admin/reports.html:17 msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/admin/update_edit.html:17 msgid "Anonymous:" msgstr "Anonym:" @@ -462,22 +461,24 @@ msgstr "" msgid "Area covered" msgstr "Gebiet" -#: templates/web/zurich/admin/report_edit.html:109 +#: templates/web/zurich/admin/report_edit.html:117 +#: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "Einer anderen Kategorie (DA) zuweisen:" -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/report_edit.html:126 msgid "Assign to external body:" msgstr "Einer externen Stelle zuweisen:" -#: templates/web/zurich/admin/report_edit.html:150 -#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/report_edit.html:103 +#: templates/web/zurich/admin/report_edit.html:158 msgid "Assign to subdivision:" msgstr "An Fachbereich zuweisen:" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:98 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" -msgstr "An Fachbereich zuweisen:" +msgstr "Weitergeleitet an: %s" #: templates/web/default/open311/index.html:17 msgid "" @@ -490,8 +491,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:386 -#: templates/web/zurich/report/_item.html:9 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Überprüfung ausstehend" @@ -509,14 +510,14 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:204 #: templates/web/default/admin/bodies.html:1 -#: templates/web/zurich/header.html:63 +#: templates/web/zurich/header.html:64 msgid "Bodies" msgstr "Externe Adressen" -#: templates/web/default/admin/reports.html:16 +#: templates/web/default/admin/reports.html:15 #: templates/web/default/admin/users.html:14 msgid "Body" msgstr "Organisation" @@ -548,15 +549,16 @@ msgstr "" #: templates/web/default/admin/body.html:35 #: templates/web/default/admin/flagged.html:14 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/reports.html:17 +#: templates/web/default/admin/reports.html:16 #: templates/web/default/report/new/category.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 #: templates/web/seesomething/report/new/category.html:6 #: templates/web/southampton/report/new/category.html:3 #: templates/web/zurich/admin/body.html:13 -#: templates/web/zurich/admin/index-dm.html:22 -#: templates/web/zurich/admin/index-sdm.html:20 -#: templates/web/zurich/admin/reports.html:14 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/stats.html:50 #: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategorie" @@ -567,16 +569,16 @@ msgstr "" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/report_edit.html:36 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 -#: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit.html:108 +#: templates/web/zurich/admin/report_edit-sdm.html:42 +#: templates/web/zurich/admin/report_edit.html:116 msgid "Category:" msgstr "Kategorie:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:348 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 msgid "Category: %s" msgstr "Kategorie: %s" @@ -591,21 +593,23 @@ msgstr "Passwort ändern" msgid "Click map to report a problem" msgstr "Mangel lokalisieren" -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:28 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:75 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/fixmystreet/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:85 -#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:90 +#: templates/web/zurich/admin/report_edit.html:92 +#: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "Erledigt" -#: perllib/FixMyStreet/DB/Result/Problem.pm:791 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Closed by council" msgstr "" @@ -623,23 +627,23 @@ msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" #: templates/web/default/admin/report_edit.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:46 msgid "Co-ordinates:" msgstr "Koordinaten:" #: templates/web/default/admin/flagged.html:16 -#: templates/web/default/admin/list_updates.html:13 -#: templates/web/default/admin/reports.html:19 +#: templates/web/default/admin/list_updates.html:14 +#: templates/web/default/admin/reports.html:18 msgid "Cobrand" msgstr "" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:50 #: templates/web/default/admin/update_edit.html:44 msgid "Cobrand data:" msgstr "" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:49 #: templates/web/default/admin/update_edit.html:43 msgid "Cobrand:" msgstr "" @@ -679,12 +683,13 @@ msgstr "" #: templates/web/zurich/tokens/confirm_problem.html:1 #: templates/web/zurich/tokens/confirm_problem.html:3 msgid "Confirmation" -msgstr "Bestätigung" +msgstr "Bestätigung" #: templates/web/default/admin/body.html:37 #: templates/web/default/admin/body.html:85 #: templates/web/default/admin/body_edit.html:32 #: templates/web/default/admin/body_edit.html:84 +#: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Bestätigt" @@ -693,7 +698,7 @@ msgid "Confirmed reports between %s and %s" msgstr "" #: templates/web/default/admin/problem_row.html:25 -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:45 msgid "Confirmed:" msgstr "Bestätigt:" @@ -722,8 +727,8 @@ msgstr "" msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1224 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1252 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 msgid "Could not find user" msgstr "" @@ -732,7 +737,7 @@ msgid "Could not look up location" msgstr "" #: templates/web/default/admin/flagged.html:13 -#: templates/web/default/admin/list_updates.html:12 +#: templates/web/default/admin/list_updates.html:13 msgid "Council" msgstr "" @@ -748,6 +753,8 @@ msgstr "" #: templates/web/default/admin/stats.html:12 #: templates/web/default/admin/stats.html:32 +#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats.html:50 msgid "Count" msgstr "" @@ -761,16 +768,16 @@ msgid "Create category" msgstr "" #: templates/web/default/admin/flagged.html:17 -#: templates/web/default/admin/list_updates.html:9 -#: templates/web/default/admin/reports.html:20 -#: templates/web/zurich/admin/list_updates.html:6 +#: templates/web/default/admin/list_updates.html:10 +#: templates/web/default/admin/reports.html:19 +#: templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "Erstellt" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:44 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:34 -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit-sdm.html:47 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Erstellt:" @@ -784,6 +791,10 @@ msgstr "Aktueller Status" msgid "Dashboard" msgstr "" +#: templates/web/zurich/admin/stats.html:35 +msgid "Dealt with by subdivision within 5 working days" +msgstr "Innerhalb von fünf Arbeitstagen abgeschlossen" + #: templates/web/default/admin/body.html:38 #: templates/web/default/admin/body.html:88 #: templates/web/default/admin/body_edit.html:37 @@ -791,9 +802,9 @@ msgstr "" msgid "Deleted" msgstr "Gelöscht" -#: templates/web/zurich/admin/index-dm.html:21 -#: templates/web/zurich/admin/index-sdm.html:19 -#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/index-dm.html:22 +#: templates/web/zurich/admin/index-sdm.html:20 +#: templates/web/zurich/admin/reports.html:12 msgid "Description" msgstr "Beschreibung" @@ -808,9 +819,9 @@ msgstr "Beschreibung" #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/admin/report_edit-sdm.html:14 -#: templates/web/zurich/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Details:" msgstr "Beschreibung:" @@ -847,10 +858,10 @@ msgstr "" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:35 +#: templates/web/default/admin/list_updates.html:36 #: templates/web/default/admin/problem_row.html:31 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:35 +#: templates/web/zurich/admin/problem_row.html:36 msgid "Edit" msgstr "" @@ -861,6 +872,7 @@ msgstr "Details editieren" #: templates/web/default/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:1 +#: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:4 msgid "Editing problem %d" @@ -885,22 +897,24 @@ msgstr "" #: templates/web/default/admin/body_edit.html:83 #: templates/web/default/admin/flagged.html:12 #: templates/web/default/admin/flagged.html:35 -#: templates/web/default/admin/list_updates.html:8 -#: templates/web/default/admin/reports.html:15 +#: templates/web/default/admin/list_updates.html:9 +#: templates/web/default/admin/reports.html:14 #: templates/web/default/admin/users.html:13 #: templates/web/fixmystreet/auth/general.html:20 #: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/seesomething/auth/general.html:20 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/auth/general.html:24 +#: templates/web/zurich/auth/general.html:52 msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1240 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1237 msgid "Email already in abuse list" msgstr "" @@ -910,23 +924,22 @@ msgstr "" #: templates/web/default/report/display.html:34 msgid "Email me updates" -msgstr "Schicken sie mir Aktualisierungen" +msgstr "Schicken Sie mir Aktualisierungen" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/admin/update_edit.html:27 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 -#: templates/web/zurich/admin/report_edit-sdm.html:31 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit.html:57 msgid "Email:" msgstr "E-mail:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:301 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 msgid "Email: %s" msgstr "E-mail:" @@ -1002,6 +1015,7 @@ msgstr "" #: templates/web/fixmystreet/auth/general.html:61 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 #: templates/web/fixmystreet/report/update-form.html:122 +#: templates/web/zurich/auth/general.html:63 msgid "Enter a password" msgstr "Ihr Passwort" @@ -1028,7 +1042,7 @@ msgstr "Beispieladresse" msgid "Examples:" msgstr "Beispiele:" -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:51 msgid "Extra data:" msgstr "" @@ -1095,8 +1109,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:84 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:28 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/default/report/update-form.html:30 @@ -1105,15 +1119,15 @@ msgstr "" #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:32 msgid "Fixed" -msgstr "Gelöst" +msgstr "Erledigt" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 msgid "Fixed - Council" msgstr "" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 msgid "Fixed - User" msgstr "" @@ -1129,12 +1143,12 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "" -#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:53 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "" @@ -1162,9 +1176,8 @@ msgstr "Ihr Passwort" #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 #: templates/web/oxfordshire/faq/faq-en-gb.html:1 -#: templates/web/zurich/faq/faq-de-ch.html:1 msgid "Frequently Asked Questions" -msgstr "" +msgstr "Hilfe" #: templates/web/emptyhomes/static/about.html:34 msgid "Further information about our work on empty homes." @@ -1199,15 +1212,15 @@ msgstr "" #: templates/web/default/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 #: templates/web/seesomething/around/postcode_form.html:10 +#: templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "Los" -#: templates/web/default/admin/report_edit.html:49 +#: templates/web/default/admin/report_edit.html:52 msgid "Going to send questionnaire?" msgstr "" #: templates/web/default/admin/index.html:24 -#: templates/web/zurich/admin/index.html:11 msgid "Graph of problem creation by status over time" msgstr "Grafik der Meldungen nach Status und Zeit" @@ -1239,7 +1252,9 @@ msgstr "" #: templates/web/oxfordshire/header.html:75 #: templates/web/reading/footer.html:10 #: templates/web/seesomething/footer.html:13 -#: templates/web/stevenage/footer.html:47 templates/web/zurich/footer.html:21 +#: templates/web/stevenage/footer.html:47 +#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "Hilfe" @@ -1259,13 +1274,14 @@ msgstr "" msgid "Hi %s" msgstr "Hallo %s" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:80 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Unsichtbar" @@ -1288,13 +1304,13 @@ msgstr "" #: templates/web/default/index-steps.html:1 msgid "How to report a problem" -msgstr "Erfasse eine neue Meldung:" +msgstr "Erfassen Sie eine neue Meldung:" #: templates/web/default/js/translation_strings.html:27 msgid "How to send successful reports" msgstr "Anleitung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:699 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1313,17 +1329,17 @@ msgid "" "I'm afraid we couldn't validate that token. If you've copied the URL from an " "email, please check that you copied it exactly.\n" msgstr "" -"Leider konnte ihre URL nicht aufgelöst werden. Falls sie die URL aus " -"einer Mail kopiert haben, überprüfen sie bitte ob sie die gesamte " +"Leider konnte Ihre URL nicht aufgelöst werden. Falls Sie die URL aus " +"einer Mail kopiert haben, überprüfen Sie bitte ob Sie die gesamte " "URL kopiert haben.\n" #: templates/web/default/admin/flagged.html:9 -#: templates/web/default/admin/list_updates.html:5 -#: templates/web/default/admin/reports.html:12 -#: templates/web/zurich/admin/index-dm.html:20 -#: templates/web/zurich/admin/index-sdm.html:18 -#: templates/web/zurich/admin/list_updates.html:5 -#: templates/web/zurich/admin/reports.html:12 +#: templates/web/default/admin/list_updates.html:6 +#: templates/web/default/admin/reports.html:11 +#: templates/web/zurich/admin/index-dm.html:21 +#: templates/web/zurich/admin/index-sdm.html:19 +#: templates/web/zurich/admin/list_updates.html:6 +#: templates/web/zurich/admin/reports.html:11 msgid "ID" msgstr "ID" @@ -1353,7 +1369,7 @@ msgid "" "the council the activity in their area." msgstr "" -#: templates/web/default/auth/token.html:25 +#: templates/web/default/auth/token.html:22 #: templates/web/default/email_sent.html:9 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " @@ -1387,7 +1403,6 @@ msgstr "" #: templates/web/default/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:30 -#, fuzzy msgid "In Progress" msgstr "In Bearbeitung" @@ -1399,24 +1414,24 @@ msgid "" "present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:28 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:78 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:89 +#: templates/web/zurich/admin/report_edit.html:94 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "In Bearbeitung" #: templates/web/seesomething/report/new/fill_in_details_form.html:38 -#, fuzzy msgid "Incident Category" msgstr "Kategorie" -#: templates/web/zurich/admin/report_edit.html:128 +#: templates/web/zurich/admin/report_edit.html:136 msgid "Include reporter personal details" -msgstr "Pers&oumol;nliche Angaben des Meldenden mitsenden" +msgstr "Persönliche Angaben des Meldenden mitsenden" #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" @@ -1426,8 +1441,8 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:71 +#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit.html:76 msgid "Internal notes:" msgstr "Interne Notizen" @@ -1435,7 +1450,7 @@ msgstr "Interne Notizen" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1051 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" @@ -1443,14 +1458,14 @@ msgstr "Ung&ultiges Enddatum" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1001 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/default/report/update-form.html:30 @@ -1482,6 +1497,7 @@ msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:172 #: templates/web/fixmystreet/report/update-form.html:100 #: templates/web/seesomething/auth/general.html:35 +#: templates/web/zurich/auth/general.html:39 msgid "Keep me signed in on this computer" msgstr "Angemeldet bleiben" @@ -1496,7 +1512,7 @@ msgstr "Letzte Bearbeitung" msgid "Last editor" msgstr "Letzter Bearbeiter" -#: templates/web/default/admin/report_edit.html:44 +#: templates/web/default/admin/report_edit.html:47 msgid "Last update:" msgstr "Letzte Bearbeitung" @@ -1581,6 +1597,10 @@ msgstr "Nachricht:" msgid "Missing jurisdiction_id" msgstr "" +#: templates/web/zurich/admin/stats.html:34 +msgid "Moderated by division within one working day" +msgstr "Innerhalb eines Arbeitstages moderiert" + #: templates/web/default/admin/stats.html:11 msgid "Month" msgstr "Monat" @@ -1593,8 +1613,8 @@ msgstr "Meldungen in der Nähe" #: templates/web/default/admin/body-form.html:4 #: templates/web/default/admin/flagged.html:11 #: templates/web/default/admin/flagged.html:34 -#: templates/web/default/admin/list_updates.html:7 -#: templates/web/default/admin/reports.html:14 +#: templates/web/default/admin/list_updates.html:8 +#: templates/web/default/admin/reports.html:13 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 #: templates/web/emptyhomes/reports/index.html:10 @@ -1606,27 +1626,27 @@ msgstr "Meldungen in der Nähe" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:187 #: templates/web/fixmystreet/report/update-form.html:136 #: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/auth/general.html:58 #: templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "Name" msgstr "Name" #: templates/web/seesomething/report/new/fill_in_details_form.html:74 -#, fuzzy msgid "Name (optional)" msgstr "(optional)" -#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:30 -#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Name:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Name: %s" -msgstr "Name:" +msgstr "Name: %s" #: templates/web/fiksgatami/footer.html:3 #: templates/web/fiksgatami/nn/footer.html:3 @@ -1653,7 +1673,7 @@ msgid "" "Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:266 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1662,7 +1682,7 @@ msgstr "" #: templates/web/default/email_sent.html:3 msgid "Nearly Done! Now check your email..." -msgstr "Fast Fertig! Bitte checken Sie ihre Mailbox..." +msgstr "Fast Fertig! Bitte checken Sie Ihre Mailbox..." #: templates/web/default/reports/index.html:16 #: templates/web/fixmybarangay/reports/index.html:16 @@ -1740,7 +1760,7 @@ msgstr "" msgid "New state" msgstr "Neuer Status" -#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit-sdm.html:59 msgid "New update:" msgstr "Neue Antwort" @@ -1750,16 +1770,20 @@ msgstr "Neue Antwort" msgid "New!" msgstr "Neu!" +#: templates/web/default/pagination.html:13 +msgid "Next" +msgstr "Weiter" + #: templates/web/default/admin/body.html:50 #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:4 -#: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 +#: templates/web/default/admin/list_updates.html:33 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:36 -#: templates/web/default/admin/report_edit.html:49 +#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/report_edit.html:52 #: templates/web/default/admin/update_edit.html:19 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:111 @@ -1777,7 +1801,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:414 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "" @@ -1793,7 +1817,7 @@ msgstr "" msgid "No flagged users found" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:52 +#: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" msgstr "Bearbeitung abschliessen" @@ -1811,7 +1835,8 @@ msgstr "Bisher wurden noch keine Meldungen erfasst." msgid "No result returned" msgstr "" -#: templates/web/default/report/_support.html:3 +#: templates/web/default/report/_support.html:2 +#: templates/web/default/report/_support.html:4 msgid "No supporters" msgstr "" @@ -1820,8 +1845,8 @@ msgid "Non Public" msgstr "" #: templates/web/default/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 msgid "None" msgstr "Keine" @@ -1834,7 +1859,7 @@ msgstr "Keine" msgid "Not Responsible" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:10 +#: templates/web/zurich/admin/report_edit-sdm.html:21 msgid "Not for my subdivision" msgstr "Anderer Fachbereich zuständig" @@ -1929,16 +1954,17 @@ msgstr "" msgid "Older problems" msgstr "" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/update_edit.html:22 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:78 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:83 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -1946,7 +1972,7 @@ msgstr "Aufgenommen" #: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26 msgid "Open reports" -msgstr "" +msgstr "Offene Meldungen" #: templates/web/default/open311/index.html:3 msgid "Open311 API for the mySociety FixMyStreet server" @@ -1975,12 +2001,12 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 #: perllib/FixMyStreet/App/Controller/Report/New.pm:661 #: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: perllib/FixMyStreet/DB/Result/Problem.pm:623 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:343 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:356 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 msgid "Other" msgstr "" @@ -1990,7 +2016,7 @@ msgid "" "\">available on GitHub</a>." msgstr "" -#: templates/web/default/admin/list_updates.html:11 +#: templates/web/default/admin/list_updates.html:12 msgid "Owner" msgstr "Besitzer" @@ -2004,8 +2030,8 @@ msgstr "" msgid "Parent" msgstr "Gehört zu" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 msgid "Partial" msgstr "" @@ -2014,6 +2040,8 @@ msgstr "" #: templates/web/fixmystreet/auth/general.html:59 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:208 #: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/zurich/auth/general.html:32 +#: templates/web/zurich/auth/general.html:61 msgid "Password (optional)" msgstr "Passwort" @@ -2030,12 +2058,13 @@ msgstr "" msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:265 -#: templates/web/default/admin/report_edit.html:40 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 +#: templates/web/default/admin/report_edit.html:43 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefonnummer:" @@ -2044,6 +2073,7 @@ msgstr "Telefonnummer:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 #: templates/web/fixmystreet/report/update-form.html:59 #: templates/web/seesomething/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/admin/stats.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" msgstr "Foto" @@ -2064,15 +2094,15 @@ msgstr "Fotos von neuen Meldungen in der Nähe" msgid "Place pin on map" msgstr "Pin auf der Karte absetzen" -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:84 msgid "Planned" msgstr "Rückmeldung ausstehend" @@ -2093,9 +2123,9 @@ msgstr "Bitte seien Sie freundlich und prägnant." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/default/auth/token.html:17 +#: templates/web/default/auth/token.html:14 msgid "Please check your email" -msgstr "Bitte überprüfen sie ihr E-Mail" +msgstr "Bitte überprüfen Sie Ihr E-Mail" #: templates/web/default/auth/general.html:14 #: templates/web/default/auth/general.html:8 @@ -2103,6 +2133,8 @@ msgstr "Bitte überprüfen sie ihr E-Mail" #: templates/web/fixmystreet/auth/general.html:9 #: templates/web/seesomething/auth/general.html:15 #: templates/web/seesomething/auth/general.html:9 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" @@ -2110,12 +2142,12 @@ msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" #: perllib/FixMyStreet/App/Controller/Report/New.pm:852 #: perllib/FixMyStreet/App/Controller/Report/New.pm:871 #: perllib/FixMyStreet/App/Controller/Report/New.pm:914 -#: perllib/FixMyStreet/DB/Result/Problem.pm:433 +#: perllib/FixMyStreet/DB/Result/Problem.pm:420 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Bitte wählen Sie eine Kategorie" -#: perllib/FixMyStreet/DB/Result/Problem.pm:439 +#: perllib/FixMyStreet/DB/Result/Problem.pm:426 msgid "Please choose a property type" msgstr "" @@ -2155,7 +2187,7 @@ msgstr "" msgid "Please do not give address or personal information in this section." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:147 +#: perllib/FixMyStreet/DB/Result/Comment.pm:145 #: templates/web/default/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" @@ -2166,7 +2198,7 @@ msgid "Please enter a password" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:408 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" @@ -2184,11 +2216,11 @@ msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" msgid "Please enter a valid email address" msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" -#: perllib/FixMyStreet/DB/Result/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/default/js/translation_strings.html:4 #: templates/web/seesomething/js/translation_strings.html:2 msgid "Please enter some details" -msgstr "Bitte geben Sie einiges Details an" +msgstr "Bitte geben Sie einige Details an" #: perllib/FixMyStreet/App/Controller/Contact.pm:96 #: perllib/FixMyStreet/DB/Result/User.pm:112 @@ -2201,6 +2233,8 @@ msgstr "Bitte geben Sie einiges Details an" #: templates/web/seesomething/auth/general.html:14 #: templates/web/seesomething/auth/general.html:9 #: templates/web/seesomething/js/translation_strings.html:9 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Ihre E-Mail Adresse" @@ -2215,7 +2249,7 @@ msgstr "Ihre E-Mail Adresse" msgid "Please enter your first name" msgstr "Bitte geben Sie Ihren Namen an" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:413 #: templates/web/default/js/translation_strings.html:7 #: templates/web/seesomething/js/translation_strings.html:4 msgid "" @@ -2224,8 +2258,8 @@ msgid "" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 -#: perllib/FixMyStreet/DB/Result/Comment.pm:144 -#: perllib/FixMyStreet/DB/Result/Problem.pm:419 +#: perllib/FixMyStreet/DB/Result/Comment.pm:142 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" @@ -2237,7 +2271,7 @@ msgstr "Bitte geben Sie Ihren Namen an" #: templates/web/default/js/translation_strings.html:18 msgid "Please enter your title" -msgstr "Bitte geben Sie Iher E-Mail-Adresse an" +msgstr "Bitte geben Sie Ihre E-Mail-Adresse an" #: templates/web/default/auth/sign_out.html:5 #: templates/web/zurich/auth/sign_out.html:5 @@ -2278,10 +2312,10 @@ msgid "" "and if possible describe the exact location of\n" "the problem (e.g. if there is a streetlight number or road name)." msgstr "" -"Bitte beschreiben sie Ihre Meldung weiter unten. Wir können den Mangel " +"Bitte beschreiben Sie Ihre Meldung weiter unten. Wir können den Mangel " "nur beheben, wenn Sie soviel Details wie möglich angeben: Beschreiben " -"sie die exakte Lage (z.B. An der Wand Richtung Strasse), was genau der " -"Mangel ist, wie lange dieser schon da ist und laden sie wenn möglich " +"Sie die exakte Lage (z.B. An der Wand Richtung Strasse), was genau der " +"Mangel ist, wie lange dieser schon da ist und laden Sie wenn möglich " "ein Photo des Mangels hoch." #: templates/web/default/report/new/fill_in_details_text.html:1 @@ -2294,10 +2328,10 @@ msgid "" "description (and a\n" "photo of the problem if you have one), etc." msgstr "" -"Bitte beschreiben sie Ihre Meldung weiter unten. Wir können den Mangel " +"Bitte beschreiben Sie Ihre Meldung weiter unten. Wir können den Mangel " "nur beheben, wenn Sie soviel Details wie möglich angeben: Beschreiben " -"sie die exakte Lage (z.B. An der Wand Richtung Strasse), was genau der " -"Mangel ist, wie lange dieser schon da ist und laden sie wenn möglich " +"Sie die exakte Lage (z.B. An der Wand Richtung Strasse), was genau der " +"Mangel ist, wie lange dieser schon da ist und laden Sie wenn möglich " "ein Photo des Mangels hoch." #: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 @@ -2432,9 +2466,13 @@ msgstr "" msgid "Posted by %s at %s" msgstr "" +#: templates/web/default/pagination.html:7 +msgid "Previous" +msgstr "Zurück" + #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:54 msgid "Private" msgstr "" @@ -2459,11 +2497,11 @@ msgid "Problem %s sent to council %s" msgstr "" #: templates/web/default/admin/index.html:28 -#: templates/web/zurich/admin/index.html:15 +#: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Meldungen nach Status sortiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:916 msgid "Problem marked as open." msgstr "" @@ -2492,7 +2530,7 @@ msgstr "Meldungen auf der Karte" #: db/alert_types.pl:14 msgid "Problems recently reported fixed on FixMyStreet" -msgstr "Meldungen, welche kürzlich gelöst wurden" +msgstr "Meldungen, welche kürzlich erledigt wurden" #: templates/web/default/alert/_list.html:19 #: templates/web/fixmystreet/alert/_list.html:21 @@ -2526,6 +2564,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" +#: templates/web/default/admin/report_edit.html:26 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 #, fuzzy msgid "Property address:" @@ -2571,15 +2610,17 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:160 +#: templates/web/zurich/admin/report_edit.html:168 +#: templates/web/zurich/admin/report_edit.html:176 msgid "Public response:" msgstr "Offizielle Antwort" -#: templates/web/zurich/admin/report_edit.html:67 +#: templates/web/zurich/admin/report_edit.html:72 +#: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "Foto veröffentlichen" -#: templates/web/zurich/admin/report_edit.html:170 +#: templates/web/zurich/admin/report_edit.html:184 msgid "Publish the response" msgstr "Antwort veröffentlichen" @@ -2688,12 +2729,12 @@ msgstr "" #: templates/web/default/reports/index.html:19 #: templates/web/fixmybarangay/reports/index.html:19 msgid "Recently <br>fixed" -msgstr "Kürzlich <br>gelöst" +msgstr "Kürzlich <br>erledigt" #: templates/web/fiksgatami/nn/reports/index.html:13 #: templates/web/fiksgatami/reports/index.html:13 msgid "Recently fixed" -msgstr "Kürzlich gelöst" +msgstr "Kürzlich erledigt" #: templates/web/default/index.html:41 templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" @@ -2707,10 +2748,10 @@ msgid "" "site remember that you can contact your council directly using their own " "website." msgstr "" -"Fix My Zürich dient dazu Mängel an der Infrastruktur zu melden. " +"Züri wie neu dient dazu Mängel an der Infrastruktur zu melden. " "Meldungen und Wünsche bezüglich Verbesserungen an der " -"Infrastruktur sowie Gestaltungsvorschläge können über Fix My " -"Zürich nicht berücksichtigt werden. Notfälle müssen der " +"Infrastruktur sowie Gestaltungsvorschläge können über Züri " +"wie neu nicht berücksichtigt werden. Notfälle müssen der " "Polizei gemeldet werden via Telefon 117." #: templates/web/fixmybarangay/report/new/notes.html:9 @@ -2723,7 +2764,7 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:62 +#: templates/web/default/admin/report_edit.html:64 #: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" @@ -2782,7 +2823,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:606 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2794,25 +2835,25 @@ msgstr "Anonym gemeldet um" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported by %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:620 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported by %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:594 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported by %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:601 msgid "Reported by %s in the %s category by %s at %s" msgstr "" @@ -2820,11 +2861,11 @@ msgstr "" msgid "Reported in the %s category" msgstr "In der Kategorie %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:589 msgid "Reported in the %s category anonymously at %s" msgstr "In der Kategorie %s um %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 msgid "Reported in the %s category by %s at %s" msgstr "Gemeldet in der Kategorie %s" @@ -2844,14 +2885,14 @@ msgstr "Gemeldet in der Kategorie %s" msgid "Reporting a problem" msgstr "Ihre Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1092 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 #: templates/web/seesomething/admin/stats.html:1 -#: templates/web/zurich/header.html:59 +#: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Meldungen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:445 +#: perllib/FixMyStreet/DB/Result/Problem.pm:432 msgid "" "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" @@ -2868,7 +2909,7 @@ msgstr "" msgid "Reports published" msgstr "Erledigt" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:46 msgid "Resend report" msgstr "" @@ -2886,19 +2927,22 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: templates/web/default/admin/report_edit.html:58 -#: templates/web/zurich/admin/report_edit.html:63 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1342 +#: templates/web/default/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:68 msgid "Rotate Left" msgstr "Links drehen" -#: templates/web/default/admin/report_edit.html:59 -#: templates/web/zurich/admin/report_edit.html:64 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: templates/web/default/admin/report_edit.html:61 +#: templates/web/zurich/admin/report_edit.html:69 msgid "Rotate Right" msgstr "Rechts drehen" #: templates/web/default/admin/body_edit.html:76 msgid "Save changes" -msgstr "Änderungen speichern" +msgstr "Speichern" #: templates/web/default/admin/flagged.html:1 #: templates/web/default/admin/reports.html:1 @@ -2910,7 +2954,7 @@ msgstr "Meldungen suchen" msgid "Search Users" msgstr "User suchen" -#: templates/web/zurich/header.html:73 +#: templates/web/zurich/header.html:77 msgid "Search reports" msgstr "Meldungen suchen" @@ -2937,15 +2981,16 @@ msgid "" "or enter your email address to subscribe to an email alert." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:46 msgid "Sent:" msgstr "Gesendet:" -#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:48 +#: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "" @@ -3004,6 +3049,8 @@ msgstr "Zeige Stecknadeln" #: templates/web/seesomething/auth/general.html:3 #: templates/web/seesomething/auth/general.html:39 #: templates/web/stevenage/header.html:101 +#: templates/web/zurich/auth/general.html:18 +#: templates/web/zurich/auth/general.html:35 msgid "Sign in" msgstr "Anmelden" @@ -3014,6 +3061,7 @@ msgstr "" #: templates/web/default/auth/general.html:1 #: templates/web/fixmystreet/auth/general.html:1 #: templates/web/seesomething/auth/general.html:1 +#: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "" @@ -3096,29 +3144,31 @@ msgstr "" #: templates/web/bromley/report/display.html:78 #: templates/web/default/admin/flagged.html:18 -#: templates/web/default/admin/list_updates.html:6 -#: templates/web/default/admin/reports.html:21 +#: templates/web/default/admin/list_updates.html:7 +#: templates/web/default/admin/reports.html:20 #: templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "Status" -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:41 -#: templates/web/zurich/admin/report_edit.html:74 +#: templates/web/zurich/admin/report_edit-sdm.html:54 +#: templates/web/zurich/admin/report_edit.html:79 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1097 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 #: templates/web/default/admin/stats.html:1 +#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" -msgstr "" +msgstr "Statistik" -#: templates/web/zurich/admin/index-dm.html:25 -#: templates/web/zurich/admin/index-sdm.html:23 -#: templates/web/zurich/admin/reports.html:17 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 msgid "Status" msgstr "" @@ -3126,7 +3176,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:352 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 #, fuzzy msgid "Subcategory: %s" msgstr "Kategorie: %s" @@ -3145,7 +3195,7 @@ msgstr "Titel" #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:31 +#: templates/web/zurich/admin/report_edit.html:34 msgid "Subject:" msgstr "Titel:" @@ -3165,28 +3215,29 @@ msgstr "Titel:" msgid "Submit" msgstr "Abschicken" -#: templates/web/default/admin/report_edit.html:65 +#: templates/web/default/admin/report_edit.html:67 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:51 -#: templates/web/zurich/admin/report_edit.html:172 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:186 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" -msgstr "Änderungen speichern" +msgstr "Speichern" #: templates/web/default/questionnaire/index.html:116 #: templates/web/fixmystreet/questionnaire/index.html:105 msgid "Submit questionnaire" msgstr "" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:77 -#: templates/web/zurich/admin/reports.html:15 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 msgid "Submitted" msgstr "Erfasst" @@ -3209,12 +3260,13 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:136 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 -#: templates/web/zurich/admin/index.html:1 templates/web/zurich/header.html:56 +#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 +#: templates/web/zurich/header.html:57 msgid "Summary" msgstr "Zusammenfassung" @@ -3226,9 +3278,9 @@ msgstr "Zusammenfassung" #: templates/web/zurich/reports/index.html:0 #: templates/web/zurich/reports/index.html:4 msgid "Summary reports" -msgstr "" +msgstr "Alle Meldungen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1094 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Survey" msgstr "" @@ -3236,8 +3288,8 @@ msgstr "" msgid "Survey Results" msgstr "" -#: templates/web/default/admin/list_updates.html:14 -#: templates/web/zurich/admin/list_updates.html:7 +#: templates/web/default/admin/list_updates.html:15 +#: templates/web/zurich/admin/list_updates.html:8 msgid "Text" msgstr "" @@ -3256,8 +3308,8 @@ msgid "" "Thank you — you can <a href=\"%s\">view your updated problem</a> on " "the site." msgstr "" -"Danke &mdash; Sie können Ihre aktualisierte Meldung <a href=\"%s" -"\">auf der Webseite anschauen</a>" +"Danke — Sie können Ihre aktualisierte Meldung <a href=\"%s\">auf " +"der Webseite anschauen</a>." #: templates/web/emptyhomes/tokens/confirm_problem.html:6 #: templates/web/emptyhomes/tokens/confirm_problem.html:8 @@ -3322,7 +3374,7 @@ msgstr "" "Sie können Mängel nur innerhalb der Stadt Zürich melden. " "Verwenden Sie dafür die Adressuche." -#: perllib/FixMyStreet/App/Controller/Location.pm:121 +#: perllib/FixMyStreet/App/Controller/Location.pm:123 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3331,18 +3383,17 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:642 +#: perllib/FixMyStreet/App/Controller/Admin.pm:670 msgid "That problem will now be resent." msgstr "" #: perllib/FixMyStreet/App/Controller/Report.pm:117 -#, fuzzy msgid "That report cannot be viewed on %s." -msgstr "Diese Meldung wurde von Fix My Zürich entfernt." +msgstr "Diese Meldung wurde von Züri wie neu entfernt." #: perllib/FixMyStreet/App/Controller/Report.pm:111 msgid "That report has been removed from FixMyStreet." -msgstr "Diese Meldung wurde von Fix My Zürich entfernt." +msgstr "Diese Meldung wurde von Züri wie neu entfernt." #: templates/web/emptyhomes/static/about.html:7 msgid "The Empty Homes Agency" @@ -3371,7 +3422,7 @@ msgid "" "the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/default/auth/token.html:22 +#: templates/web/default/auth/token.html:19 #: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " @@ -3492,7 +3543,7 @@ msgid "" "give us permission." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:274 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" @@ -3513,6 +3564,7 @@ msgstr "" #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 #: templates/web/seesomething/auth/general.html:24 +#: templates/web/zurich/auth/general.html:28 msgid "" "There was a problem with your email/password combination. If you cannot " "remember your password, or do not have one, please fill in the ‘sign " @@ -3544,7 +3596,7 @@ msgid "" "change without warnings in the future." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 msgid "" "This email has been sent to both councils covering the location of the " "problem, as the user did not categorise it; please ignore it if you're not " @@ -3552,7 +3604,7 @@ msgid "" "problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 msgid "" "This email has been sent to several councils covering the location of the " "problem, as the category selected is provided for all of them; please ignore " @@ -3586,6 +3638,12 @@ msgid "" "to see the reports sent there." msgstr "" +#: templates/web/default/auth/token.html:9 +msgid "" +"This may be because the link is too old or already used, or the address was " +"not copied correctly." +msgstr "" + #: templates/web/default/report/banner.html:15 msgid "This problem has been closed" msgstr "" @@ -3612,6 +3670,8 @@ msgstr "Dieser Mangel ist in Bearbeitung" msgid "This problem is old and of unknown status." msgstr "Dieses Problem ist alt und hat einen unbekannten Status" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:65 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Überprüfung ausstehend" @@ -3628,23 +3688,23 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:298 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 #, fuzzy msgid "This report was submitted anonymously" msgstr "%s, gemeldet um %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" #: templates/web/default/admin/flagged.html:10 -#: templates/web/default/admin/reports.html:13 +#: templates/web/default/admin/reports.html:12 msgid "Title" msgstr "Titel" @@ -3660,7 +3720,7 @@ msgid "" "street name and area" msgstr "Geben Sie eine Adresse an" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:273 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3668,11 +3728,11 @@ msgstr "" #: templates/web/default/admin/questionnaire.html:24 #: templates/web/default/admin/stats.html:24 #: templates/web/default/admin/stats.html:43 +#: templates/web/zurich/admin/stats.html:30 msgid "Total" msgstr "Total" #: templates/web/seesomething/report/new/fill_in_details_form.html:24 -#, fuzzy msgid "Transport Category" msgstr "Kategorie" @@ -3689,11 +3749,11 @@ msgstr "Erneut versuchen" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/default/admin/update_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:32 -#: templates/web/zurich/admin/report_edit.html:52 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:58 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Unbestätigt" @@ -3736,7 +3796,7 @@ msgstr "" #: templates/web/default/admin/body-form.html:82 #: templates/web/zurich/admin/body-form.html:47 msgid "Update body" -msgstr "Beschreibung" +msgstr "Speichern" #: templates/web/default/admin/index.html:30 msgid "Update breakdown by state" @@ -3767,30 +3827,30 @@ msgstr "" msgid "Update:" msgstr "" -#: templates/web/zurich/admin/index-dm.html:24 -#: templates/web/zurich/admin/index-sdm.html:22 -#: templates/web/zurich/admin/reports.html:16 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:734 -#: perllib/FixMyStreet/App/Controller/Admin.pm:868 -#: perllib/FixMyStreet/App/Controller/Admin.pm:919 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:326 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:762 +#: perllib/FixMyStreet/App/Controller/Admin.pm:906 +#: perllib/FixMyStreet/App/Controller/Admin.pm:959 +#: perllib/FixMyStreet/App/Controller/Admin.pm:998 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:487 msgid "Updated!" msgstr "Aktualisiert!" -#: templates/web/default/admin/list_updates.html:1 +#: templates/web/default/admin/list_updates.html:2 #: templates/web/default/report/update.html:3 #: templates/web/fixmystreet/report/update.html:3 -#: templates/web/zurich/admin/list_updates.html:1 +#: templates/web/zurich/admin/list_updates.html:2 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Antwort" -#: perllib/FixMyStreet/DB/Result/Comment.pm:152 +#: perllib/FixMyStreet/DB/Result/Comment.pm:150 msgid "" "Updates are limited to 2000 characters in length. Please shorten your update" msgstr "" @@ -3808,18 +3868,18 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1256 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1296 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1228 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1268 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1095 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:151 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 #: templates/web/default/admin/flagged.html:30 -#: templates/web/zurich/header.html:68 +#: templates/web/zurich/header.html:69 msgid "Users" msgstr "" @@ -3830,8 +3890,8 @@ msgstr "" #: templates/web/default/admin/report_edit.html:12 #: templates/web/default/admin/update_edit.html:12 -#: templates/web/zurich/admin/report_edit-sdm.html:13 -#: templates/web/zurich/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:22 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Meldung auf der Webseite betrachten" @@ -3849,13 +3909,13 @@ msgstr "" #: templates/web/seesomething/around/display_location.html:0 #: templates/web/seesomething/around/display_location.html:16 msgid "Viewing a location" -msgstr "" +msgstr "Meldung erfassen" #: templates/web/bromley/report/display.html:0 #: templates/web/default/report/display.html:0 #: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" -msgstr "" +msgstr "Meldung anschauen" #: templates/web/default/reports/body.html:14 msgid "Wards of this council" @@ -3872,9 +3932,18 @@ msgstr "" "Ihre Anfrage ergab mehr als eine mögliche Adresse. Die ersten zehn " "Treffer werden unten aufgelistet." -#: templates/web/default/auth/token.html:19 +#: templates/web/default/auth/token.html:8 +#, fuzzy +msgid "We have not been able to confirm your account - sorry." +msgstr "" +"Sie werden in Kürze ein E-Mail erhalten um Ihren Account zu bestä" +"tigen." + +#: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." msgstr "" +"Sie werden in Kürze ein E-Mail erhalten um Ihren Account zu bestä" +"tigen." #: templates/web/emptyhomes/tokens/confirm_problem.html:18 #: templates/web/emptyhomes/tokens/confirm_problem.html:20 @@ -3896,7 +3965,7 @@ msgstr "Ihr E-Mail wird nie angezeigt" msgid "We never show your email address or phone number." msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "" "We realise this problem might be the responsibility of %s; however, we don't " "currently have any contact details for them. If you know of an appropriate " @@ -3946,7 +4015,7 @@ msgid "When edited" msgstr "Wann editiert" #: templates/web/default/admin/flagged.html:19 -#: templates/web/default/admin/reports.html:22 +#: templates/web/default/admin/reports.html:21 msgid "When sent" msgstr "Wann gesendet" @@ -4002,12 +4071,12 @@ msgstr "Jahr" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:5 -#: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 +#: templates/web/default/admin/list_updates.html:33 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:49 +#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/report_edit.html:52 #: templates/web/default/admin/update_edit.html:18 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 @@ -4046,7 +4115,7 @@ msgstr "" msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" "Danke! Sie können Ihre aktualisierte Meldung <a href=\"%s%s\">auf der " -"Webseite anschauen</a>" +"Webseite anschauen</a>." #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:13 @@ -4079,6 +4148,8 @@ msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." msgstr "" +"Sie haben bereits ein Photo angehängt. Laden Sie ein neues hoch um es " +"zu ersetzen." #: templates/web/bromley/report/display.html:108 #: templates/web/default/report/update-form.html:59 @@ -4113,7 +4184,7 @@ msgstr "" #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." -msgstr "Sie haben Ihre Meldung erfolgreich bestätigt" +msgstr "Sie haben Ihre Meldung erfolgreich bestätigt. " #: templates/web/default/tokens/confirm_problem.html:14 #: templates/web/default/tokens/confirm_problem.html:15 @@ -4148,7 +4219,7 @@ msgstr "" "Sie können Ihre Meldung bestätigen, indem Sie auf den Link im E-" "Mail klicken." -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:46 msgid "You really want to resend?" msgstr "" @@ -4157,7 +4228,7 @@ msgstr "" #: templates/web/fixmystreet/my/my.html:14 #: templates/web/fixmystreet/my/my.html:3 msgid "Your Reports" -msgstr "" +msgstr "Ihre Meldungen" #: templates/web/bromley/report/display.html:41 #: templates/web/bromley/report/display.html:43 @@ -4183,6 +4254,8 @@ msgstr "Passwort" #: templates/web/fixmystreet/auth/general.html:26 #: templates/web/fixmystreet/report/update-form.html:80 #: templates/web/seesomething/auth/general.html:26 +#: templates/web/zurich/auth/general.html:30 +#: templates/web/zurich/auth/general.html:56 msgid "Your email address" msgstr "Ihre E-Mail Adresse" @@ -4224,6 +4297,7 @@ msgstr "Ihr Name" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 #: templates/web/fixmystreet/report/update-form.html:140 #: templates/web/seesomething/report/new/fill_in_details_form.html:79 +#: templates/web/zurich/auth/general.html:59 #: templates/web/zurich/report/new/fill_in_details_form.html:104 msgid "Your name" msgstr "Ihr Name" @@ -4242,6 +4316,7 @@ msgstr "Ihr Name:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:166 #: templates/web/fixmystreet/report/update-form.html:94 #: templates/web/seesomething/auth/general.html:30 +#: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Ihr Passwort" @@ -4294,17 +4369,17 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "council ref: %s" msgstr "" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:27 -#: templates/web/zurich/admin/report_edit.html:48 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" msgstr "hat Karte nicht verwendet" -#: perllib/FixMyStreet/DB/Result/Comment.pm:197 +#: perllib/FixMyStreet/DB/Result/Comment.pm:195 #, fuzzy msgid "duplicate report" msgstr "Erfasse eine Meldung" @@ -4318,19 +4393,24 @@ msgstr "z.B. ‘%s’ oder ‘%s’" #: templates/web/default/admin/index.html:15 #: templates/web/zurich/admin/index.html:5 msgid "from %d different users" -msgstr "" +msgstr "von %d verschiedenen Personen" -#: perllib/Utils.pm:268 +#: templates/web/fixmystreet/report/_item.html:12 +#: templates/web/zurich/report/_item.html:16 +msgid "last updated %s" +msgstr "letzte Bearbeitung %s" + +#: perllib/Utils.pm:263 msgid "less than a minute" msgstr "weniger als einer Minute" -#: templates/web/default/report/updates.html:37 +#: templates/web/default/report/updates.html:38 msgid "marked as %s" msgstr "" #: templates/web/default/report/updates.html:27 msgid "marked as fixed" -msgstr "als gelöst markiert" +msgstr "als erledigt markiert" #: perllib/FixMyStreet/App/Controller/Admin.pm:128 #: templates/web/default/admin/questionnaire.html:15 @@ -4339,11 +4419,10 @@ msgid "n/a" msgstr "" #: templates/web/default/report/updates.html:32 -#, fuzzy msgid "no further action" -msgstr "Bearbeitung abschliessen" +msgstr "Abschliessen" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 +#: perllib/FixMyStreet/DB/Result/Comment.pm:193 msgid "not the council's responsibility" msgstr "" @@ -4359,16 +4438,16 @@ msgstr "oder automatisch lokalisieren" #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/zurich/admin/report_edit-sdm.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:18 -#: templates/web/zurich/admin/report_edit-sdm.html:23 -#: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit.html:35 -#: templates/web/zurich/admin/report_edit.html:37 -#: templates/web/zurich/admin/report_edit.html:44 -#: templates/web/zurich/admin/report_edit.html:46 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit-sdm.html:36 +#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "Originaltext: “%s”" @@ -4377,7 +4456,7 @@ msgid "other areas:" msgstr "" #: templates/web/default/report/updates.html:28 -#: templates/web/default/report/updates.html:35 +#: templates/web/default/report/updates.html:36 msgid "reopened" msgstr "" @@ -4409,17 +4488,21 @@ msgstr "" "Es wird keine Stecknadel angezeigt, da der User die Karte nicht benützt " "hat" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 +#: templates/web/default/report/updates.html:33 +msgid "third party responsibility" +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:240 +#: perllib/Utils.pm:235 msgid "today" msgstr "heute" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:27 -#: templates/web/zurich/admin/report_edit.html:48 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "used map" msgstr "Karte verwendet" @@ -4443,14 +4526,21 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> Meldung in letzter Zeit" msgstr[1] "<big>%s</big> Meldungen in letzter Zeit" -#: perllib/Utils.pm:287 +#: perllib/Utils.pm:282 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: perllib/Utils.pm:289 +#: templates/web/default/report/_support.html:6 +#, perl-format +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "" +msgstr[1] "" + +#: perllib/Utils.pm:284 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4471,7 +4561,7 @@ msgid_plural "" "We do not yet have details for the councils that cover this location." msgstr[0] "" -#: perllib/Utils.pm:283 +#: perllib/Utils.pm:278 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4503,7 +4593,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:285 +#: perllib/Utils.pm:280 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index a118ed890..98c925008 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: FixMyStreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-02-13 11:17+0000\n" +"POT-Creation-Date: 2013-03-11 18:53+0000\n" "PO-Revision-Date: 2012-09-14 00:22+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -22,8 +22,8 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "X-Poedit-Basepath: ../../../\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:649 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:355 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 msgid " and " msgstr " og " @@ -69,8 +69,8 @@ msgstr "%d aktive oppdateringer" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "%d spørreskjema sendt – %d besvart (%s%%)" -#: templates/web/default/report/_support.html:3 -msgid "%d supporters" +#: templates/web/default/pagination.html:10 +msgid "%d to %d of %d" msgstr "" #: templates/web/default/reports/body.html:0 @@ -78,7 +78,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s - oppsummeringsrapporter" -#: perllib/FixMyStreet/DB/Result/Problem.pm:698 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -86,7 +86,7 @@ msgstr "%s ref: %s" msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 #, fuzzy msgid "%s, reported at %s" msgstr "%s, rapportert av %s %s" @@ -133,15 +133,15 @@ msgstr "(alternativt kan RSS-strømmen tilpasses, innenfor" #: templates/web/default/around/around_map_list_items.html:12 #: templates/web/default/around/on_map_list_items.html:9 -#: templates/web/fixmystreet/report/_item.html:20 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/fixmystreet/report/_item.html:22 +#: templates/web/zurich/report/_item.html:21 msgid "(closed)" msgstr "(lukket)" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 -#: templates/web/fixmystreet/report/_item.html:18 -#: templates/web/zurich/report/_item.html:17 +#: templates/web/fixmystreet/report/_item.html:20 +#: templates/web/zurich/report/_item.html:19 msgid "(fixed)" msgstr "(løst)" @@ -151,7 +151,7 @@ msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" #: templates/web/default/reports/_list-entry.html:4 -#: templates/web/fixmystreet/report/_item.html:14 +#: templates/web/fixmystreet/report/_item.html:16 msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" @@ -163,7 +163,7 @@ msgstr "(valgfritt)" # Denne teksten er lite forklarende #: templates/web/default/reports/_list-entry.html:2 -#: templates/web/fixmystreet/report/_item.html:13 +#: templates/web/fixmystreet/report/_item.html:15 msgid "(sent to both)" msgstr "(sendt til begge)" @@ -177,19 +177,15 @@ msgstr "(vi viser aldri din e-postadresse)" #: perllib/FixMyStreet/App/Controller/Report/New.pm:634 #: perllib/FixMyStreet/App/Controller/Report/New.pm:661 -#: perllib/FixMyStreet/DB/Result/Problem.pm:431 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" #: perllib/FixMyStreet/App/Controller/Report/New.pm:615 -#: perllib/FixMyStreet/DB/Result/Problem.pm:437 +#: perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "-- Velg en eiendomsstype --" -#: templates/web/default/report/_support.html:3 -msgid "1 supporter" -msgstr "" - #: templates/web/default/questionnaire/completed.html:20 msgid "" "<p style=\"font-size:150%\">Thank you very much for filling in our " @@ -320,6 +316,7 @@ msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nei</strong> La meg bekrefte min oppdatering med e-post" #: templates/web/fixmystreet/auth/general.html:50 +#: templates/web/zurich/auth/general.html:49 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nei</strong>, la meg logge inn med e-post:" @@ -373,7 +370,7 @@ msgstr "" msgid "Add new category" msgstr "Legg til ny kategori" -#: templates/web/default/admin/users.html:35 +#: templates/web/default/admin/users.html:36 msgid "Add user" msgstr "" @@ -401,6 +398,7 @@ msgstr "Send meg varsel ved fremtidige oppdateringer" #: templates/web/default/reports/index.html:3 #: templates/web/fixmybarangay/reports/index.html:3 +#: templates/web/zurich/admin/stats.html:5 #: templates/web/zurich/reports/index.html:15 msgid "All Reports" msgstr "Alle rapporter" @@ -416,12 +414,14 @@ msgstr "Alle rapporter" #: templates/web/oxfordshire/header.html:67 #: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 #: templates/web/zurich/admin/index-dm.html:12 +#: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Alle rapporter" #: templates/web/default/admin/stats.html:5 +#: templates/web/zurich/admin/stats.html:8 #, fuzzy msgid "All reports between %s and %s" msgstr "%srapporter mellom %s og %s" @@ -472,12 +472,12 @@ msgid "An update marked this problem as fixed." msgstr "En oppdatering markerte dette problemet som fikset." #: templates/web/default/admin/flagged.html:15 -#: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/reports.html:18 +#: templates/web/default/admin/list_updates.html:11 +#: templates/web/default/admin/reports.html:17 msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/admin/update_edit.html:17 msgid "Anonymous:" msgstr "Anonym:" @@ -505,19 +505,21 @@ msgstr "Der du fra den lokale administrasjonen?" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:109 +#: templates/web/zurich/admin/report_edit.html:117 +#: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/report_edit.html:126 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:150 -#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/report_edit.html:103 +#: templates/web/zurich/admin/report_edit.html:158 msgid "Assign to subdivision:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:98 #: templates/web/zurich/report/updates.html:11 #, fuzzy msgid "Assigned to %s" @@ -537,8 +539,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "For øyeblikket er det kun søk etter og å se på rapporter som fungerer." -#: perllib/FixMyStreet/DB/Result/Problem.pm:386 -#: templates/web/zurich/report/_item.html:9 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" @@ -556,14 +558,14 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:204 #: templates/web/default/admin/bodies.html:1 -#: templates/web/zurich/header.html:63 +#: templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" -#: templates/web/default/admin/reports.html:16 +#: templates/web/default/admin/reports.html:15 #: templates/web/default/admin/users.html:14 msgid "Body" msgstr "" @@ -597,15 +599,16 @@ msgstr "" #: templates/web/default/admin/body.html:35 #: templates/web/default/admin/flagged.html:14 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/reports.html:17 +#: templates/web/default/admin/reports.html:16 #: templates/web/default/report/new/category.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 #: templates/web/seesomething/report/new/category.html:6 #: templates/web/southampton/report/new/category.html:3 #: templates/web/zurich/admin/body.html:13 -#: templates/web/zurich/admin/index-dm.html:22 -#: templates/web/zurich/admin/index-sdm.html:20 -#: templates/web/zurich/admin/reports.html:14 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/stats.html:50 #: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategori" @@ -616,16 +619,16 @@ msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/report_edit.html:36 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 -#: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit.html:108 +#: templates/web/zurich/admin/report_edit-sdm.html:42 +#: templates/web/zurich/admin/report_edit.html:116 msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:348 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 msgid "Category: %s" msgstr "Kategori: %s" @@ -640,21 +643,23 @@ msgstr "Bytt passord" msgid "Click map to report a problem" msgstr "Klikk i kartet for å rapportere et problem" -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:28 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:75 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/fixmystreet/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:85 -#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:90 +#: templates/web/zurich/admin/report_edit.html:92 +#: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:791 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Closed by council" msgstr "(ikke rapportert til administrasjonen)" @@ -672,23 +677,23 @@ msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "De nærmeste problemene <small>(innenfor %skm)</small>" #: templates/web/default/admin/report_edit.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:46 msgid "Co-ordinates:" msgstr "Koordinater:" #: templates/web/default/admin/flagged.html:16 -#: templates/web/default/admin/list_updates.html:13 -#: templates/web/default/admin/reports.html:19 +#: templates/web/default/admin/list_updates.html:14 +#: templates/web/default/admin/reports.html:18 msgid "Cobrand" msgstr "Merkevaresamarbeid" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:50 #: templates/web/default/admin/update_edit.html:44 msgid "Cobrand data:" msgstr "Merkevaresamarbeidsdata:" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:49 #: templates/web/default/admin/update_edit.html:43 msgid "Cobrand:" msgstr "Merkevaresamarbeid:" @@ -735,6 +740,7 @@ msgstr "Bekreftelse" #: templates/web/default/admin/body.html:85 #: templates/web/default/admin/body_edit.html:32 #: templates/web/default/admin/body_edit.html:84 +#: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Bekreftet" @@ -744,7 +750,7 @@ msgid "Confirmed reports between %s and %s" msgstr "%srapporter mellom %s og %s" #: templates/web/default/admin/problem_row.html:25 -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:45 msgid "Confirmed:" msgstr "Bekreftet:" @@ -773,8 +779,8 @@ msgstr "Kontakt oss" msgid "Contact the team" msgstr "Kontakt prosjektgruppen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1224 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1252 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 msgid "Could not find user" msgstr "Kunne ikke finne bruker" @@ -783,7 +789,7 @@ msgid "Could not look up location" msgstr "" #: templates/web/default/admin/flagged.html:13 -#: templates/web/default/admin/list_updates.html:12 +#: templates/web/default/admin/list_updates.html:13 msgid "Council" msgstr "Administrasjon" @@ -799,6 +805,8 @@ msgstr "Administrasjon:" #: templates/web/default/admin/stats.html:12 #: templates/web/default/admin/stats.html:32 +#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats.html:50 msgid "Count" msgstr "Antall" @@ -812,16 +820,16 @@ msgid "Create category" msgstr "Lag kategori" #: templates/web/default/admin/flagged.html:17 -#: templates/web/default/admin/list_updates.html:9 -#: templates/web/default/admin/reports.html:20 -#: templates/web/zurich/admin/list_updates.html:6 +#: templates/web/default/admin/list_updates.html:10 +#: templates/web/default/admin/reports.html:19 +#: templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "Opprettet" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:44 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:34 -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit-sdm.html:47 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Opprettet:" @@ -835,6 +843,10 @@ msgstr "Gjeldende tilstand" msgid "Dashboard" msgstr "Oversikt" +#: templates/web/zurich/admin/stats.html:35 +msgid "Dealt with by subdivision within 5 working days" +msgstr "" + #: templates/web/default/admin/body.html:38 #: templates/web/default/admin/body.html:88 #: templates/web/default/admin/body_edit.html:37 @@ -842,9 +854,9 @@ msgstr "Oversikt" msgid "Deleted" msgstr "Slettet" -#: templates/web/zurich/admin/index-dm.html:21 -#: templates/web/zurich/admin/index-sdm.html:19 -#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/index-dm.html:22 +#: templates/web/zurich/admin/index-sdm.html:20 +#: templates/web/zurich/admin/reports.html:12 msgid "Description" msgstr "" @@ -859,9 +871,9 @@ msgstr "Detaljer" #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/admin/report_edit-sdm.html:14 -#: templates/web/zurich/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Details:" msgstr "Detaljer:" @@ -899,10 +911,10 @@ msgstr "Vet ikke" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:35 +#: templates/web/default/admin/list_updates.html:36 #: templates/web/default/admin/problem_row.html:31 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:35 +#: templates/web/zurich/admin/problem_row.html:36 msgid "Edit" msgstr "Rediger" @@ -913,6 +925,7 @@ msgstr "" #: templates/web/default/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:1 +#: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:4 msgid "Editing problem %d" @@ -937,22 +950,24 @@ msgstr "Oppdatert av" #: templates/web/default/admin/body_edit.html:83 #: templates/web/default/admin/flagged.html:12 #: templates/web/default/admin/flagged.html:35 -#: templates/web/default/admin/list_updates.html:8 -#: templates/web/default/admin/reports.html:15 +#: templates/web/default/admin/list_updates.html:9 +#: templates/web/default/admin/reports.html:14 #: templates/web/default/admin/users.html:13 #: templates/web/fixmystreet/auth/general.html:20 #: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/seesomething/auth/general.html:20 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/auth/general.html:24 +#: templates/web/zurich/auth/general.html:52 msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1240 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1237 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" @@ -966,18 +981,18 @@ msgstr "Send meg oppdateringer" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/admin/update_edit.html:27 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 -#: templates/web/zurich/admin/report_edit-sdm.html:31 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit.html:57 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:301 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 #, fuzzy msgid "Email: %s" msgstr "E-post:" @@ -1059,6 +1074,7 @@ msgstr "Skriv inn et nytt passord:" #: templates/web/fixmystreet/auth/general.html:61 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 #: templates/web/fixmystreet/report/update-form.html:122 +#: templates/web/zurich/auth/general.html:63 msgid "Enter a password" msgstr "Skriv inn et nytt passord" @@ -1085,7 +1101,7 @@ msgstr "Eksempel-postnummer %s" msgid "Examples:" msgstr "Eksempler:" -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:51 msgid "Extra data:" msgstr "Ekstra data:" @@ -1162,8 +1178,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:84 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:28 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/default/report/update-form.html:30 @@ -1174,13 +1190,13 @@ msgstr "" msgid "Fixed" msgstr "Løst" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 msgid "Fixed - Council" msgstr "Løst - Administrasjon" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 msgid "Fixed - User" msgstr "Løst - Bruker" @@ -1196,12 +1212,12 @@ msgstr "Løst:" msgid "Flag user" msgstr "Flag bruker" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Flagget:" -#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:53 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "Flagget:" @@ -1230,7 +1246,6 @@ msgstr "Ditt passord" #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 #: templates/web/oxfordshire/faq/faq-en-gb.html:1 -#: templates/web/zurich/faq/faq-de-ch.html:1 msgid "Frequently Asked Questions" msgstr "Ofte spurte spørsmål" @@ -1267,15 +1282,15 @@ msgstr "Gi meg en RSS-strøm" #: templates/web/default/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 #: templates/web/seesomething/around/postcode_form.html:10 +#: templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "Fortsett" -#: templates/web/default/admin/report_edit.html:49 +#: templates/web/default/admin/report_edit.html:52 msgid "Going to send questionnaire?" msgstr "Skal det sendes spørreskjema?" #: templates/web/default/admin/index.html:24 -#: templates/web/zurich/admin/index.html:11 msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt på status over tid" @@ -1310,7 +1325,9 @@ msgstr "" #: templates/web/oxfordshire/header.html:75 #: templates/web/reading/footer.html:10 #: templates/web/seesomething/footer.html:13 -#: templates/web/stevenage/footer.html:47 templates/web/zurich/footer.html:21 +#: templates/web/stevenage/footer.html:47 +#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "Hjelp" @@ -1331,13 +1348,14 @@ msgstr "" msgid "Hi %s" msgstr "Hei, %s" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:80 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Skjul" @@ -1366,7 +1384,7 @@ msgstr "Hvordan rapportere et problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:699 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." @@ -1391,12 +1409,12 @@ msgstr "" "webadressen fra en e-post, sjekk at du har kopiert den korrekt.\n" #: templates/web/default/admin/flagged.html:9 -#: templates/web/default/admin/list_updates.html:5 -#: templates/web/default/admin/reports.html:12 -#: templates/web/zurich/admin/index-dm.html:20 -#: templates/web/zurich/admin/index-sdm.html:18 -#: templates/web/zurich/admin/list_updates.html:5 -#: templates/web/zurich/admin/reports.html:12 +#: templates/web/default/admin/list_updates.html:6 +#: templates/web/default/admin/reports.html:11 +#: templates/web/zurich/admin/index-dm.html:21 +#: templates/web/zurich/admin/index-sdm.html:19 +#: templates/web/zurich/admin/list_updates.html:6 +#: templates/web/zurich/admin/reports.html:11 msgid "ID" msgstr "ID" @@ -1436,7 +1454,7 @@ msgstr "" "inn din rapport, slik at vi kan vise administrasjonen aktiviteten i deres " "område." -#: templates/web/default/auth/token.html:25 +#: templates/web/default/auth/token.html:22 #: templates/web/default/email_sent.html:9 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " @@ -1489,12 +1507,13 @@ msgstr "" "del av description), interface_used, comment_count, requestor_name (kun " "tilstede hvis innsender tillot at navnet kunne vises på dette nettstedet)." -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:28 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:78 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:89 +#: templates/web/zurich/admin/report_edit.html:94 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "Under arbeid" @@ -1504,7 +1523,7 @@ msgstr "Under arbeid" msgid "Incident Category" msgstr "Kategori" -#: templates/web/zurich/admin/report_edit.html:128 +#: templates/web/zurich/admin/report_edit.html:136 #, fuzzy msgid "Include reporter personal details" msgstr "Legg inn opplysninger om problemet" @@ -1517,8 +1536,8 @@ msgstr "Inkluder ubekreftede problemer" msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi \"%s\"" -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:71 +#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit.html:76 msgid "Internal notes:" msgstr "" @@ -1526,7 +1545,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1051 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1534,14 +1553,14 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1001 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 msgid "Invalid start date" msgstr "Ugyldig startdato" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/default/report/update-form.html:30 @@ -1573,6 +1592,7 @@ msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:172 #: templates/web/fixmystreet/report/update-form.html:100 #: templates/web/seesomething/auth/general.html:35 +#: templates/web/zurich/auth/general.html:39 msgid "Keep me signed in on this computer" msgstr "Husk min innlogging på denne datamaskinen" @@ -1587,7 +1607,7 @@ msgstr "Etternavn" msgid "Last editor" msgstr "Sist redigert av" -#: templates/web/default/admin/report_edit.html:44 +#: templates/web/default/admin/report_edit.html:47 msgid "Last update:" msgstr "Siste oppdatering:" @@ -1675,6 +1695,10 @@ msgstr "Melding:" msgid "Missing jurisdiction_id" msgstr "Mangler jurisdiction_id" +#: templates/web/zurich/admin/stats.html:34 +msgid "Moderated by division within one working day" +msgstr "" + #: templates/web/default/admin/stats.html:11 msgid "Month" msgstr "Måned" @@ -1687,8 +1711,8 @@ msgstr "Flere problemer i nærheten" #: templates/web/default/admin/body-form.html:4 #: templates/web/default/admin/flagged.html:11 #: templates/web/default/admin/flagged.html:34 -#: templates/web/default/admin/list_updates.html:7 -#: templates/web/default/admin/reports.html:14 +#: templates/web/default/admin/list_updates.html:8 +#: templates/web/default/admin/reports.html:13 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 #: templates/web/emptyhomes/reports/index.html:10 @@ -1700,6 +1724,7 @@ msgstr "Flere problemer i nærheten" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:187 #: templates/web/fixmystreet/report/update-form.html:136 #: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/auth/general.html:58 #: templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "Name" msgstr "Navn" @@ -1709,15 +1734,16 @@ msgstr "Navn" msgid "Name (optional)" msgstr "(valgfritt)" -#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:30 -#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Navn:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 #, fuzzy msgid "Name: %s" msgstr "Navn:" @@ -1753,7 +1779,7 @@ msgstr "" "Nærmeste vei til nålen plassert på kartet (automatisk generert ved hjelp av " "Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:266 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1846,7 +1872,7 @@ msgstr "Nye rapporter innenfor grensen til {{NAME}} på reportemptyhomes.com" msgid "New state" msgstr "Ny tilstand" -#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit-sdm.html:59 #, fuzzy msgid "New update:" msgstr "Få oppdateringer" @@ -1857,16 +1883,20 @@ msgstr "Få oppdateringer" msgid "New!" msgstr "Ny!" +#: templates/web/default/pagination.html:13 +msgid "Next" +msgstr "" + #: templates/web/default/admin/body.html:50 #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:4 -#: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 +#: templates/web/default/admin/list_updates.html:33 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:36 -#: templates/web/default/admin/report_edit.html:49 +#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/report_edit.html:52 #: templates/web/default/admin/update_edit.html:19 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:111 @@ -1884,7 +1914,7 @@ msgstr "" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:414 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "Ingen administrasjon er valgt" @@ -1900,7 +1930,7 @@ msgstr "Ingen flaggede problemer ble funnet" msgid "No flagged users found" msgstr "Ingen flaggede brukere ble funnet" -#: templates/web/zurich/admin/report_edit-sdm.html:52 +#: templates/web/zurich/admin/report_edit-sdm.html:65 #, fuzzy msgid "No further updates" msgstr "Dine oppdateringer" @@ -1919,7 +1949,8 @@ msgstr "Ingen problemer er rapportert" msgid "No result returned" msgstr "" -#: templates/web/default/report/_support.html:3 +#: templates/web/default/report/_support.html:2 +#: templates/web/default/report/_support.html:4 msgid "No supporters" msgstr "" @@ -1928,8 +1959,8 @@ msgid "Non Public" msgstr "" #: templates/web/default/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 msgid "None" msgstr "Ingen" @@ -1942,7 +1973,7 @@ msgstr "Ingen" msgid "Not Responsible" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:10 +#: templates/web/zurich/admin/report_edit-sdm.html:21 msgid "Not for my subdivision" msgstr "" @@ -2041,16 +2072,17 @@ msgstr "Eldre løste" msgid "Older problems" msgstr "Eldre problemer" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/update_edit.html:22 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:78 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:83 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2089,12 +2121,12 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 #: perllib/FixMyStreet/App/Controller/Report/New.pm:661 #: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: perllib/FixMyStreet/DB/Result/Problem.pm:623 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:343 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:356 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 msgid "Other" msgstr "Annet" @@ -2106,7 +2138,7 @@ msgstr "" "Vår kildekode er fri programvare og <a href=\"http://github.com/mysociety/" "fixmystreet\">tilgjengelig på GitHub</a>." -#: templates/web/default/admin/list_updates.html:11 +#: templates/web/default/admin/list_updates.html:12 msgid "Owner" msgstr "Eier" @@ -2120,8 +2152,8 @@ msgstr "Fant ikke siden" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 msgid "Partial" msgstr "Delvis" @@ -2130,6 +2162,8 @@ msgstr "Delvis" #: templates/web/fixmystreet/auth/general.html:59 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:208 #: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/zurich/auth/general.html:32 +#: templates/web/zurich/auth/general.html:61 msgid "Password (optional)" msgstr "Passord (valgfritt)" @@ -2146,12 +2180,13 @@ msgstr "Passord:" msgid "Phone number (optional)" msgstr "Telefonnummer (valgfritt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:265 -#: templates/web/default/admin/report_edit.html:40 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 +#: templates/web/default/admin/report_edit.html:43 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" @@ -2160,6 +2195,7 @@ msgstr "Telefon:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 #: templates/web/fixmystreet/report/update-form.html:59 #: templates/web/seesomething/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/admin/stats.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" msgstr "Bilde" @@ -2180,15 +2216,15 @@ msgstr "Bilder av nye problemer i nærheten" msgid "Place pin on map" msgstr "" -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:84 msgid "Planned" msgstr "Planlagt" @@ -2211,7 +2247,7 @@ msgstr "Vær høflig, poengtert og kortfattet." msgid "Please check the passwords and try again" msgstr "Vennligst sjekk passordene og prøv igjen" -#: templates/web/default/auth/token.html:17 +#: templates/web/default/auth/token.html:14 msgid "Please check your email" msgstr "Vennligst sjekk e-posten du oppgav" @@ -2221,6 +2257,8 @@ msgstr "Vennligst sjekk e-posten du oppgav" #: templates/web/fixmystreet/auth/general.html:9 #: templates/web/seesomething/auth/general.html:15 #: templates/web/seesomething/auth/general.html:9 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" @@ -2228,12 +2266,12 @@ msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" #: perllib/FixMyStreet/App/Controller/Report/New.pm:852 #: perllib/FixMyStreet/App/Controller/Report/New.pm:871 #: perllib/FixMyStreet/App/Controller/Report/New.pm:914 -#: perllib/FixMyStreet/DB/Result/Problem.pm:433 +#: perllib/FixMyStreet/DB/Result/Problem.pm:420 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Velg en kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:439 +#: perllib/FixMyStreet/DB/Result/Problem.pm:426 msgid "Please choose a property type" msgstr "Velg en type egenskap" @@ -2283,7 +2321,7 @@ msgstr "" msgid "Please do not give address or personal information in this section." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:147 +#: perllib/FixMyStreet/DB/Result/Comment.pm:145 #: templates/web/default/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Vennligst legg til en melding" @@ -2294,7 +2332,7 @@ msgid "Please enter a password" msgstr "Skriv inn et passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:408 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" @@ -2312,7 +2350,7 @@ msgstr "Legg til en gyldig e-post" msgid "Please enter a valid email address" msgstr "Legg inn din e-post" -#: perllib/FixMyStreet/DB/Result/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/default/js/translation_strings.html:4 #: templates/web/seesomething/js/translation_strings.html:2 msgid "Please enter some details" @@ -2329,6 +2367,8 @@ msgstr "Legg inn opplysninger om problemet" #: templates/web/seesomething/auth/general.html:14 #: templates/web/seesomething/auth/general.html:9 #: templates/web/seesomething/js/translation_strings.html:9 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Legg inn din e-post" @@ -2343,7 +2383,7 @@ msgstr "Vennligst tast inn din e-postadresse" msgid "Please enter your first name" msgstr "Vennligst tast inn ditt fornavn" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:413 #: templates/web/default/js/translation_strings.html:7 #: templates/web/seesomething/js/translation_strings.html:4 msgid "" @@ -2355,8 +2395,8 @@ msgstr "" "under" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 -#: perllib/FixMyStreet/DB/Result/Comment.pm:144 -#: perllib/FixMyStreet/DB/Result/Problem.pm:419 +#: perllib/FixMyStreet/DB/Result/Comment.pm:142 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" @@ -2578,9 +2618,13 @@ msgstr "Lagt inn av %s (<strong>%s</strong>) %s" msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" +#: templates/web/default/pagination.html:7 +msgid "Previous" +msgstr "" + #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:54 msgid "Private" msgstr "" @@ -2606,11 +2650,11 @@ msgid "Problem %s sent to council %s" msgstr "Problem %s sendt til administrasjon %s" #: templates/web/default/admin/index.html:28 -#: templates/web/zurich/admin/index.html:15 +#: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:916 msgid "Problem marked as open." msgstr "Problem markert som åpent." @@ -2674,6 +2718,7 @@ msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" "Eiendommer nylig rapportert som gått tilbake i bruk på reportemptyhomes.com" +#: templates/web/default/admin/report_edit.html:26 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 #, fuzzy msgid "Property address:" @@ -2725,15 +2770,17 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:160 +#: templates/web/zurich/admin/report_edit.html:168 +#: templates/web/zurich/admin/report_edit.html:176 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:67 +#: templates/web/zurich/admin/report_edit.html:72 +#: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:170 +#: templates/web/zurich/admin/report_edit.html:184 msgid "Publish the response" msgstr "" @@ -2876,7 +2923,7 @@ msgstr "" msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:62 +#: templates/web/default/admin/report_edit.html:64 #: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" @@ -2935,7 +2982,7 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:606 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2947,25 +2994,25 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:620 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported by %s by %s at %s" msgstr "Rapporter av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:594 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:601 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -2974,11 +3021,11 @@ msgstr "Rapportert av %s i kategorien %s av %s %s" msgid "Reported in the %s category" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:589 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -2998,15 +3045,15 @@ msgstr "Rapportert i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1092 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 #: templates/web/seesomething/admin/stats.html:1 -#: templates/web/zurich/header.html:59 +#: templates/web/zurich/header.html:60 #, fuzzy msgid "Reports" msgstr "Alle rapporter" -#: perllib/FixMyStreet/DB/Result/Problem.pm:445 +#: perllib/FixMyStreet/DB/Result/Problem.pm:432 msgid "" "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" @@ -3025,7 +3072,7 @@ msgstr "Problemer i og rundt kartet" msgid "Reports published" msgstr "Rapporter misbruk" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:46 msgid "Resend report" msgstr "Send rapport på nytt" @@ -3045,13 +3092,16 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" -#: templates/web/default/admin/report_edit.html:58 -#: templates/web/zurich/admin/report_edit.html:63 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1342 +#: templates/web/default/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:68 msgid "Rotate Left" msgstr "" -#: templates/web/default/admin/report_edit.html:59 -#: templates/web/zurich/admin/report_edit.html:64 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: templates/web/default/admin/report_edit.html:61 +#: templates/web/zurich/admin/report_edit.html:69 msgid "Rotate Right" msgstr "" @@ -3069,7 +3119,7 @@ msgstr "Søk i rapporter" msgid "Search Users" msgstr "Søk i brukere" -#: templates/web/zurich/header.html:73 +#: templates/web/zurich/header.html:77 #, fuzzy msgid "Search reports" msgstr "Søk i rapporter" @@ -3099,15 +3149,16 @@ msgstr "" "Velg hvilken type varsel du ønsker og klikk på knappen for en RSS-kilde, " "eller skriv inn din e-postadresse for å abonnere på et e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:46 msgid "Sent:" msgstr "Sendt:" -#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:48 +#: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Tjeneste:" @@ -3166,6 +3217,8 @@ msgstr "Vis nåler" #: templates/web/seesomething/auth/general.html:3 #: templates/web/seesomething/auth/general.html:39 #: templates/web/stevenage/header.html:101 +#: templates/web/zurich/auth/general.html:18 +#: templates/web/zurich/auth/general.html:35 msgid "Sign in" msgstr "Logg inn" @@ -3176,6 +3229,7 @@ msgstr "Logg inn via epost" #: templates/web/default/auth/general.html:1 #: templates/web/fixmystreet/auth/general.html:1 #: templates/web/seesomething/auth/general.html:1 +#: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Logg inn eller opprett en konto" @@ -3262,29 +3316,31 @@ msgstr "Startmåned:" #: templates/web/bromley/report/display.html:78 #: templates/web/default/admin/flagged.html:18 -#: templates/web/default/admin/list_updates.html:6 -#: templates/web/default/admin/reports.html:21 +#: templates/web/default/admin/list_updates.html:7 +#: templates/web/default/admin/reports.html:20 #: templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "Tilstand" -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:41 -#: templates/web/zurich/admin/report_edit.html:74 +#: templates/web/zurich/admin/report_edit-sdm.html:54 +#: templates/web/zurich/admin/report_edit.html:79 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1097 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 #: templates/web/default/admin/stats.html:1 +#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" msgstr "Statistikk" -#: templates/web/zurich/admin/index-dm.html:25 -#: templates/web/zurich/admin/index-sdm.html:23 -#: templates/web/zurich/admin/reports.html:17 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 #, fuzzy msgid "Status" msgstr "Statistikk" @@ -3293,7 +3349,7 @@ msgstr "Statistikk" msgid "Still open, via questionnaire, %s" msgstr "Fortsatt åpen via spørreskjema, %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:352 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 #, fuzzy msgid "Subcategory: %s" msgstr "Kategori: %s" @@ -3312,7 +3368,7 @@ msgstr "Emne" #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:31 +#: templates/web/zurich/admin/report_edit.html:34 msgid "Subject:" msgstr "Emne:" @@ -3332,11 +3388,11 @@ msgstr "Emne:" msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:65 +#: templates/web/default/admin/report_edit.html:67 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:51 -#: templates/web/zurich/admin/report_edit.html:172 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:186 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Send inn endringer" @@ -3346,14 +3402,15 @@ msgstr "Send inn endringer" msgid "Submit questionnaire" msgstr "Send inn spørreskjema" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:77 -#: templates/web/zurich/admin/reports.html:15 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 #, fuzzy msgid "Submitted" @@ -3380,12 +3437,13 @@ msgstr "" "Eller du kan abonnere på varsel basert på bydel eller administrasjon du " "hører inn under:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:136 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 -#: templates/web/zurich/admin/index.html:1 templates/web/zurich/header.html:56 +#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 +#: templates/web/zurich/header.html:57 msgid "Summary" msgstr "Oppsummering" @@ -3399,7 +3457,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1094 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 #, fuzzy msgid "Survey" msgstr "Resultater fra spørreundersøkelsen" @@ -3408,8 +3466,8 @@ msgstr "Resultater fra spørreundersøkelsen" msgid "Survey Results" msgstr "Resultater fra spørreundersøkelsen" -#: templates/web/default/admin/list_updates.html:14 -#: templates/web/zurich/admin/list_updates.html:7 +#: templates/web/default/admin/list_updates.html:15 +#: templates/web/zurich/admin/list_updates.html:8 msgid "Text" msgstr "Tekst" @@ -3505,7 +3563,7 @@ msgstr "" "utenfor lander - vennligst forsøk et annet sted." # Should this be "Norge" or "Storbritannia" ? -#: perllib/FixMyStreet/App/Controller/Location.pm:121 +#: perllib/FixMyStreet/App/Controller/Location.pm:123 msgid "That location does not appear to be in the UK; please try again." msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen." @@ -3514,7 +3572,7 @@ msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen." msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:642 +#: perllib/FixMyStreet/App/Controller/Admin.pm:670 msgid "That problem will now be resent." msgstr "Det problemet vil nå bli sendt på nytt." @@ -3557,7 +3615,7 @@ msgstr "" "administrasjonene som mottok problemrapporten, noe som ikke helt stemmer med " "hvordan atributten er definert i Open311 v2-spesifikasjonen." -#: templates/web/default/auth/token.html:22 +#: templates/web/default/auth/token.html:19 #: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " @@ -3697,7 +3755,7 @@ msgstr "" "Tittelen og detaljene for problemet vil bli offentlig, pluss navnet ditt\n" "hvis du gir oss tillatelse til det." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:274 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" @@ -3722,6 +3780,7 @@ msgstr "Det var problemer med å vise denne siden. Vennligst prøv igjen senere. #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 #: templates/web/seesomething/auth/general.html:24 +#: templates/web/zurich/auth/general.html:28 msgid "" "There was a problem with your email/password combination. If you cannot " "remember your password, or do not have one, please fill in the ‘sign " @@ -3758,7 +3817,7 @@ msgstr "" "Denne API-implementasjonen er under arbeid og ennå ikke stabil. Den vil " "endre seg uten advarsel i fremtiden." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 msgid "" "This email has been sent to both councils covering the location of the " "problem, as the user did not categorise it; please ignore it if you're not " @@ -3771,7 +3830,7 @@ msgstr "" "eller gi oss beskjed om hvilken kategori av problemer dette er så vi kan " "legge det til i vårt system." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 msgid "" "This email has been sent to several councils covering the location of the " "problem, as the category selected is provided for all of them; please ignore " @@ -3816,6 +3875,12 @@ msgstr "" "Dette er en opplisting av alle problemene i denne tjenesten; velg en bestemt " "administrasjon for å se problemer som er sendt dit." +#: templates/web/default/auth/token.html:9 +msgid "" +"This may be because the link is too old or already used, or the address was " +"not copied correctly." +msgstr "" + #: templates/web/default/report/banner.html:15 msgid "This problem has been closed" msgstr "Dette problemet er lukket" @@ -3842,6 +3907,8 @@ msgstr "Dette problemet er under arbeid" msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammel og med ukjent status." +#: perllib/FixMyStreet/Cobrand/Zurich.pm:65 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: templates/web/zurich/report/_main.html:14 #, fuzzy msgid "This report is awaiting moderation." @@ -3859,24 +3926,24 @@ msgstr "Denne rapporten er for tiden markert som fikset." msgid "This report is currently marked as open." msgstr "Denne rapporten er for tiden markert som åpen." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:298 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 #, fuzzy msgid "This report was submitted anonymously" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" #: templates/web/default/admin/flagged.html:10 -#: templates/web/default/admin/reports.html:13 +#: templates/web/default/admin/reports.html:12 msgid "Title" msgstr "Tittel" @@ -3894,7 +3961,7 @@ msgid "" msgstr "" "Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller sted" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:273 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "To view a map of the precise location of this issue" msgstr "For å se en kart med en mer presis plassering for dette problemet." @@ -3902,6 +3969,7 @@ msgstr "For å se en kart med en mer presis plassering for dette problemet." #: templates/web/default/admin/questionnaire.html:24 #: templates/web/default/admin/stats.html:24 #: templates/web/default/admin/stats.html:43 +#: templates/web/zurich/admin/stats.html:30 msgid "Total" msgstr "Totalt" @@ -3923,11 +3991,11 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/default/admin/update_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:32 -#: templates/web/zurich/admin/report_edit.html:52 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:58 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Ubekreftet" @@ -4003,31 +4071,31 @@ msgstr "Oppdater tilstanden" msgid "Update:" msgstr "Oppdatering:" -#: templates/web/zurich/admin/index-dm.html:24 -#: templates/web/zurich/admin/index-sdm.html:22 -#: templates/web/zurich/admin/reports.html:16 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 #, fuzzy msgid "Updated" msgstr "Oppdatert!" -#: perllib/FixMyStreet/App/Controller/Admin.pm:734 -#: perllib/FixMyStreet/App/Controller/Admin.pm:868 -#: perllib/FixMyStreet/App/Controller/Admin.pm:919 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:326 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:762 +#: perllib/FixMyStreet/App/Controller/Admin.pm:906 +#: perllib/FixMyStreet/App/Controller/Admin.pm:959 +#: perllib/FixMyStreet/App/Controller/Admin.pm:998 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:487 msgid "Updated!" msgstr "Oppdatert!" -#: templates/web/default/admin/list_updates.html:1 +#: templates/web/default/admin/list_updates.html:2 #: templates/web/default/report/update.html:3 #: templates/web/fixmystreet/report/update.html:3 -#: templates/web/zurich/admin/list_updates.html:1 +#: templates/web/zurich/admin/list_updates.html:2 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Oppdateringer" -#: perllib/FixMyStreet/DB/Result/Comment.pm:152 +#: perllib/FixMyStreet/DB/Result/Comment.pm:150 msgid "" "Updates are limited to 2000 characters in length. Please shorten your update" msgstr "" @@ -4045,18 +4113,18 @@ msgstr "Oppdateringer av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringer til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1256 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1296 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1228 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1268 msgid "User flagged" msgstr "Bruker flagget" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1095 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:151 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 #: templates/web/default/admin/flagged.html:30 -#: templates/web/zurich/header.html:68 +#: templates/web/zurich/header.html:69 msgid "Users" msgstr "Brukere" @@ -4067,8 +4135,8 @@ msgstr "Verdier oppdatert" #: templates/web/default/admin/report_edit.html:12 #: templates/web/default/admin/update_edit.html:12 -#: templates/web/zurich/admin/report_edit-sdm.html:13 -#: templates/web/zurich/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:22 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Se rapport på nettstedet" @@ -4109,7 +4177,13 @@ 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." -#: templates/web/default/auth/token.html:19 +#: templates/web/default/auth/token.html:8 +#, fuzzy +msgid "We have not been able to confirm your account - sorry." +msgstr "" +"Vi har sendt deg en epost som inneholder link for å bekrefte din konto." + +#: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." msgstr "" "Vi har sendt deg en epost som inneholder link for å bekrefte din konto." @@ -4136,7 +4210,7 @@ msgstr "Vi viser aldri din e-postadresse" msgid "We never show your email address or phone number." msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "" "We realise this problem might be the responsibility of %s; however, we don't " "currently have any contact details for them. If you know of an appropriate " @@ -4195,7 +4269,7 @@ msgid "When edited" msgstr "Når redigert" #: templates/web/default/admin/flagged.html:19 -#: templates/web/default/admin/reports.html:22 +#: templates/web/default/admin/reports.html:21 msgid "When sent" msgstr "Når sendt" @@ -4261,12 +4335,12 @@ msgstr "År" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:5 -#: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 +#: templates/web/default/admin/list_updates.html:33 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:49 +#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/report_edit.html:52 #: templates/web/default/admin/update_edit.html:18 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 @@ -4426,7 +4500,7 @@ msgstr "" "Du må nå åpne lenken i e-posten vi akkurat sendte deg — dersom du ikke " "gjør det, %s" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:46 msgid "You really want to resend?" msgstr "Ønsker du virkelig å sende på nytt?" @@ -4461,6 +4535,8 @@ msgstr "Passord (valgfritt)" #: templates/web/fixmystreet/auth/general.html:26 #: templates/web/fixmystreet/report/update-form.html:80 #: templates/web/seesomething/auth/general.html:26 +#: templates/web/zurich/auth/general.html:30 +#: templates/web/zurich/auth/general.html:56 msgid "Your email address" msgstr "Din e-postadresse" @@ -4502,6 +4578,7 @@ msgstr "Ditt etternavn" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 #: templates/web/fixmystreet/report/update-form.html:140 #: templates/web/seesomething/report/new/fill_in_details_form.html:79 +#: templates/web/zurich/auth/general.html:59 #: templates/web/zurich/report/new/fill_in_details_form.html:104 msgid "Your name" msgstr "Ditt navn" @@ -4520,6 +4597,7 @@ msgstr "Ditt navn:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:166 #: templates/web/fixmystreet/report/update-form.html:94 #: templates/web/seesomething/auth/general.html:30 +#: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "Ditt passord" @@ -4572,18 +4650,18 @@ msgstr "av %s" msgid "council" msgstr "administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 #, fuzzy msgid "council ref: %s" msgstr "%s ref: %s" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:27 -#: templates/web/zurich/admin/report_edit.html:48 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" msgstr "brukte ikke kart" -#: perllib/FixMyStreet/DB/Result/Comment.pm:197 +#: perllib/FixMyStreet/DB/Result/Comment.pm:195 #, fuzzy msgid "duplicate report" msgstr "Lag en rapport" @@ -4599,11 +4677,17 @@ msgstr "for eksempel «%s» eller «%s»" msgid "from %d different users" msgstr "fra %d forskjellige brukere" -#: perllib/Utils.pm:268 +#: templates/web/fixmystreet/report/_item.html:12 +#: templates/web/zurich/report/_item.html:16 +#, fuzzy +msgid "last updated %s" +msgstr "Siste oppdatering:" + +#: perllib/Utils.pm:263 msgid "less than a minute" msgstr "mindre enn et minutt" -#: templates/web/default/report/updates.html:37 +#: templates/web/default/report/updates.html:38 msgid "marked as %s" msgstr "markert som %s" @@ -4622,7 +4706,7 @@ msgstr "n/a" msgid "no further action" msgstr "Dine oppdateringer" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 +#: perllib/FixMyStreet/DB/Result/Comment.pm:193 msgid "not the council's responsibility" msgstr "" @@ -4638,16 +4722,16 @@ msgstr "" #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/zurich/admin/report_edit-sdm.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:18 -#: templates/web/zurich/admin/report_edit-sdm.html:23 -#: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit.html:35 -#: templates/web/zurich/admin/report_edit.html:37 -#: templates/web/zurich/admin/report_edit.html:44 -#: templates/web/zurich/admin/report_edit.html:46 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit-sdm.html:36 +#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit.html:52 #, fuzzy msgid "originally entered: “%s”" msgstr "søkte etter" @@ -4657,7 +4741,7 @@ msgid "other areas:" msgstr "andre områder:" #: templates/web/default/report/updates.html:28 -#: templates/web/default/report/updates.html:35 +#: templates/web/default/report/updates.html:36 msgid "reopened" msgstr "åpnet på nytt" @@ -4687,17 +4771,21 @@ msgstr "den lokale administrasjonen" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 +#: templates/web/default/report/updates.html:33 +msgid "third party responsibility" +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 msgid "this type of local problem" msgstr "denne type lokalt problem" -#: perllib/Utils.pm:240 +#: perllib/Utils.pm:235 msgid "today" msgstr "idag" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:27 -#: templates/web/zurich/admin/report_edit.html:48 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "used map" msgstr "brukte kart" @@ -4721,14 +4809,21 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> rapportert<br>nylig" msgstr[1] "<big>%s</big> rapportert<br>nylig" -#: perllib/Utils.pm:287 +#: perllib/Utils.pm:282 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d time" msgstr[1] "%d timer" -#: perllib/Utils.pm:289 +#: templates/web/default/report/_support.html:6 +#, perl-format +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "" +msgstr[1] "" + +#: perllib/Utils.pm:284 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4752,7 +4847,7 @@ msgstr[0] "" msgstr[1] "" "Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet." -#: perllib/Utils.pm:283 +#: perllib/Utils.pm:278 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4788,7 +4883,7 @@ msgstr[1] "" "Vi har ennå <strong>ikke</strong> detaljene for de andre administrasjonene " "som dekker dette stedet." -#: perllib/Utils.pm:285 +#: perllib/Utils.pm:280 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index ce2589ebb..bc9dec3a6 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-02-13 11:17+0000\n" +"POT-Creation-Date: 2013-03-11 18:53+0000\n" "PO-Revision-Date: 2011-12-08 10:56+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -21,8 +21,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:649 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:355 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 msgid " and " msgstr " og " @@ -68,8 +68,8 @@ msgstr "%d aktive oppdateringar" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "%d spørjeskjema sendt – %d svart (%s%%)" -#: templates/web/default/report/_support.html:3 -msgid "%d supporters" +#: templates/web/default/pagination.html:10 +msgid "%d to %d of %d" msgstr "" #: templates/web/default/reports/body.html:0 @@ -77,7 +77,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s – oppsummeringsrapportar" -#: perllib/FixMyStreet/DB/Result/Problem.pm:698 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "" @@ -85,7 +85,7 @@ msgstr "" msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 #, fuzzy msgid "%s, reported at %s" msgstr "%s, rapportert av %s %s" @@ -132,16 +132,16 @@ msgstr "(alternativt kan RSS-straumen tilpassast, innanfor" #: templates/web/default/around/around_map_list_items.html:12 #: templates/web/default/around/on_map_list_items.html:9 -#: templates/web/fixmystreet/report/_item.html:20 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/fixmystreet/report/_item.html:22 +#: templates/web/zurich/report/_item.html:21 #, fuzzy msgid "(closed)" msgstr "Lukka" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 -#: templates/web/fixmystreet/report/_item.html:18 -#: templates/web/zurich/report/_item.html:17 +#: templates/web/fixmystreet/report/_item.html:20 +#: templates/web/zurich/report/_item.html:19 msgid "(fixed)" msgstr "(løyst)" @@ -151,7 +151,7 @@ msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" #: templates/web/default/reports/_list-entry.html:4 -#: templates/web/fixmystreet/report/_item.html:14 +#: templates/web/fixmystreet/report/_item.html:16 msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" @@ -162,7 +162,7 @@ msgid "(optional)" msgstr "(valfritt)" #: templates/web/default/reports/_list-entry.html:2 -#: templates/web/fixmystreet/report/_item.html:13 +#: templates/web/fixmystreet/report/_item.html:15 msgid "(sent to both)" msgstr "(sendt til begge)" @@ -176,19 +176,15 @@ msgstr "(vi viser aldri e-postadressa di)" #: perllib/FixMyStreet/App/Controller/Report/New.pm:634 #: perllib/FixMyStreet/App/Controller/Report/New.pm:661 -#: perllib/FixMyStreet/DB/Result/Problem.pm:431 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" #: perllib/FixMyStreet/App/Controller/Report/New.pm:615 -#: perllib/FixMyStreet/DB/Result/Problem.pm:437 +#: perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "-- Vel ein eigedomstype --" -#: templates/web/default/report/_support.html:3 -msgid "1 supporter" -msgstr "" - #: templates/web/default/questionnaire/completed.html:20 msgid "" "<p style=\"font-size:150%\">Thank you very much for filling in our " @@ -322,6 +318,7 @@ msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nei</strong>, la meg stadfesta oppdateringa mi med e-post:" #: templates/web/fixmystreet/auth/general.html:50 +#: templates/web/zurich/auth/general.html:49 #, fuzzy msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nei</strong>, det gjer eg ikkje. La meg logga inn med e-post:" @@ -377,7 +374,7 @@ msgstr "" msgid "Add new category" msgstr "Legg til ny kategori" -#: templates/web/default/admin/users.html:35 +#: templates/web/default/admin/users.html:36 msgid "Add user" msgstr "" @@ -405,6 +402,7 @@ msgstr "Send meg varsel ved framtidige oppdateringar" #: templates/web/default/reports/index.html:3 #: templates/web/fixmybarangay/reports/index.html:3 +#: templates/web/zurich/admin/stats.html:5 #: templates/web/zurich/reports/index.html:15 #, fuzzy msgid "All Reports" @@ -421,12 +419,14 @@ msgstr "Alle rapportar" #: templates/web/oxfordshire/header.html:67 #: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 #: templates/web/zurich/admin/index-dm.html:12 +#: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Alle rapportar" #: templates/web/default/admin/stats.html:5 +#: templates/web/zurich/admin/stats.html:8 #, fuzzy msgid "All reports between %s and %s" msgstr "%srapportar mellom %s og %s" @@ -479,12 +479,12 @@ msgid "An update marked this problem as fixed." msgstr "Ei oppdatering markerte dette problemet som løyst." #: templates/web/default/admin/flagged.html:15 -#: templates/web/default/admin/list_updates.html:10 -#: templates/web/default/admin/reports.html:18 +#: templates/web/default/admin/list_updates.html:11 +#: templates/web/default/admin/reports.html:17 msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/admin/update_edit.html:17 msgid "Anonymous:" msgstr "Anonym:" @@ -512,19 +512,21 @@ msgstr "den lokale administrasjonen" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:109 +#: templates/web/zurich/admin/report_edit.html:117 +#: templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:118 +#: templates/web/zurich/admin/report_edit.html:126 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:150 -#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/report_edit.html:103 +#: templates/web/zurich/admin/report_edit.html:158 msgid "Assign to subdivision:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:98 #: templates/web/zurich/report/updates.html:11 #, fuzzy msgid "Assigned to %s" @@ -544,8 +546,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "For augneblunken går det berre an å søkja etter og å sjå på rapportar." -#: perllib/FixMyStreet/DB/Result/Problem.pm:386 -#: templates/web/zurich/report/_item.html:9 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" @@ -563,14 +565,14 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:204 #: templates/web/default/admin/bodies.html:1 -#: templates/web/zurich/header.html:63 +#: templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" -#: templates/web/default/admin/reports.html:16 +#: templates/web/default/admin/reports.html:15 #: templates/web/default/admin/users.html:14 msgid "Body" msgstr "" @@ -605,15 +607,16 @@ msgstr "" #: templates/web/default/admin/body.html:35 #: templates/web/default/admin/flagged.html:14 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/reports.html:17 +#: templates/web/default/admin/reports.html:16 #: templates/web/default/report/new/category.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 #: templates/web/seesomething/report/new/category.html:6 #: templates/web/southampton/report/new/category.html:3 #: templates/web/zurich/admin/body.html:13 -#: templates/web/zurich/admin/index-dm.html:22 -#: templates/web/zurich/admin/index-sdm.html:20 -#: templates/web/zurich/admin/reports.html:14 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/stats.html:50 #: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategori" @@ -624,16 +627,16 @@ msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/report_edit.html:36 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50 #: templates/web/zurich/admin/body.html:36 -#: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit.html:108 +#: templates/web/zurich/admin/report_edit-sdm.html:42 +#: templates/web/zurich/admin/report_edit.html:116 msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:348 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:365 msgid "Category: %s" msgstr "Kategori: %s" @@ -649,22 +652,24 @@ msgstr "Byt passord" msgid "Click map to report a problem" msgstr "Korleis rapportera eit problem" -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:28 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:75 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/fixmystreet/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:85 -#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/report_edit.html:90 +#: templates/web/zurich/admin/report_edit.html:92 +#: templates/web/zurich/admin/stats.html:31 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "Lukka" # skal det vera forskjellig tyding frå engelsken her? --KBU -#: perllib/FixMyStreet/DB/Result/Problem.pm:791 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" @@ -682,23 +687,23 @@ msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Dei næraste problema <small>(innanfor %skm)</small>" #: templates/web/default/admin/report_edit.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:46 msgid "Co-ordinates:" msgstr "Koordinatar:" #: templates/web/default/admin/flagged.html:16 -#: templates/web/default/admin/list_updates.html:13 -#: templates/web/default/admin/reports.html:19 +#: templates/web/default/admin/list_updates.html:14 +#: templates/web/default/admin/reports.html:18 msgid "Cobrand" msgstr "Merkevaresamarbeid" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:50 #: templates/web/default/admin/update_edit.html:44 msgid "Cobrand data:" msgstr "Data om merkevaresamarbeid:" -#: templates/web/default/admin/report_edit.html:46 +#: templates/web/default/admin/report_edit.html:49 #: templates/web/default/admin/update_edit.html:43 msgid "Cobrand:" msgstr "Merkevaresamarbeid:" @@ -745,6 +750,7 @@ msgstr "Stadfesting" #: templates/web/default/admin/body.html:85 #: templates/web/default/admin/body_edit.html:32 #: templates/web/default/admin/body_edit.html:84 +#: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Stadfesta" @@ -754,7 +760,7 @@ msgid "Confirmed reports between %s and %s" msgstr "%srapportar mellom %s og %s" #: templates/web/default/admin/problem_row.html:25 -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:45 msgid "Confirmed:" msgstr "Stadfesta:" @@ -783,8 +789,8 @@ msgstr "Kontakt oss" msgid "Contact the team" msgstr "Kontakt prosjektgruppa" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1224 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1252 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" @@ -793,7 +799,7 @@ msgid "Could not look up location" msgstr "" #: templates/web/default/admin/flagged.html:13 -#: templates/web/default/admin/list_updates.html:12 +#: templates/web/default/admin/list_updates.html:13 msgid "Council" msgstr "Administrasjon" @@ -809,6 +815,8 @@ msgstr "Administrasjon:" #: templates/web/default/admin/stats.html:12 #: templates/web/default/admin/stats.html:32 +#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats.html:50 msgid "Count" msgstr "Mengd" @@ -822,16 +830,16 @@ msgid "Create category" msgstr "Lag kategori" #: templates/web/default/admin/flagged.html:17 -#: templates/web/default/admin/list_updates.html:9 -#: templates/web/default/admin/reports.html:20 -#: templates/web/zurich/admin/list_updates.html:6 +#: templates/web/default/admin/list_updates.html:10 +#: templates/web/default/admin/reports.html:19 +#: templates/web/zurich/admin/list_updates.html:7 msgid "Created" msgstr "Oppretta" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:44 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:34 -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit-sdm.html:47 +#: templates/web/zurich/admin/report_edit.html:61 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Oppretta:" @@ -845,6 +853,10 @@ msgstr "Gjeldande tilstand" msgid "Dashboard" msgstr "" +#: templates/web/zurich/admin/stats.html:35 +msgid "Dealt with by subdivision within 5 working days" +msgstr "" + #: templates/web/default/admin/body.html:38 #: templates/web/default/admin/body.html:88 #: templates/web/default/admin/body_edit.html:37 @@ -852,9 +864,9 @@ msgstr "" msgid "Deleted" msgstr "Sletta" -#: templates/web/zurich/admin/index-dm.html:21 -#: templates/web/zurich/admin/index-sdm.html:19 -#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/index-dm.html:22 +#: templates/web/zurich/admin/index-sdm.html:20 +#: templates/web/zurich/admin/reports.html:12 msgid "Description" msgstr "" @@ -870,9 +882,9 @@ msgstr "Detaljar:" #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/admin/report_edit-sdm.html:14 -#: templates/web/zurich/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/report_edit.html:35 msgid "Details:" msgstr "Detaljar:" @@ -910,10 +922,10 @@ msgstr "Veit ikkje" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:35 +#: templates/web/default/admin/list_updates.html:36 #: templates/web/default/admin/problem_row.html:31 #: templates/web/default/admin/users.html:28 -#: templates/web/zurich/admin/problem_row.html:35 +#: templates/web/zurich/admin/problem_row.html:36 msgid "Edit" msgstr "Rediger" @@ -924,6 +936,7 @@ msgstr "" #: templates/web/default/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:1 +#: templates/web/zurich/admin/report_edit-sdm.html:4 #: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:4 msgid "Editing problem %d" @@ -948,22 +961,24 @@ msgstr "Oppdatert av" #: templates/web/default/admin/body_edit.html:83 #: templates/web/default/admin/flagged.html:12 #: templates/web/default/admin/flagged.html:35 -#: templates/web/default/admin/list_updates.html:8 -#: templates/web/default/admin/reports.html:15 +#: templates/web/default/admin/list_updates.html:9 +#: templates/web/default/admin/reports.html:14 #: templates/web/default/admin/users.html:13 #: templates/web/fixmystreet/auth/general.html:20 #: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/seesomething/auth/general.html:20 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/auth/general.html:24 +#: templates/web/zurich/auth/general.html:52 msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1240 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1237 msgid "Email already in abuse list" msgstr "E-post allereie i misbruklista" @@ -977,18 +992,18 @@ msgstr "Send meg oppdateringar" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/admin/update_edit.html:27 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:38 #: templates/web/zurich/admin/body.html:41 -#: templates/web/zurich/admin/report_edit-sdm.html:31 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit.html:57 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:301 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 #, fuzzy msgid "Email: %s" msgstr "E-post:" @@ -1069,6 +1084,7 @@ msgstr "Skriv inn eit nytt passord:" #: templates/web/fixmystreet/auth/general.html:61 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 #: templates/web/fixmystreet/report/update-form.html:122 +#: templates/web/zurich/auth/general.html:63 #, fuzzy msgid "Enter a password" msgstr "Skriv inn eit nytt passord:" @@ -1096,7 +1112,7 @@ msgstr "Postnummerdøme %s" msgid "Examples:" msgstr "Døme:" -#: templates/web/default/admin/report_edit.html:48 +#: templates/web/default/admin/report_edit.html:51 #, fuzzy msgid "Extra data:" msgstr "Data om merkevaresamarbeid:" @@ -1176,8 +1192,8 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:84 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:28 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:144 #: templates/web/default/report/update-form.html:30 @@ -1188,13 +1204,13 @@ msgstr "" msgid "Fixed" msgstr "Løyst" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 msgid "Fixed - Council" msgstr "Løyst – Administrasjon" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 msgid "Fixed - User" msgstr "Løyst – Brukar" @@ -1210,12 +1226,12 @@ msgstr "Løyst:" msgid "Flag user" msgstr "Flagg brukar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1136 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Flagga:" -#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:53 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "Flagga:" @@ -1244,7 +1260,6 @@ msgstr "Rapportane dine" #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 #: templates/web/oxfordshire/faq/faq-en-gb.html:1 -#: templates/web/zurich/faq/faq-de-ch.html:1 msgid "Frequently Asked Questions" msgstr "Ofte spurde spurnader" @@ -1284,15 +1299,15 @@ msgstr "Gje meg ein RSS-straum" #: templates/web/default/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 #: templates/web/seesomething/around/postcode_form.html:10 +#: templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "Hald fram" -#: templates/web/default/admin/report_edit.html:49 +#: templates/web/default/admin/report_edit.html:52 msgid "Going to send questionnaire?" msgstr "Skal spørjeskjemaet sendast?" #: templates/web/default/admin/index.html:24 -#: templates/web/zurich/admin/index.html:11 msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt på status over tid" @@ -1327,7 +1342,9 @@ msgstr "" #: templates/web/oxfordshire/header.html:75 #: templates/web/reading/footer.html:10 #: templates/web/seesomething/footer.html:13 -#: templates/web/stevenage/footer.html:47 templates/web/zurich/footer.html:21 +#: templates/web/stevenage/footer.html:47 +#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "Hjelp" @@ -1347,13 +1364,14 @@ msgstr "Her er dei ulike typane lokale problemvarsel for «%s»." msgid "Hi %s" msgstr "" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:80 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/stats.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Skjult" @@ -1382,7 +1400,7 @@ msgstr "Korleis rapportera eit problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:671 +#: perllib/FixMyStreet/App/Controller/Admin.pm:699 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." @@ -1407,12 +1425,12 @@ msgstr "" "nettadressa frå ein e-post, sjekk at du har kopiert ho korrekt.\n" #: templates/web/default/admin/flagged.html:9 -#: templates/web/default/admin/list_updates.html:5 -#: templates/web/default/admin/reports.html:12 -#: templates/web/zurich/admin/index-dm.html:20 -#: templates/web/zurich/admin/index-sdm.html:18 -#: templates/web/zurich/admin/list_updates.html:5 -#: templates/web/zurich/admin/reports.html:12 +#: templates/web/default/admin/list_updates.html:6 +#: templates/web/default/admin/reports.html:11 +#: templates/web/zurich/admin/index-dm.html:21 +#: templates/web/zurich/admin/index-sdm.html:19 +#: templates/web/zurich/admin/list_updates.html:6 +#: templates/web/zurich/admin/reports.html:11 msgid "ID" msgstr "ID" @@ -1452,7 +1470,7 @@ msgstr "" "sender inn rapporten din, slik at vi kan visa administrasjonen aktiviteten i " "området ditt." -#: templates/web/default/auth/token.html:25 +#: templates/web/default/auth/token.html:22 #: templates/web/default/email_sent.html:9 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " @@ -1506,12 +1524,13 @@ msgstr "" "av description), interface_used, comment_count, requestor_name (berre " "tilstades viss innsendar tillét at namnet kunne visast på denne nettstaden)." -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:28 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:78 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/fixmystreet/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:89 +#: templates/web/zurich/admin/report_edit.html:94 #: templates/web/zurich/report/banner.html:15 #, fuzzy msgid "In progress" @@ -1522,7 +1541,7 @@ msgstr "Under arbeid" msgid "Incident Category" msgstr "Kategori" -#: templates/web/zurich/admin/report_edit.html:128 +#: templates/web/zurich/admin/report_edit.html:136 #, fuzzy msgid "Include reporter personal details" msgstr "Ver venleg og legg inn opplysningar om problemet" @@ -1535,8 +1554,8 @@ msgstr "Inkluder ikkje-stadfesta problem" msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi «%s»" -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:71 +#: templates/web/zurich/admin/report_edit-sdm.html:56 +#: templates/web/zurich/admin/report_edit.html:76 msgid "Internal notes:" msgstr "" @@ -1544,7 +1563,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1051 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1552,14 +1571,14 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1001 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 msgid "Invalid start date" msgstr "Ugyldig startdato" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/default/report/update-form.html:30 @@ -1591,6 +1610,7 @@ msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:172 #: templates/web/fixmystreet/report/update-form.html:100 #: templates/web/seesomething/auth/general.html:35 +#: templates/web/zurich/auth/general.html:39 msgid "Keep me signed in on this computer" msgstr "Hugs mi innlogging på denne datamaskina" @@ -1606,7 +1626,7 @@ msgstr "Siste oppdatering:" msgid "Last editor" msgstr "Sist redigert av" -#: templates/web/default/admin/report_edit.html:44 +#: templates/web/default/admin/report_edit.html:47 msgid "Last update:" msgstr "Siste oppdatering:" @@ -1695,6 +1715,10 @@ msgstr "Melding:" msgid "Missing jurisdiction_id" msgstr "Manglar jurisdiction_id" +#: templates/web/zurich/admin/stats.html:34 +msgid "Moderated by division within one working day" +msgstr "" + #: templates/web/default/admin/stats.html:11 msgid "Month" msgstr "Månad" @@ -1707,8 +1731,8 @@ msgstr "Fleire problem i nærleiken" #: templates/web/default/admin/body-form.html:4 #: templates/web/default/admin/flagged.html:11 #: templates/web/default/admin/flagged.html:34 -#: templates/web/default/admin/list_updates.html:7 -#: templates/web/default/admin/reports.html:14 +#: templates/web/default/admin/list_updates.html:8 +#: templates/web/default/admin/reports.html:13 #: templates/web/default/admin/users.html:12 #: templates/web/default/reports/index.html:15 #: templates/web/emptyhomes/reports/index.html:10 @@ -1720,6 +1744,7 @@ msgstr "Fleire problem i nærleiken" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:187 #: templates/web/fixmystreet/report/update-form.html:136 #: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/auth/general.html:58 #: templates/web/zurich/report/new/fill_in_details_form.html:100 msgid "Name" msgstr "Namn" @@ -1729,15 +1754,16 @@ msgstr "Namn" msgid "Name (optional)" msgstr "(valfritt)" -#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:30 -#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "Namn:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 #, fuzzy msgid "Name: %s" msgstr "Namn:" @@ -1773,7 +1799,7 @@ msgstr "" "Næraste veg til nålen plassert på karta (automatisk generert ved hjelp av " "Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:266 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 #, fuzzy msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " @@ -1867,7 +1893,7 @@ msgstr "Nye rapportar innanfor grensa til {{NAME}} på reportemptyhomes.com" msgid "New state" msgstr "Ny tilstand" -#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit-sdm.html:59 #, fuzzy msgid "New update:" msgstr "Siste oppdatering:" @@ -1878,16 +1904,20 @@ msgstr "Siste oppdatering:" msgid "New!" msgstr "Ny!" +#: templates/web/default/pagination.html:13 +msgid "Next" +msgstr "" + #: templates/web/default/admin/body.html:50 #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:4 -#: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 +#: templates/web/default/admin/list_updates.html:33 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:36 -#: templates/web/default/admin/report_edit.html:49 +#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/report_edit.html:52 #: templates/web/default/admin/update_edit.html:19 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:111 @@ -1905,7 +1935,7 @@ msgstr "" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:414 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "Ingen administrasjon er vald" @@ -1921,7 +1951,7 @@ msgstr "Fann ingen flagga problem" msgid "No flagged users found" msgstr "Fann ingen flagga brukarar" -#: templates/web/zurich/admin/report_edit-sdm.html:52 +#: templates/web/zurich/admin/report_edit-sdm.html:65 #, fuzzy msgid "No further updates" msgstr "Oppdateringane dine" @@ -1940,7 +1970,8 @@ msgstr "Ingen problem er rapporterte" msgid "No result returned" msgstr "" -#: templates/web/default/report/_support.html:3 +#: templates/web/default/report/_support.html:2 +#: templates/web/default/report/_support.html:4 msgid "No supporters" msgstr "" @@ -1949,8 +1980,8 @@ msgid "Non Public" msgstr "" #: templates/web/default/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 msgid "None" msgstr "Ingen" @@ -1963,7 +1994,7 @@ msgstr "Ingen" msgid "Not Responsible" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:10 +#: templates/web/zurich/admin/report_edit-sdm.html:21 msgid "Not for my subdivision" msgstr "" @@ -2066,16 +2097,17 @@ msgstr "Eldre løyste" msgid "Older problems" msgstr "Eldre problem" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:29 #: templates/web/default/admin/update_edit.html:22 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:78 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:83 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2114,12 +2146,12 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1043 #: perllib/FixMyStreet/App/Controller/Report/New.pm:661 #: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: perllib/FixMyStreet/DB/Result/Problem.pm:623 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:343 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:356 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 msgid "Other" msgstr "Anna" @@ -2131,7 +2163,7 @@ msgstr "" "Kjeldekoda vår er fri programvare og <a href=\"http://github.com/mysociety/" "fixmystreet\">tilgjengeleg på GitHub</a>." -#: templates/web/default/admin/list_updates.html:11 +#: templates/web/default/admin/list_updates.html:12 msgid "Owner" msgstr "Eigar" @@ -2145,8 +2177,8 @@ msgstr "Fann ikkje sida" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 msgid "Partial" msgstr "Delvis" @@ -2155,6 +2187,8 @@ msgstr "Delvis" #: templates/web/fixmystreet/auth/general.html:59 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:208 #: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/zurich/auth/general.html:32 +#: templates/web/zurich/auth/general.html:61 #, fuzzy msgid "Password (optional)" msgstr "(valfritt)" @@ -2173,12 +2207,13 @@ msgstr "Passord:" msgid "Phone number (optional)" msgstr "(valfritt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:265 -#: templates/web/default/admin/report_edit.html:40 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:279 +#: templates/web/default/admin/report_edit.html:43 #: templates/web/default/report/new/fill_in_details_form.html:215 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:54 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" @@ -2187,6 +2222,7 @@ msgstr "Telefon:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 #: templates/web/fixmystreet/report/update-form.html:59 #: templates/web/seesomething/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/admin/stats.html:37 #: templates/web/zurich/report/new/fill_in_details_form.html:68 #, fuzzy msgid "Photo" @@ -2208,15 +2244,15 @@ msgstr "Bilete av nye problem i nærleiken" msgid "Place pin on map" msgstr "" -#: templates/web/default/admin/report_edit.html:26 -#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/default/dashboard/index.html:142 #: templates/web/default/dashboard/index.html:143 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:79 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:84 msgid "Planned" msgstr "Planlagt" @@ -2238,7 +2274,7 @@ msgstr "Ver høfleg, poengtert og kortfatta." msgid "Please check the passwords and try again" msgstr "Ver venleg og sjekk passorda og prøv igjen" -#: templates/web/default/auth/token.html:17 +#: templates/web/default/auth/token.html:14 msgid "Please check your email" msgstr "Ver venleg og sjekk e-posten du oppgav" @@ -2248,6 +2284,8 @@ msgstr "Ver venleg og sjekk e-posten du oppgav" #: templates/web/fixmystreet/auth/general.html:9 #: templates/web/seesomething/auth/general.html:15 #: templates/web/seesomething/auth/general.html:9 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" @@ -2255,12 +2293,12 @@ msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" #: perllib/FixMyStreet/App/Controller/Report/New.pm:852 #: perllib/FixMyStreet/App/Controller/Report/New.pm:871 #: perllib/FixMyStreet/App/Controller/Report/New.pm:914 -#: perllib/FixMyStreet/DB/Result/Problem.pm:433 +#: perllib/FixMyStreet/DB/Result/Problem.pm:420 #: templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Vel ein kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:439 +#: perllib/FixMyStreet/DB/Result/Problem.pm:426 msgid "Please choose a property type" msgstr "Vel ein type eigenskap" @@ -2307,7 +2345,7 @@ msgstr "" msgid "Please do not give address or personal information in this section." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:147 +#: perllib/FixMyStreet/DB/Result/Comment.pm:145 #: templates/web/default/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Ver venleg og skriv ei melding" @@ -2318,7 +2356,7 @@ msgid "Please enter a password" msgstr "Skriv inn eit passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:408 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" @@ -2336,7 +2374,7 @@ msgstr "Ver venleg og legg til ein gyldig e-post" msgid "Please enter a valid email address" msgstr "Ver venleg og legg inn e-postadressa di" -#: perllib/FixMyStreet/DB/Result/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/default/js/translation_strings.html:4 #: templates/web/seesomething/js/translation_strings.html:2 msgid "Please enter some details" @@ -2353,6 +2391,8 @@ msgstr "Ver venleg og legg inn opplysningar om problemet" #: templates/web/seesomething/auth/general.html:14 #: templates/web/seesomething/auth/general.html:9 #: templates/web/seesomething/js/translation_strings.html:9 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Ver venleg og legg inn e-posten din" @@ -2369,7 +2409,7 @@ msgstr "Ver venleg og legg inn e-posten din" msgid "Please enter your first name" msgstr "Ver venleg og legg inn namnet ditt" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:413 #: templates/web/default/js/translation_strings.html:7 #: templates/web/seesomething/js/translation_strings.html:4 #, fuzzy @@ -2382,8 +2422,8 @@ msgstr "" "visast." #: perllib/FixMyStreet/App/Controller/Contact.pm:95 -#: perllib/FixMyStreet/DB/Result/Comment.pm:144 -#: perllib/FixMyStreet/DB/Result/Problem.pm:419 +#: perllib/FixMyStreet/DB/Result/Comment.pm:142 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:108 #: templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" @@ -2607,9 +2647,13 @@ msgstr "Lagt inn av %s (<strong>%s</strong>) %s" msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" +#: templates/web/default/pagination.html:7 +msgid "Previous" +msgstr "" + #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:51 +#: templates/web/default/admin/report_edit.html:54 msgid "Private" msgstr "" @@ -2635,11 +2679,11 @@ msgid "Problem %s sent to council %s" msgstr "Problem %s sendt til administrasjon %s" #: templates/web/default/admin/index.html:28 -#: templates/web/zurich/admin/index.html:15 +#: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:916 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -2704,6 +2748,7 @@ msgstr "Problem innanfor grensene av:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Eigedomar nyleg rapportert som tilbake i bruk på reportemptyhomes.com" +#: templates/web/default/admin/report_edit.html:26 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:115 #, fuzzy msgid "Property address:" @@ -2757,15 +2802,17 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:160 +#: templates/web/zurich/admin/report_edit.html:168 +#: templates/web/zurich/admin/report_edit.html:176 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:67 +#: templates/web/zurich/admin/report_edit.html:72 +#: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:170 +#: templates/web/zurich/admin/report_edit.html:184 msgid "Publish the response" msgstr "" @@ -2909,7 +2956,7 @@ msgstr "" msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:62 +#: templates/web/default/admin/report_edit.html:64 #: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" @@ -2970,7 +3017,7 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:606 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2982,25 +3029,25 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:620 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported by %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:594 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:601 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -3009,11 +3056,11 @@ msgstr "Rapportert av %s i kategorien %s av %s %s" msgid "Reported in the %s category" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:589 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:611 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -3033,15 +3080,15 @@ msgstr "Rapportert i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1092 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1132 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:197 #: templates/web/seesomething/admin/stats.html:1 -#: templates/web/zurich/header.html:59 +#: templates/web/zurich/header.html:60 #, fuzzy msgid "Reports" msgstr "Alle rapportar" -#: perllib/FixMyStreet/DB/Result/Problem.pm:445 +#: perllib/FixMyStreet/DB/Result/Problem.pm:432 msgid "" "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" @@ -3060,7 +3107,7 @@ msgstr "Problem i og rundt kartet" msgid "Reports published" msgstr "Rapporter eit problem" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:46 msgid "Resend report" msgstr "Send rapport på nytt" @@ -3080,13 +3127,16 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s" -#: templates/web/default/admin/report_edit.html:58 -#: templates/web/zurich/admin/report_edit.html:63 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1342 +#: templates/web/default/admin/report_edit.html:60 +#: templates/web/zurich/admin/report_edit.html:68 msgid "Rotate Left" msgstr "" -#: templates/web/default/admin/report_edit.html:59 -#: templates/web/zurich/admin/report_edit.html:64 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: templates/web/default/admin/report_edit.html:61 +#: templates/web/zurich/admin/report_edit.html:69 msgid "Rotate Right" msgstr "" @@ -3104,7 +3154,7 @@ msgstr "Søk i rapportar" msgid "Search Users" msgstr "Søk i brukarar" -#: templates/web/zurich/header.html:73 +#: templates/web/zurich/header.html:77 #, fuzzy msgid "Search reports" msgstr "Søk i rapportar" @@ -3134,15 +3184,16 @@ msgstr "" "Vel kva for ein type varsel du ynskjer og klikk på knappen for ei RSS-" "kjelde, eller skriv inn e-postadressa di for å abonnera på eit e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:46 msgid "Sent:" msgstr "Sendt:" -#: templates/web/default/admin/report_edit.html:45 +#: templates/web/default/admin/report_edit.html:48 +#: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Teneste:" @@ -3201,6 +3252,8 @@ msgstr "Vis nåler" #: templates/web/seesomething/auth/general.html:3 #: templates/web/seesomething/auth/general.html:39 #: templates/web/stevenage/header.html:101 +#: templates/web/zurich/auth/general.html:18 +#: templates/web/zurich/auth/general.html:35 msgid "Sign in" msgstr "Logg inn" @@ -3211,6 +3264,7 @@ msgstr "Logg inn via epost" #: templates/web/default/auth/general.html:1 #: templates/web/fixmystreet/auth/general.html:1 #: templates/web/seesomething/auth/general.html:1 +#: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Logg inn eller opprett ein konto" @@ -3298,29 +3352,31 @@ msgstr "Startmånad:" #: templates/web/bromley/report/display.html:78 #: templates/web/default/admin/flagged.html:18 -#: templates/web/default/admin/list_updates.html:6 -#: templates/web/default/admin/reports.html:21 +#: templates/web/default/admin/list_updates.html:7 +#: templates/web/default/admin/reports.html:20 #: templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "Tilstand" -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:41 -#: templates/web/zurich/admin/report_edit.html:74 +#: templates/web/zurich/admin/report_edit-sdm.html:54 +#: templates/web/zurich/admin/report_edit.html:79 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1097 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:212 #: templates/web/default/admin/stats.html:1 +#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" msgstr "Statistikk" -#: templates/web/zurich/admin/index-dm.html:25 -#: templates/web/zurich/admin/index-sdm.html:23 -#: templates/web/zurich/admin/reports.html:17 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 #, fuzzy msgid "Status" msgstr "Statistikk" @@ -3330,7 +3386,7 @@ msgstr "Statistikk" msgid "Still open, via questionnaire, %s" msgstr "Skal spørjeskjemaet sendast?" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:352 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 #, fuzzy msgid "Subcategory: %s" msgstr "Kategori: %s" @@ -3350,7 +3406,7 @@ msgstr "Emne:" #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70 -#: templates/web/zurich/admin/report_edit.html:31 +#: templates/web/zurich/admin/report_edit.html:34 msgid "Subject:" msgstr "Emne:" @@ -3370,11 +3426,11 @@ msgstr "Emne:" msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:65 +#: templates/web/default/admin/report_edit.html:67 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:51 -#: templates/web/zurich/admin/report_edit.html:172 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:186 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Send inn endringar" @@ -3384,14 +3440,15 @@ msgstr "Send inn endringar" msgid "Submit questionnaire" msgstr "Send inn spørjeskjema" +#: perllib/FixMyStreet/Cobrand/Zurich.pm:68 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:6 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:76 -#: templates/web/zurich/admin/report_edit.html:77 -#: templates/web/zurich/admin/reports.html:15 +#: templates/web/zurich/admin/report_edit.html:81 +#: templates/web/zurich/admin/report_edit.html:82 +#: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 #, fuzzy msgid "Submitted" @@ -3418,12 +3475,13 @@ msgstr "" "Eller du kan abonnera på varsel basert på bydel eller administrasjon du " "høyrer til under:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:136 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 -#: templates/web/zurich/admin/index.html:1 templates/web/zurich/header.html:56 +#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 +#: templates/web/zurich/header.html:57 msgid "Summary" msgstr "Oppsummering" @@ -3437,7 +3495,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1094 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 #, fuzzy msgid "Survey" msgstr "Resultat frå spørjeundersøkinga" @@ -3446,8 +3504,8 @@ msgstr "Resultat frå spørjeundersøkinga" msgid "Survey Results" msgstr "Resultat frå spørjeundersøkinga" -#: templates/web/default/admin/list_updates.html:14 -#: templates/web/zurich/admin/list_updates.html:7 +#: templates/web/default/admin/list_updates.html:15 +#: templates/web/zurich/admin/list_updates.html:8 msgid "Text" msgstr "Tekst" @@ -3546,7 +3604,7 @@ msgstr "" "Den staden vert ikkje dekt av nokon administrasjon, kanskje det er til\n" "havs – ver venleg og prøv ein meir spesifikk stad." -#: perllib/FixMyStreet/App/Controller/Location.pm:121 +#: perllib/FixMyStreet/App/Controller/Location.pm:123 #, fuzzy msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3557,7 +3615,7 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:642 +#: perllib/FixMyStreet/App/Controller/Admin.pm:670 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast på nytt." @@ -3600,7 +3658,7 @@ msgstr "" "administrasjonane som mottok problemrapporten, noko som ikkje heilt passar " "med korleis attributten er definert i Open311 v2-spesifikasjonen." -#: templates/web/default/auth/token.html:22 +#: templates/web/default/auth/token.html:19 #: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " @@ -3741,7 +3799,7 @@ msgstr "" "Tittelen og detaljane for problemet vil verta offentlege, pluss namnet ditt\n" "viss du gjev oss lov til det." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:274 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" @@ -3769,6 +3827,7 @@ msgstr "" #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 #: templates/web/seesomething/auth/general.html:24 +#: templates/web/zurich/auth/general.html:28 #, fuzzy msgid "" "There was a problem with your email/password combination. If you cannot " @@ -3807,7 +3866,7 @@ msgstr "" "Denne API-implementasjonen er under arbeid og ikkje enno stabil. Han vil " "endra seg utan åtvaring i framtida." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:357 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 msgid "" "This email has been sent to both councils covering the location of the " "problem, as the user did not categorise it; please ignore it if you're not " @@ -3820,7 +3879,7 @@ msgstr "" "eller gjev oss melding om kva for ein kategori av problem dette er så vi kan " "leggja det til i systemet vårt." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:360 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 msgid "" "This email has been sent to several councils covering the location of the " "problem, as the category selected is provided for all of them; please ignore " @@ -3865,6 +3924,12 @@ msgstr "" "Dette er ei opplisting av alle problema i denne tenesta; vel ein viss " "administrasjon for å sjå problem som er sende dit." +#: templates/web/default/auth/token.html:9 +msgid "" +"This may be because the link is too old or already used, or the address was " +"not copied correctly." +msgstr "" + #: templates/web/default/report/banner.html:15 msgid "This problem has been closed" msgstr "Dette problemet er lukka" @@ -3891,6 +3956,8 @@ msgstr "Dette problemet er under arbeid" msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammalt og med ukjend status." +#: perllib/FixMyStreet/Cobrand/Zurich.pm:65 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:66 #: templates/web/zurich/report/_main.html:14 #, fuzzy msgid "This report is awaiting moderation." @@ -3908,24 +3975,24 @@ msgstr "Denne rapporten er for tida markert som fiksa." msgid "This report is currently marked as open." msgstr "Denne rapporten er for tida markert som open." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:298 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:312 #, fuzzy msgid "This report was submitted anonymously" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:267 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:281 msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" #: templates/web/default/admin/flagged.html:10 -#: templates/web/default/admin/reports.html:13 +#: templates/web/default/admin/reports.html:12 msgid "Title" msgstr "Tittel" @@ -3946,7 +4013,7 @@ msgid "" msgstr "" "Du finn lokale problem ved å søkja på postnummeret ditt, vegnamn eller stad:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:273 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 msgid "To view a map of the precise location of this issue" msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet" @@ -3954,6 +4021,7 @@ msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet" #: templates/web/default/admin/questionnaire.html:24 #: templates/web/default/admin/stats.html:24 #: templates/web/default/admin/stats.html:43 +#: templates/web/zurich/admin/stats.html:30 msgid "Total" msgstr "Totalt" @@ -3975,11 +4043,11 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/default/admin/update_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:32 -#: templates/web/zurich/admin/report_edit.html:52 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:58 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "Ikkje stadfesta" @@ -4057,31 +4125,31 @@ msgstr "Oppdater tilstanden" msgid "Update:" msgstr "Oppdatering:" -#: templates/web/zurich/admin/index-dm.html:24 -#: templates/web/zurich/admin/index-sdm.html:22 -#: templates/web/zurich/admin/reports.html:16 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 #, fuzzy msgid "Updated" msgstr "Oppdatert!" -#: perllib/FixMyStreet/App/Controller/Admin.pm:734 -#: perllib/FixMyStreet/App/Controller/Admin.pm:868 -#: perllib/FixMyStreet/App/Controller/Admin.pm:919 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:326 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:762 +#: perllib/FixMyStreet/App/Controller/Admin.pm:906 +#: perllib/FixMyStreet/App/Controller/Admin.pm:959 +#: perllib/FixMyStreet/App/Controller/Admin.pm:998 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:487 msgid "Updated!" msgstr "Oppdatert!" -#: templates/web/default/admin/list_updates.html:1 +#: templates/web/default/admin/list_updates.html:2 #: templates/web/default/report/update.html:3 #: templates/web/fixmystreet/report/update.html:3 -#: templates/web/zurich/admin/list_updates.html:1 +#: templates/web/zurich/admin/list_updates.html:2 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Oppdateringar" -#: perllib/FixMyStreet/DB/Result/Comment.pm:152 +#: perllib/FixMyStreet/DB/Result/Comment.pm:150 msgid "" "Updates are limited to 2000 characters in length. Please shorten your update" msgstr "" @@ -4099,18 +4167,18 @@ msgstr "Oppdateringar av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringar til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1256 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1296 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1228 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1268 msgid "User flagged" msgstr "Brukar flagga" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1095 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:151 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:211 #: templates/web/default/admin/flagged.html:30 -#: templates/web/zurich/header.html:68 +#: templates/web/zurich/header.html:69 msgid "Users" msgstr "Brukarar" @@ -4121,8 +4189,8 @@ msgstr "Verdi oppdatert" #: templates/web/default/admin/report_edit.html:12 #: templates/web/default/admin/update_edit.html:12 -#: templates/web/zurich/admin/report_edit-sdm.html:13 -#: templates/web/zurich/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:22 #: templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "Sjå rapport på nettstaden" @@ -4164,7 +4232,14 @@ msgstr "" "Vi fann meir ein eitt treff for den staden. Vi viser opp til ti treff, så " "prøv eit anna søk viss staden din ikkje er her." -#: templates/web/default/auth/token.html:19 +#: templates/web/default/auth/token.html:8 +#, fuzzy +msgid "We have not been able to confirm your account - sorry." +msgstr "" +"Vi har sendt deg ein epost som inneheld ei lenkje for å stadfesta kontoen " +"din." + +#: templates/web/default/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." msgstr "" "Vi har sendt deg ein epost som inneheld ei lenkje for å stadfesta kontoen " @@ -4194,7 +4269,7 @@ msgstr "(vi viser aldri e-postadressa di)" msgid "We never show your email address or phone number." msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "" "We realise this problem might be the responsibility of %s; however, we don't " "currently have any contact details for them. If you know of an appropriate " @@ -4254,7 +4329,7 @@ msgid "When edited" msgstr "Når redigert" #: templates/web/default/admin/flagged.html:19 -#: templates/web/default/admin/reports.html:22 +#: templates/web/default/admin/reports.html:21 msgid "When sent" msgstr "Når sendt" @@ -4319,12 +4394,12 @@ msgstr "År" #: templates/web/default/admin/body.html:51 #: templates/web/default/admin/body.html:52 #: templates/web/default/admin/body_edit.html:5 -#: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 +#: templates/web/default/admin/list_updates.html:33 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/report_edit.html:49 +#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/report_edit.html:52 #: templates/web/default/admin/update_edit.html:18 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 @@ -4485,7 +4560,7 @@ msgstr "" "Du må no opna lenkja i e-posten vi akkurat sende deg — dersom du ikkje " "gjer det, %s" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:46 msgid "You really want to resend?" msgstr "Ynskjer du verkeleg å senda på nytt?" @@ -4521,6 +4596,8 @@ msgstr "(valfritt)" #: templates/web/fixmystreet/auth/general.html:26 #: templates/web/fixmystreet/report/update-form.html:80 #: templates/web/seesomething/auth/general.html:26 +#: templates/web/zurich/auth/general.html:30 +#: templates/web/zurich/auth/general.html:56 #, fuzzy msgid "Your email address" msgstr "e-postadressa di:" @@ -4566,6 +4643,7 @@ msgstr "Namnet ditt:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:192 #: templates/web/fixmystreet/report/update-form.html:140 #: templates/web/seesomething/report/new/fill_in_details_form.html:79 +#: templates/web/zurich/auth/general.html:59 #: templates/web/zurich/report/new/fill_in_details_form.html:104 #, fuzzy msgid "Your name" @@ -4585,6 +4663,7 @@ msgstr "Namnet ditt:" #: templates/web/fixmystreet/report/new/fill_in_details_form.html:166 #: templates/web/fixmystreet/report/update-form.html:94 #: templates/web/seesomething/auth/general.html:30 +#: templates/web/zurich/auth/general.html:34 #, fuzzy msgid "Your password" msgstr "Rapportane dine" @@ -4639,17 +4718,17 @@ msgstr "av %s" msgid "council" msgstr "administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "council ref: %s" msgstr "" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:27 -#: templates/web/zurich/admin/report_edit.html:48 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" msgstr "brukte ikkje kart" -#: perllib/FixMyStreet/DB/Result/Comment.pm:197 +#: perllib/FixMyStreet/DB/Result/Comment.pm:195 #, fuzzy msgid "duplicate report" msgstr "Lag ein rapport" @@ -4665,11 +4744,17 @@ msgstr "" msgid "from %d different users" msgstr "frå %d ulike brukarar" -#: perllib/Utils.pm:268 +#: templates/web/fixmystreet/report/_item.html:12 +#: templates/web/zurich/report/_item.html:16 +#, fuzzy +msgid "last updated %s" +msgstr "Siste oppdatering:" + +#: perllib/Utils.pm:263 msgid "less than a minute" msgstr "mindre enn eitt minutt" -#: templates/web/default/report/updates.html:37 +#: templates/web/default/report/updates.html:38 msgid "marked as %s" msgstr "markert som %s" @@ -4688,7 +4773,7 @@ msgstr "i/t" msgid "no further action" msgstr "Oppdateringane dine" -#: perllib/FixMyStreet/DB/Result/Comment.pm:195 +#: perllib/FixMyStreet/DB/Result/Comment.pm:193 msgid "not the council's responsibility" msgstr "" @@ -4704,16 +4789,16 @@ msgstr "" #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/zurich/admin/report_edit-sdm.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:18 -#: templates/web/zurich/admin/report_edit-sdm.html:23 -#: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:24 -#: templates/web/zurich/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit.html:35 -#: templates/web/zurich/admin/report_edit.html:37 -#: templates/web/zurich/admin/report_edit.html:44 -#: templates/web/zurich/admin/report_edit.html:46 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit-sdm.html:36 +#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit.html:52 #, fuzzy msgid "originally entered: “%s”" msgstr "søkte etter" @@ -4723,7 +4808,7 @@ msgid "other areas:" msgstr "andre område:" #: templates/web/default/report/updates.html:28 -#: templates/web/default/report/updates.html:35 +#: templates/web/default/report/updates.html:36 msgid "reopened" msgstr "opna på nytt" @@ -4754,17 +4839,21 @@ msgstr "den lokale administrasjonen" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 +#: templates/web/default/report/updates.html:33 +msgid "third party responsibility" +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 msgid "this type of local problem" msgstr "denne typen lokalt problem" -#: perllib/Utils.pm:240 +#: perllib/Utils.pm:235 msgid "today" msgstr "i dag" #: templates/web/default/admin/report_edit.html:22 -#: templates/web/zurich/admin/report_edit-sdm.html:27 -#: templates/web/zurich/admin/report_edit.html:48 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 msgid "used map" msgstr "brukte kart" @@ -4788,14 +4877,21 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> rapport nyleg" msgstr[1] "<big>%s</big> rapportar nyleg" -#: perllib/Utils.pm:287 +#: perllib/Utils.pm:282 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d time" msgstr[1] "%d timar" -#: perllib/Utils.pm:289 +#: templates/web/default/report/_support.html:6 +#, perl-format +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "" +msgstr[1] "" + +#: perllib/Utils.pm:284 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4819,7 +4915,7 @@ msgstr[0] "" msgstr[1] "" "Vi har enno ikkje detaljar for administrasjonane som dekkjer denne staden." -#: perllib/Utils.pm:283 +#: perllib/Utils.pm:278 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4855,7 +4951,7 @@ msgstr[1] "" "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane " "som dekkjer denne staden." -#: perllib/Utils.pm:285 +#: perllib/Utils.pm:280 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/perllib/CronFns.pm b/perllib/CronFns.pm index 878482339..ac7f85596 100755 --- a/perllib/CronFns.pm +++ b/perllib/CronFns.pm @@ -36,7 +36,7 @@ sub site { my $base_url = shift; my $site = 'fixmystreet'; $site = 'emptyhomes' if $base_url =~ 'emptyhomes'; - $site = 'zurich' if $base_url =~ 'zurich'; + $site = 'zurich' if $base_url =~ /zurich|zueri/; return $site; } diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index b76f4d3ba..ee5b11876 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -86,6 +86,13 @@ __PACKAGE__->config( # Start the application __PACKAGE__->setup(); +# Due to some current issues with proxyings, need to manually +# tell the code we're secure if we are. +after 'prepare_headers' => sub { + my $self = shift; + $self->req->secure( 1 ) if $self->config->{BASE_URL} eq 'https://www.zueriwieneu.ch'; +}; + # set up DB handle for old code FixMyStreet->configure_mysociety_dbhandle; @@ -315,6 +322,7 @@ sub send_email { { _template_ => $email->body, # will get line wrapped _parameters_ => {}, + _line_indent => $c->cobrand->email_indent, $email->header_pairs } ) }; @@ -443,18 +451,29 @@ Hashref contains height, width and url keys. sub get_photo_params { my ($self, $key) = @_; - $key = ($key eq 'id') ? '' : "/$key"; return {} unless $self->photo; + $key = ($key eq 'id') ? '' : "/$key"; + + my $pre = "/photo$key/" . $self->id; + my $post = '.jpeg'; my $photo = {}; + if (length($self->photo) == 40) { - $photo->{url_full} = '/photo' . $key . '/' . $self->id . '.full.jpeg'; + $post .= '?' . $self->photo; + $photo->{url_full} = "$pre.full$post"; + # XXX Can't use size here because {url} (currently 250px height) may be + # being used, but at this point it doesn't yet exist to find the width + # $str = FixMyStreet->config('UPLOAD_DIR') . $self->photo . '.jpeg'; } else { - ( $photo->{width}, $photo->{height} ) = - Image::Size::imgsize( \$self->photo ); + my $str = \$self->photo; + ( $photo->{width}, $photo->{height} ) = Image::Size::imgsize( $str ); } - $photo->{url} = '/photo' . $key . '/' . $self->id . '.jpeg'; + + $photo->{url} = "$pre$post"; + $photo->{url_tn} = "$pre.tn$post"; + $photo->{url_fp} = "$pre.fp$post"; return $photo; } diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index a3a241590..f69e9ea23 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -145,34 +145,34 @@ sub timeline : Path( 'timeline' ) : Args(0) { my $probs = $c->cobrand->problems->timeline; foreach ($probs->all) { - push @{$time{$_->created->epoch}}, { type => 'problemCreated', date => $_->created_local, obj => $_ }; - push @{$time{$_->confirmed->epoch}}, { type => 'problemConfirmed', date => $_->confirmed_local, obj => $_ } if $_->confirmed; - push @{$time{$_->whensent->epoch}}, { type => 'problemSent', date => $_->whensent_local, obj => $_ } if $_->whensent; + push @{$time{$_->created->epoch}}, { type => 'problemCreated', date => $_->created, obj => $_ }; + push @{$time{$_->confirmed->epoch}}, { type => 'problemConfirmed', date => $_->confirmed, obj => $_ } if $_->confirmed; + push @{$time{$_->whensent->epoch}}, { type => 'problemSent', date => $_->whensent, obj => $_ } if $_->whensent; } my $questionnaires = $c->model('DB::Questionnaire')->timeline( $c->cobrand->restriction ); foreach ($questionnaires->all) { - push @{$time{$_->whensent->epoch}}, { type => 'quesSent', date => $_->whensent_local, obj => $_ }; - push @{$time{$_->whenanswered->epoch}}, { type => 'quesAnswered', date => $_->whenanswered_local, obj => $_ } if $_->whenanswered; + push @{$time{$_->whensent->epoch}}, { type => 'quesSent', date => $_->whensent, obj => $_ }; + push @{$time{$_->whenanswered->epoch}}, { type => 'quesAnswered', date => $_->whenanswered, obj => $_ } if $_->whenanswered; } my $updates = $c->model('DB::Comment')->timeline( $site_restriction ); foreach ($updates->all) { - push @{$time{$_->created->epoch}}, { type => 'update', date => $_->created_local, obj => $_} ; + push @{$time{$_->created->epoch}}, { type => 'update', date => $_->created, obj => $_} ; } my $alerts = $c->model('DB::Alert')->timeline_created( $c->cobrand->restriction ); foreach ($alerts->all) { - push @{$time{$_->whensubscribed->epoch}}, { type => 'alertSub', date => $_->whensubscribed_local, obj => $_ }; + push @{$time{$_->whensubscribed->epoch}}, { type => 'alertSub', date => $_->whensubscribed, obj => $_ }; } $alerts = $c->model('DB::Alert')->timeline_disabled( $c->cobrand->restriction ); foreach ($alerts->all) { - push @{$time{$_->whendisabled->epoch}}, { type => 'alertDel', date => $_->whendisabled_local, obj => $_ }; + push @{$time{$_->whendisabled->epoch}}, { type => 'alertDel', date => $_->whendisabled, obj => $_ }; } $c->model('DB')->schema->storage->sql_maker->quote_char( '' ); @@ -485,6 +485,25 @@ sub body_edit : Path('body_edit') : Args(2) { sub reports : Path('reports') { my ( $self, $c ) = @_; + my $query = {}; + if ( $c->cobrand->moniker eq 'zurich' ) { + my $type = $c->stash->{admin_type}; + my $body = $c->stash->{body}; + if ( $type eq 'dm' ) { + my @children = map { $_->id } $body->bodies->all; + my @all = (@children, $body->id); + $query = { bodies_str => \@all }; + } elsif ( $type eq 'sdm' ) { + $query = { bodies_str => $body->id }; + } + } + + my $order = $c->req->params->{o} || 'created'; + my $dir = defined $c->req->params->{d} ? $c->req->params->{d} : 1; + $c->stash->{order} = $order; + $c->stash->{dir} = $dir; + $order .= ' desc' if $dir; + if (my $search = $c->req->param('search')) { $c->stash->{searched} = $search; @@ -503,21 +522,20 @@ sub reports : Path('reports') { $c->model('DB')->schema->storage->sql_maker->quote_char( '"' ); $c->model('DB')->schema->storage->sql_maker->name_sep( '.' ); - my $query; if (is_valid_email($search)) { - $query = [ + $query->{'-or'} = [ 'user.email' => { ilike => $like_search }, ]; } elsif ($search =~ /^id:(\d+)$/) { - $query = [ + $query->{'-or'} = [ 'me.id' => int($1), ]; } elsif ($search =~ /^area:(\d+)$/) { - $query = [ + $query->{'-or'} = [ 'me.areas' => { like => "%,$1,%" } ]; } else { - $query = [ + $query->{'-or'} = [ 'me.id' => $search_n, 'user.email' => { ilike => $like_search }, 'me.name' => { ilike => $like_search }, @@ -527,13 +545,12 @@ sub reports : Path('reports') { cobrand_data => { like => $like_search }, ]; } + my $problems = $c->cobrand->problems->search( - { - -or => $query, - }, + $query, { prefetch => 'user', - order_by => [\"(state='hidden')",'created'] + order_by => [ \"(state='hidden')", \$order ] } ); @@ -542,9 +559,6 @@ sub reports : Path('reports') { # will have been turned off $c->stash->{problems} = [ $problems->all ]; - $c->stash->{edit_body_contacts} = 1 - if ( grep {$_ eq 'body'} keys %{$c->stash->{allowed_pages}}); - if (is_valid_email($search)) { $query = [ 'user.email' => { ilike => $like_search }, @@ -576,7 +590,7 @@ sub reports : Path('reports') { { -select => [ 'me.*', qw/problem.bodies_str problem.state/ ], prefetch => [qw/user problem/], - order_by => [\"(me.state='hidden')",\"(problem.state='hidden')",'me.created'] + order_by => [ \"(me.state='hidden')", \"(problem.state='hidden')", 'me.created' ] } ); $c->stash->{updates} = [ $updates->all ]; @@ -584,7 +598,20 @@ sub reports : Path('reports') { # Switch quoting back off. See above for explanation of this. $c->model('DB')->schema->storage->sql_maker->quote_char( '' ); + } else { + + my $page = $c->req->params->{p} || 1; + my $problems = $c->cobrand->problems->search( + $query, + { order_by => $order } + )->page( $page ); + $c->stash->{problems} = [ $problems->all ]; + $c->stash->{pager} = $problems->pager; } + + $c->stash->{edit_body_contacts} = 1 + if ( grep {$_ eq 'body'} keys %{$c->stash->{allowed_pages}}); + } sub report_edit : Path('report_edit') : Args(1) { @@ -601,13 +628,8 @@ sub report_edit : Path('report_edit') : Args(1) { $c->forward('get_token'); - if ( $c->req->param('rotate_photo') ) { - $c->forward('rotate_photo'); - return 1; - } - if ( $c->cobrand->moniker eq 'zurich' ) { - + $c->stash->{page} = 'admin'; FixMyStreet::Map::display_map( $c, latitude => $problem->latitude, @@ -616,12 +638,19 @@ sub report_edit : Path('report_edit') : Args(1) { ? [ { latitude => $problem->latitude, longitude => $problem->longitude, - colour => 'yellow', + colour => $c->cobrand->pin_colour($problem), type => 'big', } ] : [], ); + } + if ( $c->req->param('rotate_photo') ) { + $c->forward('rotate_photo'); + return 1; + } + + if ( $c->cobrand->moniker eq 'zurich' ) { my $done = $c->cobrand->admin_report_edit(); return if $done; } @@ -782,6 +811,16 @@ sub users: Path('users') : Args(0) { } else { $c->forward('get_token'); $c->forward('fetch_all_bodies'); + + # Admin users by default + my $users = $c->model('DB::User')->search( + { from_body => { '!=', undef } }, + { order_by => 'name' } + ); + my @users = $users->all; + my %email2user = map { $_->email => $_ } @users; + $c->stash->{users} = \@users; + } return 1; @@ -903,6 +942,8 @@ sub user_add : Path('user_edit') : Args(0) { $c->forward('check_token'); + return unless $c->req->param('name') && $c->req->param('email'); + my $user = $c->model('DB::User')->find_or_create( { name => $c->req->param('name'), email => $c->req->param('email'), @@ -982,7 +1023,7 @@ sub stats : Path('stats') : Args(0) { $c->forward('fetch_all_bodies'); - if ( $c->cobrand->moniker eq 'seesomething' ) { + if ( $c->cobrand->moniker eq 'seesomething' || $c->cobrand->moniker eq 'zurich' ) { return $c->cobrand->admin_stats(); } @@ -1288,7 +1329,7 @@ sub rotate_photo : Private { my ( $self, $c ) =@_; my $direction = $c->req->param('rotate_photo'); - return unless $direction =~ /Left/ or $direction =~ /Right/; + return unless $direction eq _('Rotate Left') or $direction eq _('Rotate Right'); my $photo = $c->stash->{problem}->photo; my $file; @@ -1299,16 +1340,12 @@ sub rotate_photo : Private { $photo = $file->slurp; } - $photo = _rotate_image( $photo, $direction =~ /Left/ ? -90 : 90 ); + $photo = _rotate_image( $photo, $direction eq _('Rotate Left') ? -90 : 90 ); return unless $photo; - my $fileid; - if ( !$file ) { - $fileid = sha1_hex($photo); - $file = file( $c->config->{UPLOAD_DIR}, "$fileid.jpeg" ); - } - - $c->stash->{rotated} = 1; + # Write out to new location + my $fileid = sha1_hex($photo); + $file = file( $c->config->{UPLOAD_DIR}, "$fileid.jpeg" ); my $fh = $file->open('w'); print $fh $photo; @@ -1316,10 +1353,8 @@ sub rotate_photo : Private { unlink glob FixMyStreet->path_to( 'web', 'photo', $c->stash->{problem}->id . '.*' ); - if ( $fileid ) { - $c->stash->{problem}->photo( $fileid ); - $c->stash->{problem}->update(); - } + $c->stash->{problem}->photo( $fileid ); + $c->stash->{problem}->update(); return 1; } diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm index 9a754f063..bad269a83 100644 --- a/perllib/FixMyStreet/App/Controller/Around.pm +++ b/perllib/FixMyStreet/App/Controller/Around.pm @@ -40,9 +40,10 @@ sub around_index : Path : Args(0) { my $partial_report = $c->forward('load_partial'); # Try to create a location for whatever we have - return - unless $c->forward('/location/determine_location_from_coords') - || $c->forward('/location/determine_location_from_pc'); + my $ret = $c->forward('/location/determine_location_from_coords') + || $c->forward('/location/determine_location_from_pc'); + return unless $ret; + return $c->res->redirect('/') if $ret == -1 && !$partial_report; # Check to see if the spot is covered by a area - if not show an error. return unless $c->cobrand->moniker eq 'fixmybarangay' || $c->forward('check_location_is_acceptable'); diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm index f4d6d86e4..57b53a155 100644 --- a/perllib/FixMyStreet/App/Controller/Auth.pm +++ b/perllib/FixMyStreet/App/Controller/Auth.pm @@ -31,7 +31,7 @@ sub general : Path : Args(0) { my $req = $c->req; $c->detach( 'redirect_on_signin', [ $req->param('r') ] ) - if $c->user && $req->param('r') && $req->param('r') !~ /admin/; + if $c->user && $req->param('r'); # all done unless we have a form posted to us return unless $req->method eq 'POST'; @@ -182,6 +182,10 @@ Used after signing in to take the person back to where they were. sub redirect_on_signin : Private { my ( $self, $c, $redirect ) = @_; $redirect = 'my' unless $redirect; + if ( $c->cobrand->moniker eq 'zurich' ) { + $redirect = 'my' if $redirect eq 'admin'; + $redirect = 'admin' if $c->user->from_body; + } $c->res->redirect( $c->uri_for( "/$redirect" ) ); } diff --git a/perllib/FixMyStreet/App/Controller/Location.pm b/perllib/FixMyStreet/App/Controller/Location.pm index fd3fadd9f..f103ff7f9 100644 --- a/perllib/FixMyStreet/App/Controller/Location.pm +++ b/perllib/FixMyStreet/App/Controller/Location.pm @@ -50,6 +50,8 @@ sub determine_location_from_coords : Private { User has searched for a location - try to find it for them. +Return -1 if nothing provided. + If one match is found returns true and lat/lng is set. If several possible matches are found puts an array onto stash so that user can be prompted to pick one and returns false. @@ -62,7 +64,7 @@ sub determine_location_from_pc : Private { my ( $self, $c, $pc ) = @_; # check for something to search - $pc ||= $c->req->param('pc') || return; + $pc ||= $c->req->param('pc') || return -1; $c->stash->{pc} = $pc; # for template if ( $pc =~ /^(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)$/ ) { diff --git a/perllib/FixMyStreet/App/Controller/Open311.pm b/perllib/FixMyStreet/App/Controller/Open311.pm index 7b8cb649f..a4e72e9bd 100644 --- a/perllib/FixMyStreet/App/Controller/Open311.pm +++ b/perllib/FixMyStreet/App/Controller/Open311.pm @@ -240,8 +240,8 @@ sub output_requests : Private { 'long' => [ $problem->longitude ], 'status' => [ $problem->state ], # 'status_notes' => [ {} ], - 'requested_datetime' => [ w3date($problem->confirmed_local) ], - 'updated_datetime' => [ w3date($problem->lastupdate_local) ], + 'requested_datetime' => [ w3date($problem->confirmed) ], + 'updated_datetime' => [ w3date($problem->lastupdate) ], # 'expected_datetime' => [ {} ], # 'address' => [ {} ], # 'address_id' => [ {} ], @@ -260,7 +260,7 @@ sub output_requests : Private { if ( $problem->whensent ) { # Not in Open311 v2 $request->{'agency_sent_datetime'} = - [ w3date($problem->whensent_local) ]; + [ w3date($problem->whensent) ]; } # Extract number of updates diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index 3a707b18c..24dececac 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -173,7 +173,10 @@ sub format_problem_for_display : Private { if ( $c->stash->{ajax} ) { $c->res->content_type('application/json; charset=utf-8'); my $content = JSON->new->utf8(1)->encode( - $problem->as_hashref( $c ) + { + report => $c->cobrand->problem_as_hashref( $problem, $c ), + updates => $c->cobrand->updates_as_hashref( $problem, $c ), + } ); $c->res->body( $content ); return 1; @@ -196,7 +199,7 @@ sub generate_map_tags : Private { ? [ { latitude => $problem->latitude, longitude => $problem->longitude, - colour => 'yellow', + colour => $c->cobrand->moniker eq 'zurich'? $c->cobrand->pin_colour($problem) : 'yellow', type => 'big', } ] : [], diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index 0c8d567c4..257d9ec24 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -708,7 +708,7 @@ Returns the colour of pin to be used for a particular report =cut sub pin_colour { my ( $self, $p, $context ) = @_; - #return 'green' if time() - $p->confirmed_local->epoch < 7 * 24 * 60 * 60; + #return 'green' if time() - $p->confirmed->epoch < 7 * 24 * 60 * 60; return 'yellow' if $context eq 'around' || $context eq 'reports'; return $p->is_fixed ? 'green' : 'red'; } @@ -795,5 +795,44 @@ sub show_unconfirmed_reports { 0; } +=head2 prettify_dt + + my $date = $c->prettify_dt( $datetime ); + +Takes a datetime object and returns a string representation. + +=cut + +sub prettify_dt { + my $self = shift; + my $dt = shift; + + return Utils::prettify_dt( $dt, 1 ); +} + +=head2 email_indent + +Set to an indent string if you wish to override the default email handling. + +=cut + +sub email_indent { undef; } + +sub problem_as_hashref { + my $self = shift; + my $problem = shift; + my $ctx = shift; + + return $problem->as_hashref( $ctx ); +} + +sub updates_as_hashref { + my $self = shift; + my $problem = shift; + my $ctx = shift; + + return {}; +} + 1; diff --git a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm b/perllib/FixMyStreet/Cobrand/EmptyHomes.pm index ef27d2c4e..99aec5ac1 100644 --- a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm +++ b/perllib/FixMyStreet/Cobrand/EmptyHomes.pm @@ -119,6 +119,22 @@ sub process_extras { $extra->{address} = $value; } +sub front_stats_data { + my ( $self ) = @_; + my $key = "recent_new"; + my $result = Memcached::get($key); + unless ($result) { + $result = $self->problems->search( + { state => [ FixMyStreet::DB::Result::Problem->visible_states() ] } + )->count; + foreach my $v (values %{$self->old_site_stats}) { + $result += $v; + } + Memcached::set($key, $result, 3600); + } + return $result; +} + # A record of the number of reports from the Channel 4 site and other old data sub old_site_stats { return { diff --git a/perllib/FixMyStreet/Cobrand/Southampton.pm b/perllib/FixMyStreet/Cobrand/Southampton.pm index b7374149a..4e068a8c3 100644 --- a/perllib/FixMyStreet/Cobrand/Southampton.pm +++ b/perllib/FixMyStreet/Cobrand/Southampton.pm @@ -20,5 +20,7 @@ sub disambiguate_location { }; } +sub send_questionnaires { return 0; } + 1; diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm index ec65ec8f0..806fc8391 100644 --- a/perllib/FixMyStreet/Cobrand/Zurich.pm +++ b/perllib/FixMyStreet/Cobrand/Zurich.pm @@ -39,11 +39,69 @@ sub languages { [ 'de-ch,Deutsch,de_CH', 'en-gb,English,en_GB' ] }; sub uri { my ( $self, $uri ) = @_; - $uri->query_param( zoom => 7 ) + $uri->query_param( zoom => 6 ) if $uri->query_param('lat') && !$uri->query_param('zoom'); return $uri; } +sub prettify_dt { + my $self = shift; + my $dt = shift; + + return Utils::prettify_dt( $dt, 'zurich' ); +} + +sub problem_as_hashref { + my $self = shift; + my $problem = shift; + my $ctx = shift; + + my $hashref = $problem->as_hashref( $ctx ); + + if ( $problem->state eq 'unconfirmed' ) { + for my $var ( qw( photo detail state state_t is_fixed meta ) ) { + delete $hashref->{ $var }; + } + $hashref->{detail} = _('This report is awaiting moderation.'); + $hashref->{title} = _('This report is awaiting moderation.'); + $hashref->{state} = 'submitted'; + $hashref->{state_t} = _('Submitted'); + } else { + if ( $problem->state eq 'confirmed' ) { + $hashref->{state} = 'open'; + $hashref->{state_t} = _('Open'); + } elsif ( $problem->is_fixed ) { + $hashref->{state} = 'closed'; + $hashref->{state_t} = _('Closed'); + } elsif ( $problem->state eq 'in progress' || $problem->state eq 'planned' ) { + $hashref->{state} = 'in progress'; + $hashref->{state_t} = _('In progress'); + } + } + + return $hashref; +} + +sub updates_as_hashref { + my $self = shift; + my $problem = shift; + my $ctx = shift; + + my $hashref = {}; + + if ( $problem->state eq 'fixed - council' || $problem->state eq 'closed' ) { + $hashref->{update_pp} = $self->prettify_dt( $problem->lastupdate ); + + if ( $problem->state eq 'fixed - council' ) { + $hashref->{details} = FixMyStreet::App::View::Web->add_links( $ctx, $problem->extra ? $problem->extra->{public_response} : '' ); + } elsif ( $problem->state eq 'closed' ) { + $hashref->{details} = sprintf( _('Assigned to %s'), $problem->body($ctx)->name ); + } + } + + return $hashref; +} + sub remove_redundant_areas { my $self = shift; my $all_areas = shift; @@ -115,16 +173,18 @@ sub overdue { if ( $problem->state eq 'unconfirmed' || $problem->state eq 'confirmed' ) { # One working day $w = add_days( $w, 1 ); - return $w < DateTime->now(); + return $w < DateTime->now() ? 1 : 0; } elsif ( $problem->state eq 'in progress' ) { # Five working days $w = add_days( $w, 5 ); - return $w < DateTime->now(); + return $w < DateTime->now() ? 1 : 0; } else { return 0; } } +sub email_indent { ''; } + # Specific administrative displays sub admin_pages { @@ -149,6 +209,7 @@ sub admin_pages { $pages = { %$pages, 'users' => [_('Users'), 3], + 'stats' => [_('Stats'), 4], 'user_edit' => [undef, undef], }; return $pages if $type eq 'super'; @@ -160,16 +221,13 @@ sub admin_type { my $body = $c->user->from_body; $c->stash->{body} = $body; - my $parent = $body->parent; - my $children = $body->bodies->count; - my $type; + my $parent = $body->parent; if (!$parent) { $type = 'super'; - } elsif ($parent && $children) { - $type = 'dm'; - } elsif ($parent) { - $type = 'sdm'; + } else { + my $grandparent = $parent->parent; + $type = $grandparent ? 'sdm' : 'dm'; } $c->stash->{admin_type} = $type; @@ -188,37 +246,68 @@ sub admin { my @children = map { $_->id } $body->bodies->all; my @all = (@children, $body->id); + my $order = $c->req->params->{o} || 'created'; + my $dir = defined $c->req->params->{d} ? $c->req->params->{d} : 1; + $c->stash->{order} = $order; + $c->stash->{dir} = $dir; + $order .= ' desc' if $dir; + # XXX No multiples or missing bodies $c->stash->{unconfirmed} = $c->cobrand->problems->search({ state => [ 'unconfirmed', 'confirmed' ], bodies_str => $c->stash->{body}->id, + }, { + order_by => $order, }); $c->stash->{approval} = $c->cobrand->problems->search({ state => 'planned', bodies_str => $c->stash->{body}->id, + }, { + order_by => $order, }); + + my $page = $c->req->params->{p} || 1; $c->stash->{other} = $c->cobrand->problems->search({ state => { -not_in => [ 'unconfirmed', 'confirmed', 'planned' ] }, bodies_str => \@all, - }); + }, { + order_by => $order, + })->page( $page ); + $c->stash->{pager} = $c->stash->{other}->pager; + } elsif ($type eq 'sdm') { $c->stash->{template} = 'admin/index-sdm.html'; my $body = $c->stash->{body}; + my $order = $c->req->params->{o} || 'created'; + my $dir = defined $c->req->params->{d} ? $c->req->params->{d} : 1; + $c->stash->{order} = $order; + $c->stash->{dir} = $dir; + $order .= ' desc' if $dir; + # XXX No multiples or missing bodies $c->stash->{reports_new} = $c->cobrand->problems->search( { state => 'in progress', bodies_str => $body->id, + }, { + order_by => $order } ); $c->stash->{reports_unpublished} = $c->cobrand->problems->search( { state => 'planned', bodies_str => $body->parent->id, + }, { + order_by => $order } ); + + my $page = $c->req->params->{p} || 1; $c->stash->{reports_published} = $c->cobrand->problems->search( { state => 'fixed - council', bodies_str => $body->parent->id, - } ); + }, { + order_by => $order + } )->page( $page ); + $c->stash->{pager} = $c->stash->{reports_published}->pager; } } @@ -274,8 +363,7 @@ sub admin_report_edit { $extra->{publish_photo} = $c->req->params->{publish_photo} || 0; $extra->{third_personal} = $c->req->params->{third_personal} || 0; # Make sure we have a copy of the original detail field - $extra->{original_detail} = $problem->detail unless $extra->{original_detail}; - $problem->extra( { %$extra } ); + $extra->{original_detail} = $problem->detail if !$extra->{original_detail} && $c->req->params->{detail} && $problem->detail ne $c->req->params->{detail}; # Workflow things my $redirect = 0; @@ -286,14 +374,17 @@ sub admin_report_edit { $problem->external_body( undef ); $problem->bodies_str( $cat->body_id ); $problem->whensent( undef ); + $extra->{changed_category} = 1; $redirect = 1 if $cat->body_id ne $body->id; } elsif ( my $subdiv = $c->req->params->{body_subdivision} ) { + $extra->{moderated_overdue} = $self->overdue( $problem ); $problem->state( 'in progress' ); $problem->external_body( undef ); $problem->bodies_str( $subdiv ); $problem->whensent( undef ); $redirect = 1; } elsif ( my $external = $c->req->params->{body_external} ) { + $extra->{moderated_overdue} = $self->overdue( $problem ); $problem->state( 'closed' ); $problem->external_body( $external ); $problem->whensent( undef ); @@ -306,8 +397,11 @@ sub admin_report_edit { } } + $problem->extra( { %$extra } ); $problem->title( $c->req->param('title') ); $problem->detail( $c->req->param('detail') ); + $problem->latitude( $c->req->param('latitude') ); + $problem->longitude( $c->req->param('longitude') ); # Final, public, Update from DM if (my $update = $c->req->param('status_update')) { @@ -357,14 +451,23 @@ sub admin_report_edit { } elsif ($c->req->param('submit')) { $c->forward('check_token'); + my $db_update = 0; + if ( $c->req->param('latitude') != $problem->latitude || $c->req->param('longitude') != $problem->longitude ) { + $problem->latitude( $c->req->param('latitude') ); + $problem->longitude( $c->req->param('longitude') ); + $db_update = 1; + } + my $extra = $problem->extra || {}; $extra->{internal_notes} ||= ''; if ($c->req->param('internal_notes') && $c->req->param('internal_notes') ne $extra->{internal_notes}) { $extra->{internal_notes} = $c->req->param('internal_notes'); $problem->extra( { %$extra } ); - $problem->update; + $db_update = 1; } + $problem->update if $db_update; + # Add new update from status_update if (my $update = $c->req->param('status_update')) { FixMyStreet::App->model('DB::Comment')->create( { @@ -384,9 +487,11 @@ sub admin_report_edit { if ($c->req->param('no_more_updates')) { $problem->bodies_str( $body->parent->id ); $problem->whensent( undef ); + my $extra = $problem->extra || {}; + $extra->{subdiv_overdue} = $self->overdue( $problem ); + $problem->extra( { %$extra } ); $problem->state( 'planned' ); $problem->update; - # log here $c->res->redirect( '/admin/summary' ); } } @@ -412,9 +517,15 @@ sub _admin_send_email { ? [ $problem->user->email, $problem->name ] : $problem->user->email; + # Similar to what SendReport::Zurich does to find address to send to + my $body = ( values %{$problem->bodies} )[0]; + my $sender = $body->endpoint || $c->cobrand->contact_email; + my $sender_name = $c->cobrand->contact_name; # $body->name? + $c->send_email( $template, { to => [ $to ], url => $c->uri_for_email( $problem->url ), + from => [ $sender, $sender_name ], } ); } @@ -457,4 +568,94 @@ sub admin_fetch_all_bodies { return @out; } +sub admin_stats { + my $self = shift; + my $c = $self->{c}; + + my %date_params; + my $ym = $c->req->params->{ym}; + my ($m, $y) = $ym =~ /^(\d+)\.(\d+)$/; + $c->stash->{ym} = $ym; + if ($y && $m) { + $c->stash->{start_date} = DateTime->new( year => $y, month => $m, day => 1 ); + $c->stash->{end_date} = $c->stash->{start_date} + DateTime::Duration->new( months => 1 ); + $date_params{created} = { '>=', $c->stash->{start_date}, '<', $c->stash->{end_date} }; + } + + my %params = ( + %date_params, + state => [ FixMyStreet::DB::Result::Problem->visible_states() ], + ); + + if ( $c->req->params->{export} ) { + my $problems = $c->model('DB::Problem')->search( { %params }, { columns => [ 'id', 'created', 'latitude', 'longitude', 'cobrand', 'category' ] } ); + my $body = "ID,Created,E,N,Category\n"; + while (my $report = $problems->next) { + $body .= join( ',', $report->id, $report->created, $report->local_coords, $report->category ) . "\n"; + } + $c->res->content_type('text/csv; charset=utf-8'); + $c->res->body($body); + } + + # Total reports (non-hidden) + my $total = $c->model('DB::Problem')->search( \%params )->count; + # Device for apps (iOS/Android) + my $per_service = $c->model('DB::Problem')->search( \%params, { + select => [ 'service', { count => 'id' } ], + as => [ 'service', 'c' ], + group_by => [ 'service' ], + }); + # Reports solved + my $solved = $c->model('DB::Problem')->search( { state => 'fixed - council', %date_params } )->count; + # Reports marked as spam + my $hidden = $c->model('DB::Problem')->search( { state => 'hidden', %date_params } )->count; + # Reports assigned to third party + my $closed = $c->model('DB::Problem')->search( { state => 'closed', %date_params } )->count; + # Reports moderated within 1 day + my $moderated = $c->model('DB::Problem')->search( { extra => { like => '%moderated_overdue,I1:0%' }, %params } )->count; + # Reports solved within 5 days + my $subdiv_dealtwith = $c->model('DB::Problem')->search( { extra => { like => '%subdiv_overdue,I1:0%' }, %params } )->count; + # Reports per category + my $per_category = $c->model('DB::Problem')->search( \%params, { + select => [ 'category', { count => 'id' } ], + as => [ 'category', 'c' ], + group_by => [ 'category' ], + }); + # How many reports have had their category changed by a DM (wrong category chosen by user) + my $changed = $c->model('DB::Problem')->search( { extra => { like => '%changed_category,I1:1%' }, %params } )->count; + # pictures taken + my $pictures_taken = $c->model('DB::Problem')->search( { photo => { '!=', undef }, %params } )->count; + # pictures published + my $pictures_published = $c->model('DB::Problem')->search( { extra => { like => '%publish_photo,I1:1%' }, %params } )->count; + # how many times was a telephone number provided + # XXX => How many users have a telephone number stored + # my $phone = $c->model('DB::User')->search( { phone => { '!=', undef } } )->count; + # how many times was the email address confirmed + my $email_confirmed = $c->model('DB::Problem')->search( { extra => { like => '%email_confirmed%' }, %params } )->count; + # how many times was the name provided + my $name = $c->model('DB::Problem')->search( { name => { '!=', '' }, %params } )->count; + # how many times was the geolocation used vs. addresssearch + # ? + + $c->stash( + per_service => $per_service, + per_category => $per_category, + reports_total => $total, + reports_solved => $solved, + reports_spam => $hidden, + reports_assigned => $closed, + reports_moderated => $moderated, + reports_dealtwith => $subdiv_dealtwith, + reports_category_changed => $changed, + pictures_taken => $pictures_taken, + pictures_published => $pictures_published, + #users_phone => $phone, + email_confirmed => $email_confirmed, + name_provided => $name, + # GEO + ); + + return 1; +} + 1; diff --git a/perllib/FixMyStreet/DB/Result/Alert.pm b/perllib/FixMyStreet/DB/Result/Alert.pm index ca9ad45c2..fc84c8fd5 100644 --- a/perllib/FixMyStreet/DB/Result/Alert.pm +++ b/perllib/FixMyStreet/DB/Result/Alert.pm @@ -77,22 +77,21 @@ with 'FixMyStreet::Roles::Abuser'; my $tz = DateTime::TimeZone->new( name => "local" ); - -sub whensubscribed_local { - my $self = shift; - - return $self->whensubscribed - ? $self->whensubscribed->set_time_zone($tz) - : $self->whensubscribed; -} - -sub whendisabled_local { - my $self = shift; - - return $self->whendisabled - ? $self->whendisabled->set_time_zone($tz) - : $self->whendisabled; -} +my $tz_f; +$tz_f = DateTime::TimeZone->new( name => FixMyStreet->config('TIME_ZONE') ) + if FixMyStreet->config('TIME_ZONE'); + +my $stz = sub { + my ( $orig, $self ) = ( shift, shift ); + my $s = $self->$orig(@_); + return $s unless $s && UNIVERSAL::isa($s, "DateTime"); + $s->set_time_zone($tz); + $s->set_time_zone($tz_f) if $tz_f; + return $s; +}; + +around whensubscribed => $stz; +around whendisabled => $stz; =head2 confirm diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm index 33fbb9356..eb9e52a65 100644 --- a/perllib/FixMyStreet/DB/Result/Comment.pm +++ b/perllib/FixMyStreet/DB/Result/Comment.pm @@ -116,23 +116,21 @@ with 'FixMyStreet::Roles::Abuser'; my $tz = DateTime::TimeZone->new( name => "local" ); -sub created_local { - my $self = shift; - - return $self->created - ? $self->created->set_time_zone($tz) - : $self->created; -} - -sub confirmed_local { - my $self = shift; - - # if confirmed is null then it doesn't get inflated so don't - # try and set the timezone - return $self->confirmed - ? $self->confirmed->set_time_zone($tz) - : $self->confirmed; -} +my $tz_f; +$tz_f = DateTime::TimeZone->new( name => FixMyStreet->config('TIME_ZONE') ) + if FixMyStreet->config('TIME_ZONE'); + +my $stz = sub { + my ( $orig, $self ) = ( shift, shift ); + my $s = $self->$orig(@_); + return $s unless $s && UNIVERSAL::isa($s, "DateTime"); + $s->set_time_zone($tz); + $s->set_time_zone($tz_f) if $tz_f; + return $s; +}; + +around created => $stz; +around confirmed => $stz; # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index 24aa12944..ec15600b6 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -301,6 +301,7 @@ sub all_states { 'confirmed' => 1, 'investigating' => 1, 'in progress' => 1, + 'planned' => 1, 'action scheduled' => 1, 'fixed' => 1, 'fixed - council' => 1, @@ -342,37 +343,23 @@ sub council_states { my $tz = DateTime::TimeZone->new( name => "local" ); -sub confirmed_local { - my $self = shift; - - return $self->confirmed - ? $self->confirmed->set_time_zone($tz) - : $self->confirmed; -} - -sub created_local { - my $self = shift; - - return $self->created - ? $self->created->set_time_zone($tz) - : $self->created; -} - -sub whensent_local { - my $self = shift; +my $tz_f; +$tz_f = DateTime::TimeZone->new( name => FixMyStreet->config('TIME_ZONE') ) + if FixMyStreet->config('TIME_ZONE'); - return $self->whensent - ? $self->whensent->set_time_zone($tz) - : $self->whensent; -} - -sub lastupdate_local { - my $self = shift; +my $stz = sub { + my ( $orig, $self ) = ( shift, shift ); + my $s = $self->$orig(@_); + return $s unless $s && UNIVERSAL::isa($s, "DateTime"); + $s->set_time_zone($tz); + $s->set_time_zone($tz_f) if $tz_f; + return $s; +}; - return $self->lastupdate - ? $self->lastupdate->set_time_zone($tz) - : $self->lastupdate; -} +around created => $stz; +around confirmed => $stz; +around whensent => $stz; +around lastupdate => $stz; around service => sub { my ( $orig, $self ) = ( shift, shift ); @@ -574,7 +561,7 @@ meta data about the report. sub meta_line { my ( $problem, $c ) = @_; - my $date_time = Utils::prettify_dt( $problem->confirmed_local ); + my $date_time = Utils::prettify_dt( $problem->confirmed ); my $meta = ''; # FIXME Should be in cobrand @@ -709,7 +696,7 @@ sub duration_string { my ( $problem, $c ) = @_; my $body = $problem->body( $c ); return sprintf(_('Sent to %s %s later'), $body, - Utils::prettify_duration($problem->whensent_local->epoch - $problem->confirmed_local->epoch, 'minute') + Utils::prettify_duration($problem->whensent->epoch - $problem->confirmed->epoch, 'minute') ); } @@ -832,8 +819,8 @@ sub as_hashref { is_fixed => $self->fixed_states->{ $self->state } ? 1 : 0, photo => $self->get_photo_params, meta => $self->confirmed ? $self->meta_line( $c ) : '', - confirmed_pp => $self->confirmed ? Utils::prettify_dt( $self->confirmed_local, 1 ): '', - created_pp => Utils::prettify_dt( $self->created_local, 1 ), + confirmed_pp => $self->confirmed ? $c->cobrand->prettify_dt( $self->confirmed ): '', + created_pp => $c->cobrand->prettify_dt( $self->created ), }; } diff --git a/perllib/FixMyStreet/DB/Result/Questionnaire.pm b/perllib/FixMyStreet/DB/Result/Questionnaire.pm index b6791603a..fcaa17d99 100644 --- a/perllib/FixMyStreet/DB/Result/Questionnaire.pm +++ b/perllib/FixMyStreet/DB/Result/Questionnaire.pm @@ -44,23 +44,25 @@ __PACKAGE__->belongs_to( # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NGlSRjoBpDoIvK3EueqN6Q use DateTime::TimeZone; +use Moose; +use namespace::clean -except => [ 'meta' ]; my $tz = DateTime::TimeZone->new( name => "local" ); -sub whensent_local { - my $self = shift; +my $tz_f; +$tz_f = DateTime::TimeZone->new( name => FixMyStreet->config('TIME_ZONE') ) + if FixMyStreet->config('TIME_ZONE'); - return $self->whensent - ? $self->whensent->set_time_zone($tz) - : $self->whensent; -} +my $stz = sub { + my ( $orig, $self ) = ( shift, shift ); + my $s = $self->$orig(@_); + return $s unless $s && UNIVERSAL::isa($s, "DateTime"); + $s->set_time_zone($tz); + $s->set_time_zone($tz_f) if $tz_f; + return $s; +}; -sub whenanswered_local { - my $self = shift; - - return $self->whenanswered - ? $self->whenanswered->set_time_zone($tz) - : $self->whenanswered; -} +around whensent => $stz; +around whenanswered => $stz; 1; diff --git a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm index 8e9b3d17e..f2b86725d 100644 --- a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm +++ b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm @@ -236,6 +236,7 @@ sub _send_aggregated_alert_email(%) { { _template_ => $template, _parameters_ => \%data, + _line_indent => $cobrand->email_indent, From => [ $sender, _($cobrand->contact_name) ], To => $data{alert_email}, }, diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm index 116151753..dc1c5c248 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm @@ -269,7 +269,7 @@ sub send_reports { # Template variables for the email my $email_base_url = $cobrand->base_url_for_report($row); my %h = map { $_ => $row->$_ } qw/id title detail name category latitude longitude used_map/; - map { $h{$_} = $row->user->$_ } qw/email phone/; + map { $h{$_} = $row->user->$_ || '' } qw/email phone/; $h{confirmed} = DateTime::Format::Pg->format_datetime( $row->confirmed->truncate (to => 'second' ) ) if $row->confirmed; diff --git a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm index 1b9521a9f..8d811180e 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm @@ -101,6 +101,7 @@ sub send_questionnaires_period { { _template_ => $template, _parameters_ => \%h, + _line_indent => $cobrand->email_indent, To => [ [ $row->user->email, $row->name ] ], From => [ $sender, $sender_name ], }, diff --git a/perllib/FixMyStreet/Map/Zurich.pm b/perllib/FixMyStreet/Map/Zurich.pm index 262b6e229..e09f8c90f 100644 --- a/perllib/FixMyStreet/Map/Zurich.pm +++ b/perllib/FixMyStreet/Map/Zurich.pm @@ -13,9 +13,10 @@ use Geo::Coordinates::CH1903; use Math::Trig; use Utils; -use constant ZOOM_LEVELS => 7; +use constant ZOOM_LEVELS => 8; use constant DEFAULT_ZOOM => 5; use constant MIN_ZOOM_LEVEL => 0; +use constant ID_OFFSET => 2; sub map_tiles { my ( $self, %params ) = @_; @@ -30,7 +31,7 @@ sub map_tiles { } sub base_tile_url { - return 'http://www.wmts.stadt-zuerich.ch/Hybrid/MapServer/WMTS/tile/1.0.0/Hybrid/default/nativeTileMatrixSet'; + return '/maps/Hybrid/1.0.0/Hybrid/default/nativeTileMatrixSet'; } sub copyright { @@ -45,31 +46,24 @@ sub copyright { sub display_map { my ($self, $c, %params) = @_; - my $numZoomLevels = ZOOM_LEVELS; - my $zoomOffset = MIN_ZOOM_LEVEL; -# if ($params{any_zoom}) { -# $numZoomLevels = 10; -# $zoomOffset = 0; -# } - - # TODO Adjust zoom level dependent upon population density - my $default_zoom = DEFAULT_ZOOM; - # Map centre may be overridden in the query string $params{latitude} = Utils::truncate_coordinate($c->req->params->{lat} + 0) if defined $c->req->params->{lat}; $params{longitude} = Utils::truncate_coordinate($c->req->params->{lon} + 0) if defined $c->req->params->{lon}; - my $zoom = defined $c->req->params->{zoom} ? $c->req->params->{zoom} + 0 : $default_zoom; - $zoom = $numZoomLevels - 1 if $zoom >= $numZoomLevels; + my $zoom = defined $c->req->params->{zoom} + ? $c->req->params->{zoom} + 0 + : $c->stash->{page} eq 'report' + ? DEFAULT_ZOOM+1 + : DEFAULT_ZOOM; + $zoom = ZOOM_LEVELS - 1 if $zoom >= ZOOM_LEVELS; $zoom = 0 if $zoom < 0; - $params{zoom_act} = $zoomOffset + $zoom; - ($params{x_tile}, $params{y_tile}, $params{matrix_id}) = latlon_to_tile_with_adjust($params{latitude}, $params{longitude}, $params{zoom_act}); + ($params{x_tile}, $params{y_tile}, $params{matrix_id}) = latlon_to_tile_with_adjust($params{latitude}, $params{longitude}, $zoom); foreach my $pin (@{$params{pins}}) { - ($pin->{px}, $pin->{py}) = latlon_to_px($pin->{latitude}, $pin->{longitude}, $params{x_tile}, $params{y_tile}, $params{zoom_act}); + ($pin->{px}, $pin->{py}) = latlon_to_px($pin->{latitude}, $pin->{longitude}, $params{x_tile}, $params{y_tile}, $zoom); } $c->stash->{map} = { @@ -79,8 +73,8 @@ sub display_map { tiles => $self->map_tiles( %params ), copyright => $self->copyright(), zoom => $zoom, - zoomOffset => $zoomOffset, - numZoomLevels => $numZoomLevels, + zoomOffset => MIN_ZOOM_LEVEL, + numZoomLevels => ZOOM_LEVELS, }; } @@ -90,13 +84,11 @@ sub latlon_to_tile($$$) { my ($x, $y) = Geo::Coordinates::CH1903::from_latlon($lat, $lon); - my $matrix_id = $zoom; - $matrix_id = 0 if $matrix_id < 0; - - my @scales = ( '250000', '125000', '64000', '32000', '16000', '8000', '4000', '2000', '1000' ); + my $matrix_id = $zoom + ID_OFFSET; + my @scales = ( '250000', '125000', '64000', '32000', '16000', '8000', '4000', '2000', '1000', '500' ); my $tileOrigin = { lat => 30814423, lon => -29386322 }; my $tileSize = 256; - my $res = $scales[$zoom] / (39.3701 * 96); # OpenLayers.INCHES_PER_UNIT[units] * OpenLayers.DOTS_PER_INCH + my $res = $scales[$matrix_id] / (39.3701 * 96); # OpenLayers.INCHES_PER_UNIT[units] * OpenLayers.DOTS_PER_INCH my $fx = ( $x - $tileOrigin->{lon} ) / ($res * $tileSize); my $fy = ( $tileOrigin->{lat} - $y ) / ($res * $tileSize); @@ -124,10 +116,11 @@ sub latlon_to_tile_with_adjust($$$) { sub tile_to_latlon { my ($fx, $fy, $zoom) = @_; + my $matrix_id = $zoom + ID_OFFSET; my @scales = ( '250000', '125000', '64000', '32000', '16000', '8000', '4000', '2000', '1000', '500' ); my $tileOrigin = { lat => 30814423, lon => -29386322 }; my $tileSize = 256; - my $res = $scales[$zoom] / (39.3701 * 96); # OpenLayers.INCHES_PER_UNIT[units] * OpenLayers.DOTS_PER_INCH + my $res = $scales[$matrix_id] / (39.3701 * 96); # OpenLayers.INCHES_PER_UNIT[units] * OpenLayers.DOTS_PER_INCH my $x = $fx * $res * $tileSize + $tileOrigin->{lon}; my $y = $tileOrigin->{lat} - $fy * $res * $tileSize; @@ -164,12 +157,11 @@ sub click_to_tile { # Given some click co-ords (the tile they were on, and where in the # tile they were), convert to WGS84 and return. -# XXX Note use of MIN_ZOOM_LEVEL here. (Copied from OSM, needed here?) sub click_to_wgs84 { my ($self, $c, $pin_tile_x, $pin_x, $pin_tile_y, $pin_y) = @_; my $tile_x = click_to_tile($pin_tile_x, $pin_x); my $tile_y = click_to_tile($pin_tile_y, $pin_y); - my $zoom = MIN_ZOOM_LEVEL + (defined $c->req->params->{zoom} ? $c->req->params->{zoom} : DEFAULT_ZOOM); + my $zoom = (defined $c->req->params->{zoom} ? $c->req->params->{zoom} : DEFAULT_ZOOM); my ($lat, $lon) = tile_to_latlon($tile_x, $tile_y, $zoom); return ( $lat, $lon ); } diff --git a/perllib/FixMyStreet/SendReport/Email.pm b/perllib/FixMyStreet/SendReport/Email.pm index 1ff476da3..9006e2f11 100644 --- a/perllib/FixMyStreet/SendReport/Email.pm +++ b/perllib/FixMyStreet/SendReport/Email.pm @@ -87,6 +87,7 @@ sub send { { _template_ => $self->get_template( $row ), _parameters_ => $h, + _line_indent => $row->cobrand eq 'zurich' ? '' : undef, # XXX Access to Cobrand module here? To => $self->to, From => $self->send_from( $row ), }, diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm index 61f59f725..1ad7f5b05 100644 --- a/perllib/FixMyStreet/SendReport/Open311.pm +++ b/perllib/FixMyStreet/SendReport/Open311.pm @@ -43,7 +43,7 @@ sub send { my $revert = 0; # Extra bromley fields - if ( $row->bodies_str == 2482 ) { + if ( $row->bodies_str eq '2482' ) { $revert = 1; @@ -57,7 +57,7 @@ sub send { push @$extra, { name => 'report_title', value => $row->title }; push @$extra, { name => 'public_anonymity_required', value => $row->anonymous ? 'TRUE' : 'FALSE' }; push @$extra, { name => 'email_alerts_requested', value => 'FALSE' }; # always false as can never request them - push @$extra, { name => 'requested_datetime', value => DateTime::Format::W3CDTF->format_datetime($row->confirmed_local->set_nanosecond(0)) }; + push @$extra, { name => 'requested_datetime', value => DateTime::Format::W3CDTF->format_datetime($row->confirmed->set_nanosecond(0)) }; push @$extra, { name => 'email', value => $row->user->email }; $row->extra( $extra ); diff --git a/perllib/FixMyStreet/SendReport/Zurich.pm b/perllib/FixMyStreet/SendReport/Zurich.pm index e0c95283e..d46561e9e 100644 --- a/perllib/FixMyStreet/SendReport/Zurich.pm +++ b/perllib/FixMyStreet/SendReport/Zurich.pm @@ -9,12 +9,14 @@ sub build_recipient_list { # Only one body ever, most of the time with an email endpoint my $body = @{ $self->bodies }[0]; - $body = FixMyStreet::App->model("DB::Body")->find( { id => $row->external_body } ) - if $row->external_body; + if ( $row->external_body ) { + $body = FixMyStreet::App->model("DB::Body")->find( { id => $row->external_body } ); + $h->{bodies_name} = $body->name; + } my $body_email = $body->endpoint; - my @bodies = $body->bodies; - if ($body->parent && @bodies) { + my $parent = $body->parent; + if ($parent && !$parent->parent) { # Division, might have an individual contact email address my $contact = FixMyStreet::App->model("DB::Contact")->find( { body_id => $body->id, @@ -49,9 +51,22 @@ sub get_template { return $template; } -# Zurich emails come from the site itself +# Zurich emails come from the site itself, unless it's to an external body, +# in which case it's from the category/body sub send_from { my ( $self, $row ) = @_; + + if ( $row->external_body ) { + my $body = @{ $self->bodies }[0]; + my $body_email = $body->endpoint; + my $contact = FixMyStreet::App->model("DB::Contact")->find( { + body_id => $body->id, + category => $row->category + } ); + $body_email = $contact->email if $contact && $contact->email; + return [ $body_email, FixMyStreet->config('CONTACT_NAME') ]; + } + return [ FixMyStreet->config('CONTACT_EMAIL'), FixMyStreet->config('CONTACT_NAME') ]; } diff --git a/perllib/Open311.pm b/perllib/Open311.pm index efa0ac64f..3be5ac365 100644 --- a/perllib/Open311.pm +++ b/perllib/Open311.pm @@ -322,7 +322,7 @@ sub _populate_service_request_update_params { } my $params = { - updated_datetime => DateTime::Format::W3CDTF->format_datetime($comment->confirmed_local->set_nanosecond(0)), + updated_datetime => DateTime::Format::W3CDTF->format_datetime($comment->confirmed->set_nanosecond(0)), service_request_id => $comment->problem->external_id, status => $status, email => $comment->user->email, diff --git a/perllib/Open311/GetServiceRequestUpdates.pm b/perllib/Open311/GetServiceRequestUpdates.pm index aae0940c7..ae1f06a50 100644 --- a/perllib/Open311/GetServiceRequestUpdates.pm +++ b/perllib/Open311/GetServiceRequestUpdates.pm @@ -120,7 +120,7 @@ sub update_comments { # if the comment is older than the last update # do not change the status of the problem as it's # tricky to determine the right thing to do. - if ( $comment->created_local > $p->lastupdate_local ) { + if ( $comment->created > $p->lastupdate ) { my $state = $self->map_state( $request->{status} ); # don't update state unless it's an allowed state and it's diff --git a/perllib/Utils.pm b/perllib/Utils.pm index 04d973067..27d604a59 100644 --- a/perllib/Utils.pm +++ b/perllib/Utils.pm @@ -226,12 +226,7 @@ sub prettify_dt { $type ||= ''; $type = 'short' if $type eq '1'; - $dt->set_time_zone( FixMyStreet->config('TIME_ZONE') ) - if FixMyStreet->config('TIME_ZONE'); - - my $now = DateTime->now( time_zone => 'local' ); - $now->set_time_zone( FixMyStreet->config('TIME_ZONE') ) - if FixMyStreet->config('TIME_ZONE'); + my $now = DateTime->now( time_zone => FixMyStreet->config('TIME_ZONE') || 'local' ); my $tt = ''; $tt = $dt->strftime('%H:%M') unless $type eq 'date'; diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t index 8963e417d..65e252954 100644 --- a/t/app/controller/admin.t +++ b/t/app/controller/admin.t @@ -1050,7 +1050,7 @@ subtest 'report search' => sub { $report->update; $mech->get_ok('/admin/reports?search=' . $report->user->email); - $mech->content_like( qr{<tr [^>]*hidden[^>]*> \s* <td> \s* $r_id \s* </td>}xs ); + $mech->content_like( qr{<tr [^>]*hidden[^>]*> \s* <td[^>]*> \s* $r_id \s* </td>}xs ); $report->state('fixed - user'); $report->update; diff --git a/t/app/controller/around.t b/t/app/controller/around.t index 0f01a9ea9..fa2d94aed 100644 --- a/t/app/controller/around.t +++ b/t/app/controller/around.t @@ -7,7 +7,7 @@ my $mech = FixMyStreet::TestMech->new; subtest "check that if no query we get sent back to the homepage" => sub { $mech->get_ok('/around'); - is $mech->uri->path, '/around', "still at '/around'"; + is $mech->uri->path, '/', "redirected to '/'"; }; # x,y requests were generated by the old map code. We keep the behavior for diff --git a/t/app/controller/auth.t b/t/app/controller/auth.t index 67466e959..8d7bfbf4d 100644 --- a/t/app/controller/auth.t +++ b/t/app/controller/auth.t @@ -95,7 +95,7 @@ $mech->not_logged_in_ok; $mech->log_out_ok; $mech->get_ok($link); is $mech->uri, $link, "not logged in"; - $mech->content_contains( 'Link too old or already used', + $mech->content_contains( 'too old or already used', 'token now invalid' ); $mech->not_logged_in_ok; } diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index 868977953..722c3c39c 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -17,7 +17,7 @@ ok -e $sample_file, "sample file $sample_file exists"; subtest "test that bare requests to /report/new get redirected" => sub { $mech->get_ok('/report/new'); - is $mech->uri->path, '/around', "went to /around"; + is $mech->uri->path, '/', "went to /"; is_deeply { $mech->uri->query_form }, {}, "query empty"; $mech->get_ok('/report/new?pc=SW1A%201AA'); diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index cdebee35d..aa34b1a2c 100644 --- a/t/app/controller/report_updates.t +++ b/t/app/controller/report_updates.t @@ -807,7 +807,7 @@ subtest 'check meta correct for second comment marking as reopened' => sub { user => $user, problem_id => $report->id, text => 'update text', - confirmed => DateTime->now, + confirmed => DateTime->now + DateTime::Duration->new( minutes => 1 ), problem_state => 'confirmed', anonymous => 0, mark_open => 0, diff --git a/t/app/model/comment.t b/t/app/model/comment.t index 93104c2e5..3141af828 100644 --- a/t/app/model/comment.t +++ b/t/app/model/comment.t @@ -23,5 +23,5 @@ my $comment = $comment_rs->new( } ); -is $comment->confirmed_local, undef, 'inflating null confirmed ok'; -is $comment->created_local, undef, 'inflating null confirmed ok'; +is $comment->confirmed, undef, 'inflating null confirmed ok'; +is $comment->created, undef, 'inflating null confirmed ok'; diff --git a/t/app/model/problem.t b/t/app/model/problem.t index a92e3b079..6ba2bbde4 100644 --- a/t/app/model/problem.t +++ b/t/app/model/problem.t @@ -32,10 +32,10 @@ my $problem = $problem_rs->new( } ); -is $problem->confirmed_local, undef, 'inflating null confirmed ok'; -is $problem->whensent_local, undef, 'inflating null confirmed ok'; -is $problem->lastupdate_local, undef, 'inflating null confirmed ok'; -is $problem->created_local, undef, 'inflating null confirmed ok'; +is $problem->confirmed, undef, 'inflating null confirmed ok'; +is $problem->whensent, undef, 'inflating null confirmed ok'; +is $problem->lastupdate, undef, 'inflating null confirmed ok'; +is $problem->created, undef, 'inflating null confirmed ok'; for my $test ( { diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t index f354f0da4..ac0cc52b3 100644 --- a/t/cobrand/zurich.t +++ b/t/cobrand/zurich.t @@ -1,5 +1,4 @@ # TODO -# Report to third party (with third_personal) # Overdue alerts use strict; @@ -20,6 +19,8 @@ $mech->content_like( qr/zurich/i ); # Set up bodies my $zurich = $mech->create_body_ok( 1, 'Zurich' ); +$zurich->parent( undef ); +$zurich->update; my $division = $mech->create_body_ok( 2, 'Division 1' ); $division->parent( $zurich->id ); $division->send_method( 'Zurich' ); @@ -30,6 +31,10 @@ $subdivision->parent( $division->id ); $subdivision->send_method( 'Zurich' ); $subdivision->endpoint( 'subdivision@example.org' ); $subdivision->update; +my $external_body = $mech->create_body_ok( 4, 'External Body' ); +$external_body->send_method( 'Zurich' ); +$external_body->endpoint( 'external_body@example.org' ); +$external_body->update; my @reports = $mech->create_problems_for_body( 1, 2, 'Test', { state => 'unconfirmed', @@ -49,7 +54,7 @@ my $user = $mech->log_in_ok( 'dm1@example.org') ; $user->from_body( undef ); $user->update; $mech->get_ok( '/admin' ); -is $mech->uri->path, '/auth', "got sent to the sign in page"; +is $mech->uri->path, '/my', "got sent to /my"; $user->from_body( 2 ); $user->update; @@ -61,6 +66,7 @@ $mech->content_contains( DateTime->now->strftime("%d.%m.%Y") ); $mech->content_contains( 'Erfasst' ); $mech->get_ok( '/admin/report_edit/' . $report->id ); +$mech->content_contains( 'Unbestätigt' ); # Unconfirmed email $mech->submit_form_ok( { with_fields => { state => 'confirmed' } } ); $mech->get_ok( '/report/' . $report->id ); $mech->content_contains('Aufgenommen'); @@ -82,7 +88,7 @@ $mech->content_contains( 'Some internal notes' ); # Original description $mech->submit_form_ok( { with_fields => { detail => 'Edited details text.' } } ); $mech->content_contains( 'Edited details text.' ); -$mech->content_contains( 'originally entered: “Test Test 1 for 2 Detail”' ); +$mech->content_contains( 'Originaltext: “Test Test 1 for 2 Detail”' ); $mech->get_ok( '/admin/report_edit/' . $report->id ); $mech->submit_form_ok( { with_fields => { body_subdivision => 3 } } ); @@ -101,7 +107,7 @@ $mech->log_out_ok; $user = $mech->log_in_ok( 'sdm1@example.org') ; $mech->get_ok( '/admin' ); -is $mech->uri->path, '/auth', "got sent to the sign in page"; +is $mech->uri->path, '/my', "got sent to /my"; $user->from_body( 3 ); $user->update; @@ -149,6 +155,7 @@ $report->extra ( { %$extra } ); $report->update; $mech->get_ok( '/admin/report_edit/' . $report->id ); +$mech->content_lacks( 'Unbestätigt' ); # Confirmed email $mech->submit_form_ok( { with_fields => { status_update => 'FINAL UPDATE' } } ); $mech->form_with_fields( 'status_update' ); $mech->submit_form_ok( { button => 'publish_response' } ); @@ -160,9 +167,77 @@ $mech->content_contains('FINAL UPDATE'); $email = $mech->get_email; like $email->header('To'), qr/test\@example.com/, 'to line looks correct'; +like $email->header('From'), qr/division\@example.org/, 'from line looks correct'; like $email->body, qr/FINAL UPDATE/, 'body looks correct'; $mech->clear_emails_ok; +# Assign directly to planned, don't confirm email +@reports = $mech->create_problems_for_body( 1, 2, 'Second', { + state => 'unconfirmed', + confirmed => undef, + cobrand => 'zurich', +}); +$report = $reports[0]; + +$mech->get_ok( '/admin/report_edit/' . $report->id ); +$mech->submit_form_ok( { with_fields => { state => 'planned' } } ); +$mech->get_ok( '/report/' . $report->id ); +$mech->content_contains('In Bearbeitung'); +$mech->content_contains('Second Test'); + +$mech->get_ok( '/admin/report_edit/' . $report->id ); +$mech->content_contains( 'Unbestätigt' ); +$mech->submit_form_ok( { button => 'publish_response', with_fields => { status_update => 'FINAL UPDATE' } } ); + +$mech->get_ok( '/report/' . $report->id ); +$mech->content_contains('Erledigt'); +$mech->content_contains('Second Test'); +$mech->content_contains('FINAL UPDATE'); + +$mech->email_count_is(0); + +# Report assigned to third party + +@reports = $mech->create_problems_for_body( 1, 2, 'Third', { + state => 'unconfirmed', + confirmed => undef, + cobrand => 'zurich', +}); +$report = $reports[0]; + +$mech->get_ok( '/admin/report_edit/' . $report->id ); +$mech->submit_form_ok( { with_fields => { body_external => 4 } } ); +$mech->get_ok( '/report/' . $report->id ); +$mech->content_contains('Erledigt'); +$mech->content_contains('Third Test'); +$mech->content_contains('An Fachbereich zuweisen: External Body'); +FixMyStreet::App->model('DB::Problem')->send_reports('zurich'); +$email = $mech->get_email; +like $email->header('Subject'), qr/Neue Meldung/, 'subject looks okay'; +like $email->header('To'), qr/external_body\@example.org/, 'to line looks correct'; +like $email->body, qr/External Body/, 'body has right name'; +unlike $email->body, qr/test\@example.com/, 'body does not contain email address'; +$mech->clear_emails_ok; + +# Test calling back, and third_personal boolean setting +$mech->get_ok( '/admin' ); +is $mech->uri->path, '/admin', "am logged in"; +$mech->content_contains( 'report_edit/' . $report->id ); +$mech->get_ok( '/admin/report_edit/' . $report->id ); +$mech->submit_form_ok( { with_fields => { state => 'unconfirmed' } } ); +$mech->submit_form_ok( { with_fields => { body_external => 4, third_personal => 1 } } ); +$mech->get_ok( '/report/' . $report->id ); +$mech->content_contains('Erledigt'); +$mech->content_contains('Third Test'); +$mech->content_contains('An Fachbereich zuweisen: External Body'); +FixMyStreet::App->model('DB::Problem')->send_reports('zurich'); +$email = $mech->get_email; +like $email->header('Subject'), qr/Neue Meldung/, 'subject looks okay'; +like $email->header('To'), qr/external_body\@example.org/, 'to line looks correct'; +like $email->body, qr/External Body/, 'body has right name'; +like $email->body, qr/test\@example.com/, 'body does contain email address'; +$mech->clear_emails_ok; + $mech->delete_problems_for_body( 2 ); $mech->delete_user( 'dm1@example.org' ); $mech->delete_user( 'sdm1@example.org' ); diff --git a/templates/email/default/login.txt b/templates/email/default/login.txt index 608d99ee9..762407b01 100644 --- a/templates/email/default/login.txt +++ b/templates/email/default/login.txt @@ -1,4 +1,4 @@ -Subject: [% loc('Your FixMyStreet.com account details') %] +Subject: Your FixMyStreet.com account details Please click on the link below to confirm your email address. Then you will be able to view your problem reports and manage them more easily. diff --git a/templates/email/zurich/alert-moderation-overdue.txt b/templates/email/zurich/alert-moderation-overdue.txt index c3aab66d2..c31d5c349 100644 --- a/templates/email/zurich/alert-moderation-overdue.txt +++ b/templates/email/zurich/alert-moderation-overdue.txt @@ -1,6 +1,6 @@ -Subject: eskalierte Meldungen auf Fix my Zurich +Subject: eskalierte Meldungen auf Züri wie neu -Die folgenden Meldungen auf Fix my Zurich sind älter als einen Tag und müssen dringend bearbeitet werden: +Die folgenden Meldungen auf <<Züri wie neu>> sind älter als einen Tag und müssen dringend bearbeitet werden: <?=$values['data']?> diff --git a/templates/email/zurich/alert-overdue.txt b/templates/email/zurich/alert-overdue.txt index 3301feee5..92bb58f26 100644 --- a/templates/email/zurich/alert-overdue.txt +++ b/templates/email/zurich/alert-overdue.txt @@ -1,4 +1,4 @@ -Subject: Rückmeldung erforderlich auf Fix my Zurich +Subject: Rückmeldung erforderlich auf Züri wie neu Die folgenden Meldungen wurden eskaliert, da sie nicht innerhalb von fünf Tagen beantwortet worden sind: diff --git a/templates/email/zurich/login.txt b/templates/email/zurich/login.txt new file mode 100644 index 000000000..6c7b91330 --- /dev/null +++ b/templates/email/zurich/login.txt @@ -0,0 +1,6 @@ +Subject: Ihr Züri wie neu Konto + +Bitte klicken Sie auf den Link um Ihre E-Mail-Adresse zu bestätigen und sich direkt einzuloggen. + +[% c.uri_for_action( 'auth/token', token ) %] + diff --git a/templates/email/zurich/problem-closed.txt b/templates/email/zurich/problem-closed.txt index d7482d8eb..bc0a4141f 100644 --- a/templates/email/zurich/problem-closed.txt +++ b/templates/email/zurich/problem-closed.txt @@ -1,17 +1,18 @@ -Subject: FixMyZurich: Meldung #[% problem.id %] +Subject: Züri wie neu: Meldung #[% problem.id %] -Guten Tag [% problem.name %] +Grüezi [% problem.name %] -Antwort auf Ihre Meldung: +Besten Dank für Ihre Meldung auf <<Züri wie neu>>. Ihr Anliegen wurde wie folgt beantwortet: [% problem.extra.public_response %] -Um die Meldung auf der Webseite zu betrachen, klicken Sie auf folgenden Link: +Unter: [% url %] +finden Sie Ihre Meldung auf der Website. -Ihre Meldung: +Ihre Meldung lautet: [% problem.detail %] -Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht auf dieses E-Mail. +Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht darauf. diff --git a/templates/email/zurich/problem-confirm.txt b/templates/email/zurich/problem-confirm.txt index 401591681..9518481e5 100755..100644 --- a/templates/email/zurich/problem-confirm.txt +++ b/templates/email/zurich/problem-confirm.txt @@ -1,13 +1,17 @@ -Subject: Fix my Zurich: Meldung #[% report.id %] +Subject: Züri wie neu: Meldung #[% report.id %] -Guten Tag [% report.name %] +Grüezi [% report.name %] -Bitte klicken Sie auf den untenstehenden Link, um Ihre Meldung zu bestätigen. Falls der Link nicht funktioniert, kopieren Sie ihn in Ihren Browser: +Besten Dank für Ihre Meldung auf <<Züri wie neu>>. Klicken Sie bitte auf diesen Link, um Ihre E-Mail-Adresse zu bestätigen und über den Status der Meldung informiert zu bleiben. Falls der Link nicht funktioniert, kopieren Sie ihn in Ihren Browser: [% token_url %] -Ihre Meldung: +Wir werden Ihr Anliegen innerhalb der nächsten sechs Arbeitstage beantworten. + + +Ihre Meldung lautet: [% report.detail %] -Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht auf dieses E-Mail. + +Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht darauf. diff --git a/templates/email/zurich/problem-external.txt b/templates/email/zurich/problem-external.txt index bcc1468d4..21bd364ed 100644 --- a/templates/email/zurich/problem-external.txt +++ b/templates/email/zurich/problem-external.txt @@ -1,15 +1,17 @@ -Subject: FixMyZurich: Meldung #[% problem.id %] +Subject: Züri wie neu: Meldung #[% problem.id %] -Guten Tag [% problem.name %] +Grüezi [% problem.name %] -Ihre Meldung wurde an [% problem.body(c).name %] weitergeleitet. +Besten Dank für Ihre Meldung auf <<Züri wie neu>>. Wir haben Ihr Anliegen an [% problem.body(c).name %] weitergeleitet, da es nicht in die Zuständigkeit der Stadt Zürich fällt. -Um die Meldung auf der Webseite zu betrachen, klicken Sie auf folgenden Link: +Unter: [% url %] +finden Sie Ihre Meldung auf der Website. -Ihre Meldung: + +Ihre Meldung lautet: [% problem.detail %] -Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht auf dieses E-Mail. +Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht darauf. diff --git a/templates/email/zurich/problem-rejected.txt b/templates/email/zurich/problem-rejected.txt index 447aeaefb..99917f075 100644 --- a/templates/email/zurich/problem-rejected.txt +++ b/templates/email/zurich/problem-rejected.txt @@ -1,12 +1,14 @@ -Subject: Fix my Zurich: Meldung #[% problem.id %] +Subject: Züri wie neu: Meldung #[% problem.id %] -Guten Tag [% problem.name %] +Grüezi [% problem.name %] -Ihre Meldung wurde aufgrund des Inhalts zurückgewiesen. +Ihre Meldung wurde aufgrund des Inhalts zurückgewiesen: +Die Stadt Zürich toleriert keine beleidigenden, rassistischen oder sexistischen Meldungen. Offensichtliche Falschmeldungen werden nicht behandelt. -Ihre Meldung: + +Ihre Meldung lautet: [% problem.detail %] -Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht auf dieses E-Mail. +Dieses E-Mail wurde automatisch generiert. Bitte antworten Sie nicht darauf. diff --git a/templates/email/zurich/reply-autoresponse.txt b/templates/email/zurich/reply-autoresponse.txt index be927f72b..c47a6186f 100755 --- a/templates/email/zurich/reply-autoresponse.txt +++ b/templates/email/zurich/reply-autoresponse.txt @@ -7,4 +7,4 @@ Dies ist eine automatische Antwort auf Ihr E-Mail. Ihr E-Mail wurde nicht überm Falls Sie eine Meldung erfassen möchten, tun Sie das bitte über die Hauptseite:
[%# link to FMZ %]
-Falls Sie Fragen zu Fix my Zurich haben, senden Sie ein E-Mail an gis-zentrum@zuerich.ch
+Falls Sie Fragen zu Züri wie neu haben, senden Sie ein E-Mail an gis-zentrum@zuerich.ch
diff --git a/templates/email/zurich/submit-external-personal.txt b/templates/email/zurich/submit-external-personal.txt index 36768d3bb..1c4320af1 100644 --- a/templates/email/zurich/submit-external-personal.txt +++ b/templates/email/zurich/submit-external-personal.txt @@ -1,13 +1,13 @@ -Subject: FixMyZurich: Neue Meldung #<?=$values['id']?> +Subject: Züri wie neu: Neue Meldung #<?=$values['id']?> -Guten Tag <?=$values['bodies_name']?>, +Grüezi <?=$values['bodies_name']?>, Diese Meldung wurde Ihnen von der Stadt Zürich gesendet, da es Ihr Zuständigkeitsgebiet betreffen könnte. Öffentliche URL: <?=$values['url']?> -Reporter name: <?=$values['name']?> +Name des Meldenden: <?=$values['name']?> -Reporter email: <?=$values['email']?> +Email des Meldenden: <?=$values['email']?> -Reporter phone: <?=$values['phone']?> +Telefonnummer des Meldenden: <?=$values['phone']?> diff --git a/templates/email/zurich/submit-external.txt b/templates/email/zurich/submit-external.txt index 3e07b0664..ec497f862 100644 --- a/templates/email/zurich/submit-external.txt +++ b/templates/email/zurich/submit-external.txt @@ -1,6 +1,6 @@ -Subject: FixMyZurich: Neue Meldung #<?=$values['id']?> +Subject: Züri wie neu: Neue Meldung #<?=$values['id']?> -Guten Tag <?=$values['bodies_name']?>, +Grüezi <?=$values['bodies_name']?>, Diese Meldung wurde Ihnen von der Stadt Zürich gesendet, da es Ihr Zuständigkeitsgebiet betreffen könnte. diff --git a/templates/email/zurich/submit-feedback-pending.txt b/templates/email/zurich/submit-feedback-pending.txt index fbf9cafb9..dbdd9eedb 100755 --- a/templates/email/zurich/submit-feedback-pending.txt +++ b/templates/email/zurich/submit-feedback-pending.txt @@ -1,8 +1,8 @@ -Subject: FixMyZurich: Meldung #<?=$values['id']?> bereit für Feedback +Subject: Züri wie neu: Meldung #<?=$values['id']?> bereit für Feedback Guten Tag <?=$values['bodies_name']?>, -Diese Meldung wurde vom Fachbereich abschliessend beantwortet und kann nun auf Fix My Zurich beantwortet und abgeschlossen werden. +Diese Meldung wurde vom Fachbereich abschliessend beantwortet und kann nun auf Züri wie neu beantwortet und abgeschlossen werden. Öffentliche URL: <?=$values['url']?> diff --git a/templates/email/zurich/submit-in-progress.txt b/templates/email/zurich/submit-in-progress.txt index 809ba4653..3e2254296 100644 --- a/templates/email/zurich/submit-in-progress.txt +++ b/templates/email/zurich/submit-in-progress.txt @@ -1,4 +1,4 @@ -Subject: FixMyZurich: Neue Meldung #<?=$values['id']?> +Subject: Züri wie neu: Neue Meldung #<?=$values['id']?> Guten Tag <?=$values['bodies_name']?>, diff --git a/templates/email/zurich/submit.txt b/templates/email/zurich/submit.txt index f55b66e18..15aea7504 100644 --- a/templates/email/zurich/submit.txt +++ b/templates/email/zurich/submit.txt @@ -1,4 +1,4 @@ -Subject: FixMyZurich: Neue Meldung #<?=$values['id']?> +Subject: Züri wie neu: Neue Meldung #<?=$values['id']?> Guten Tag <?=$values['bodies_name']?>, diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html index 329d7ace9..67802e82a 100644 --- a/templates/web/bromley/report/display.html +++ b/templates/web/bromley/report/display.html @@ -2,7 +2,7 @@ PROCESS "report/photo-js.html"; PROCESS "maps/${map.type}.html"; - problem_title = problem.title _ ' - ' _ loc('Viewing a problem'); + problem_title = problem.title_safe _ ' - ' _ loc('Viewing a problem'); INCLUDE 'header.html' title = problem_title rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] diff --git a/templates/web/default/admin/flagged.html b/templates/web/default/admin/flagged.html index 5af92a23c..fc8b1fae1 100644 --- a/templates/web/default/admin/flagged.html +++ b/templates/web/default/admin/flagged.html @@ -9,14 +9,8 @@ <th>[% loc('ID') %]</th> <th>[% loc('Title') %]</th> <th>[% loc('Name') %]</th> - <th>[% loc('Email') %]</th> - <th>[% loc('Council') %]</th> - <th>[% loc('Category') %]</th> - <th>[% loc('Anonymous') %]</th> - <th>[% loc('Cobrand') %]</th> - <th>[% loc('Created') %]</th> + <th>[% loc('Body') %]</th> <th>[% loc('State') %]</th> - <th>[% loc('When sent') %]</th> <th>*</th> </tr> [% INCLUDE 'admin/problem_row.html' %] diff --git a/templates/web/default/admin/header.html b/templates/web/default/admin/header.html index 93254f5e3..6282bf383 100644 --- a/templates/web/default/admin/header.html +++ b/templates/web/default/admin/header.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage' %] +[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage admin' %] <style type="text/css"> dt { clear: left; float: left; font-weight: bold; } dd { margin-left: 8em; } diff --git a/templates/web/default/admin/list_updates.html b/templates/web/default/admin/list_updates.html index ff0ec2f31..681337844 100644 --- a/templates/web/default/admin/list_updates.html +++ b/templates/web/default/admin/list_updates.html @@ -1,3 +1,4 @@ +[% IF updates.size %] <h2>[% loc('Updates') %]</h2> <table cellspacing="0" cellpadding="2" border="1"> @@ -36,3 +37,4 @@ </tr> [% END -%] </table> +[% END %] diff --git a/templates/web/default/admin/problem_row.html b/templates/web/default/admin/problem_row.html index 1533f8dd2..ec8fda6c5 100644 --- a/templates/web/default/admin/problem_row.html +++ b/templates/web/default/admin/problem_row.html @@ -1,6 +1,6 @@ [%- FOR problem IN problems %] <tr[% ' class="adminhidden"' IF problem.state == 'hidden' %]> - <td>[%- IF problem.is_visible -%] + <td class="record-id">[%- IF problem.is_visible -%] [%- cobrand_data = problem.cobrand_data %] [%- cobrand_data = c.data_for_generic_problem IF !problem.cobrand %] <a href="[% c.uri_for_email( '/report', problem.id, cobrand_data ) %]">[% problem.id %]</a> @@ -8,26 +8,30 @@ [%- problem.id %] [%- END -%]</td> <td>[% PROCESS value_or_nbsp value=problem.title %]</td> - <td>[% PROCESS value_or_nbsp value=problem.name %]</td> - <td>[% PROCESS value_or_nbsp value=problem.user.email %]</td> - <td>[%- IF edit_body_contacts -%] - [% FOR body IN problem.bodies.values %] - <a href="[% c.uri_for('body', body.id ) %]">[% PROCESS value_or_nbsp value=body.name %]</a> - [% END %] - [%- ELSE -%] - [%- PROCESS value_or_nbsp value=problem.bodies_str -%] - [%- END -%]</td> - <td>[% PROCESS value_or_nbsp value=problem.category %]</td> - <td>[% IF problem.anonymous %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td> - <td>[% problem.cobrand %]<br>[% problem.cobrand_data | html %]</td> - <td>[% PROCESS format_time time=problem.created %]</td> - <td>[% problem.state %]<small> - [%- IF problem.is_visible %]<br>[% loc('Confirmed:' ) %] [% PROCESS format_time time=problem.confirmed %][% END -%] - [%- IF problem.is_fixed %]<br>[% loc('Fixed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%] - [%- IF problem.is_closed %]<br>[% loc('Closed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%] - [%- IF problem.is_open %]<br>[% loc('Last update:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]</small> - </td> - <td>[% PROCESS format_time time=problem.whensent %]</td> + <td> + [% PROCESS value_or_nbsp value=problem.name %] + <br>[% PROCESS value_or_nbsp value=problem.user.email %] + <br>[% loc('Anonymous') %]: [% IF problem.anonymous %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %] + </td> + <td> + [% PROCESS value_or_nbsp value=problem.category %] + <br>[%- IF edit_body_contacts -%] + [% FOR body IN problem.bodies.values %] + <a href="[% c.uri_for('body', body.id ) %]">[% PROCESS value_or_nbsp value=body.name %]</a> + [% END %] + [%- ELSE -%] + [%- PROCESS value_or_nbsp value=problem.bodies_str -%] + [%- END -%] + <br>[% problem.cobrand %]<br>[% problem.cobrand_data | html %] + </td> + <td>[% problem.state %]<br><small> + [% loc('Created') %]: [% PROCESS format_time time=problem.created %] + <br>[% loc('When sent') %]: [% PROCESS format_time time=problem.whensent %] + [%- IF problem.is_visible %]<br>[% loc('Confirmed:' ) %] [% PROCESS format_time time=problem.confirmed %][% END -%] + [%- IF problem.is_fixed %]<br>[% loc('Fixed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%] + [%- IF problem.is_closed %]<br>[% loc('Closed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%] + [%- IF problem.is_open %]<br>[% loc('Last update:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%] + </small></td> <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td> </tr> [%- END -%] diff --git a/templates/web/default/admin/report_blocks.html b/templates/web/default/admin/report_blocks.html index bb9f34cb9..c2cffc352 100644 --- a/templates/web/default/admin/report_blocks.html +++ b/templates/web/default/admin/report_blocks.html @@ -22,3 +22,21 @@ [% this_date.strftime('%d.%m.%Y') %] [% ELSE %][% no_time || ' ' %][% END %][% no_time = '' %] [%- END %] + +[% BLOCK sort_link %][% IF order == choice %][% c.uri_with( d => 1 - dir ) %][% ELSE %][% c.uri_with( { o => choice, d => 0 } ) %][% END %][% END %] + +[% BLOCK sort_arrow %] + [% IF order == choice %] + <span style="font-size:50%"> + [% IF dir %] + ▼ + [% ELSE %] + ▲ + [% END %] + </span> + [% ELSE %] + <span style="font-size:50%; color: #999;"> + ▲ + </span> + [% END %] +[% END %] diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html index 8d0b8df88..91af70d14 100644 --- a/templates/web/default/admin/report_edit.html +++ b/templates/web/default/admin/report_edit.html @@ -57,7 +57,6 @@ [% photo = problem.get_photo_params %] <li><img alt="" height="[% photo.height %]" width="[% photo.width %]" src="[% c.cobrand.base_url %][% photo.url %]"> <br> -[% IF rotated %]Photo may be cached for a while.<br>[% END %] <input type="submit" name="rotate_photo" value="[% loc('Rotate Left') %]"> <input type="submit" name="rotate_photo" value="[% loc('Rotate Right') %]"> <br> diff --git a/templates/web/default/admin/reports.html b/templates/web/default/admin/reports.html index 600f2b436..d57b2f53e 100644 --- a/templates/web/default/admin/reports.html +++ b/templates/web/default/admin/reports.html @@ -2,31 +2,26 @@ [% PROCESS 'admin/report_blocks.html' %] <form method="get" action="[% c.uri_for('reports') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> - <p><label for="search">[% loc('Search:') %]</label> <input type="text" name="search" size="30" id="search"> + <p><label for="search">[% loc('Search:') %]</label> <input type="text" name="search" size="30" id="search" value="[% searched | html %]"> </form> - -[% IF searched %] +[% IF problems.size %] <table cellspacing="0" cellpadding="2" border="1"> <tr> <th>[% loc('ID') %]</th> <th>[% loc('Title') %]</th> <th>[% loc('Name') %]</th> - <th>[% loc('Email') %]</th> <th>[% loc('Body') %]</th> - <th>[% loc('Category') %]</th> - <th>[% loc('Anonymous') %]</th> - <th>[% loc('Cobrand') %]</th> - <th>[% loc('Created') %]</th> <th>[% loc('State') %]</th> - <th>[% loc('When sent') %]</th> <th>*</th> </tr> [% INCLUDE 'admin/problem_row.html' %] </table> -[% INCLUDE 'admin/list_updates.html' %] +[% INCLUDE 'pagination.html', admin = 1, param = 'p' IF pager %] [% END %] +[% INCLUDE 'admin/list_updates.html' %] + [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/default/admin/timeline.html b/templates/web/default/admin/timeline.html index 4058f7f06..2c77e3fbd 100644 --- a/templates/web/default/admin/timeline.html +++ b/templates/web/default/admin/timeline.html @@ -34,7 +34,7 @@ [% CASE 'alertSub' %] [% tprintf(loc("Alert %d created for %s, type %s, parameters %s / %s"), item.obj.id, item.obj.user.email, item.obj.alert_type.ref, item.obj.parameter, item.obj.parameter2) | html %] [% CASE 'alertDel' %] - [% tprintf(loc("Alert %d disabled (created %s)"), item.obj.id, item.obj.whensubscribed_local.strftime('%H:%M:%S %e %B %Y') ) %] + [% tprintf(loc("Alert %d disabled (created %s)"), item.obj.id, item.obj.whensubscribed.strftime('%H:%M:%S %e %B %Y') ) %] [%- END %] <br /> [%- END %] diff --git a/templates/web/default/admin/user-form.html b/templates/web/default/admin/user-form.html index eec54d447..9c60ec940 100644 --- a/templates/web/default/admin/user-form.html +++ b/templates/web/default/admin/user-form.html @@ -1,7 +1,7 @@ <form method="post" action="[% c.uri_for( 'user_edit', user.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> <input type="hidden" name="token" value="[% token %]" > <input type="hidden" name="submit" value="1" > - <ul> + <ul class="no-bullets"> <li>[% loc('Name:') %] <input type='text' name='name' id='name' value='[% user.name | html %]'></li> <li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% user.email | html %]'></li> <li>[% loc('Body:') %] <select id='body' name='body'> diff --git a/templates/web/default/admin/users.html b/templates/web/default/admin/users.html index de0b74746..70833ff85 100644 --- a/templates/web/default/admin/users.html +++ b/templates/web/default/admin/users.html @@ -5,7 +5,7 @@ <p><label for="search">[% loc('Search:') %]</label> <input type="text" name="search" size="30" id="search" value="[% searched | html %]"> </form> -[% IF searched %] +[% IF users.size %] <table cellspacing="0" cellpadding="2" border="1"> <tr> @@ -30,10 +30,11 @@ [%- END -%] </table> -[% ELSE %] +[% END %] +[% IF NOT searched %] <h2>[% loc('Add user') %]</h2> -[% INCLUDE 'admin/user-form.html' %] +[% INCLUDE 'admin/user-form.html', user = '' %] [% END %] diff --git a/templates/web/default/alert/index.html b/templates/web/default/alert/index.html index 1f0635ae4..36c0daf91 100644 --- a/templates/web/default/alert/index.html +++ b/templates/web/default/alert/index.html @@ -40,9 +40,11 @@ To find out what local alerts we have for you, please enter your [% c.cobrand.co <div class="sticky-sidebar" id="alert_recent"> <aside> <h2>[% loc('Some photos of recent reports') %]</h2> - [% FOREACH p IN photos %] + [% FOREACH p IN photos; + photo = p.get_photo_params; + %] <a href="/report/[% p.id %]"><img border="0" height="100" - src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> + src="[% photo.url_tn %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] </aside> </div> diff --git a/templates/web/default/alert/list.html b/templates/web/default/alert/list.html index 20ebbf455..447bfcd76 100644 --- a/templates/web/default/alert/list.html +++ b/templates/web/default/alert/list.html @@ -24,9 +24,11 @@ <div id="alert_photos" class="sticky-sidebar"> <aside> <h2>[% loc('Photos of recent nearby reports') %]</h2> - [% FOREACH p IN photos %] + [% FOREACH p IN photos; + photo = p.get_photo_params; + %] <a href="/report/[% p.id %]"><img border="0" height="100" - src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> + src="[% photo.url_tn %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] </aside> </div> diff --git a/templates/web/default/around/around_map_list_items.html b/templates/web/default/around/around_map_list_items.html index 655d8bd25..da75561b5 100644 --- a/templates/web/default/around/around_map_list_items.html +++ b/templates/web/default/around/around_map_list_items.html @@ -5,7 +5,7 @@ <li> <a href="[% c.uri_for('/report', p.problem.id ) %]">[% p.problem.title | html %]</a> - <small>[% prettify_dt( p.problem.confirmed_local, 1 ) %], [% dist %]km</small> + <small>[% prettify_dt( p.problem.confirmed, 1 ) %], [% dist %]km</small> [% IF p.problem.is_fixed %] <small>[% loc('(fixed)') %]</small> [% ELSIF p.problem.is_closed %] diff --git a/templates/web/default/around/on_map_list_items.html b/templates/web/default/around/on_map_list_items.html index 1022c88a0..70a071406 100644 --- a/templates/web/default/around/on_map_list_items.html +++ b/templates/web/default/around/on_map_list_items.html @@ -2,7 +2,7 @@ [% FOREACH p IN on_map %] <li> <a href="[% c.uri_for('/report', p.id ) %]">[% p.title | html %]</a> - <small>[% prettify_dt( p.confirmed_local, 1 ) %]</small> + <small>[% prettify_dt( p.confirmed, 1 ) %]</small> [% IF p.is_fixed %] <small>[% loc('(fixed)') %]</small> [% ELSIF p.is_closed %] diff --git a/templates/web/default/auth/token.html b/templates/web/default/auth/token.html index 5fa69ab21..361d4fbd5 100644 --- a/templates/web/default/auth/token.html +++ b/templates/web/default/auth/token.html @@ -4,13 +4,10 @@ <h1>[% loc('Error') %]</h1> -<p>We have not been able to confirm your account - sorry. This may be because:</p> - -<ul> - <li>Link too old or already used</li> - <li>URL not copied correctly</li> - [%# FIXME - add more reasons here %] -</ul> +<p> + [% loc('We have not been able to confirm your account - sorry.') %] + [% loc('This may be because the link is too old or already used, or the address was not copied correctly.') %] +</p> [% ELSE %] diff --git a/templates/web/default/contact/index.html b/templates/web/default/contact/index.html index cb87362ba..73e94fb33 100644 --- a/templates/web/default/contact/index.html +++ b/templates/web/default/contact/index.html @@ -18,9 +18,9 @@ <blockquote> <p> [% IF update.anonymous %] - [% tprintf( loc('Update below added anonymously at %s'), prettify_dt( update.confirmed_local ) ) %] + [% tprintf( loc('Update below added anonymously at %s'), prettify_dt( update.confirmed ) ) %] [% ELSE %] - [% tprintf( loc('Update below added by %s at %s'), update.name, prettify_dt( update.confirmed_local ) ) | html %] + [% tprintf( loc('Update below added by %s at %s'), update.name, prettify_dt( update.confirmed ) ) | html %] [% END %] </p> @@ -38,13 +38,13 @@ </p> <blockquote> - <h2>[% problem.title | html %]</h2> + <h2>[% problem.title_safe | html %]</h2> <p> [% IF problem.anonymous %] - [% tprintf( loc('Reported anonymously at %s'), prettify_dt( problem.confirmed_local ) ) %] + [% tprintf( loc('Reported anonymously at %s'), prettify_dt( problem.confirmed ) ) %] [% ELSE %] - [% tprintf( loc('Reported by %s at %s'), problem.user.name, prettify_dt( problem.confirmed_local ) ) | html %] + [% tprintf( loc('Reported by %s at %s'), problem.user.name, prettify_dt( problem.confirmed ) ) | html %] [% END %] </p> diff --git a/templates/web/default/front/stats.html b/templates/web/default/front/stats.html index eae66018b..5367f1118 100644 --- a/templates/web/default/front/stats.html +++ b/templates/web/default/front/stats.html @@ -36,10 +36,8 @@ <div id="front_stats"> <div>[% tprintf( new_text, stats.new ) | comma %]</div> - [% IF c.cobrand.moniker != 'emptyhomes' %] <div>[% tprintf( fixed_text, stats.fixed ) | comma %]</div> [% IF c.cobrand.moniker != 'zurich' %] <div>[% tprintf( updates_text, stats.updates ) | comma %]</div> [% END %] - [% END %] </div> diff --git a/templates/web/default/index.html b/templates/web/default/index.html index beaeefb20..6ae9db3e8 100644 --- a/templates/web/default/index.html +++ b/templates/web/default/index.html @@ -41,9 +41,11 @@ <h2>[% loc('Recently reported problems') %]</h2> [% IF recent_photos.size %] <p id="front_photos"> - [% FOREACH p IN recent_photos %] + [% FOREACH p IN recent_photos; + photo = p.get_photo_params; + %] <a href="/report/[% p.id %]"><img border="0" height="100" - src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> + src="[% photo.url_tn %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] </p> [% END %] @@ -53,7 +55,7 @@ [% FOREACH p IN probs %] <li> <a href="/report/[% p.id %]">[% p.title | html %]</a> - <small>[% prettify_dt( p.confirmed_local, 1 ) %]</small> + <small>[% prettify_dt( p.confirmed, 1 ) %]</small> </li> [% END %] </ul> diff --git a/templates/web/default/my/my.html b/templates/web/default/my/my.html index cb9b0dd99..a6e4000df 100644 --- a/templates/web/default/my/my.html +++ b/templates/web/default/my/my.html @@ -53,7 +53,7 @@ END %] <li>“[% u.text | html %]” – <a href="[% c.uri_for( '/report', u.problem_id ) %]#update_[% u.id %]">[% u.problem.title | html %]</a>. <em class="council_sent_info"> - [% tprintf( loc("Added %s"), prettify_dt( u.confirmed_local, 'date' ) ) %] + [% tprintf( loc("Added %s"), prettify_dt( u.confirmed, 'date' ) ) %] </em> </li> [% "</ul>" IF loop.last %] @@ -69,9 +69,9 @@ END %] <li><a href="[% c.uri_for( '/report', p.id ) %]">[% p.title | html %]</a> <em class="council_sent_info"> – [% IF p.whensent %] - [% tprintf( loc("Reported %s, to %s"), prettify_dt( p.confirmed_local, 'date' ), p.body(c) ) %] + [% tprintf( loc("Reported %s, to %s"), prettify_dt( p.confirmed, 'date' ), p.body(c) ) %] [% ELSE %] - [% tprintf( loc("Reported %s"), prettify_dt( p.confirmed_local, 'date' ) ) %] + [% tprintf( loc("Reported %s"), prettify_dt( p.confirmed, 'date' ) ) %] [% END %] </em> </li> diff --git a/templates/web/default/pagination.html b/templates/web/default/pagination.html index f5a1192d1..63180b600 100644 --- a/templates/web/default/pagination.html +++ b/templates/web/default/pagination.html @@ -1,17 +1,19 @@ [% IF pager.last_page > 1 %] - <p> +[% IF NOT admin %] +<section class="full-width"> +[% END %] + <p class="pagination"> [% IF pager.previous_page %] - <a href="[% c.req.uri_with({ $param => pager.previous_page }) %]">← Previous</a> - [% ELSE %] - ← Previous + <a class="prev" href="[% c.req.uri_with({ $param => pager.previous_page }) %][% '#' _ hash IF hash %]">[% loc('Previous') %]</a> [% END %] - | - [% pager.first %] to [% pager.last %] of [% pager.total_entries %] - | + + [% tprintf( loc('%d to %d of %d'), pager.first, pager.last, pager.total_entries ) %] + [% IF pager.next_page %] - <a href="[% c.req.uri_with({ $param => pager.next_page }) %]">Next →</a> - [% ELSE %] - Next → + <a class="next" href="[% c.req.uri_with({ $param => pager.next_page }) %][% '#' _ hash IF hash %]">[% loc('Next') %]</a> [% END %] </p> +[% IF NOT admin %] +</section> +[% END %] [% END %] diff --git a/templates/web/default/report/_support.html b/templates/web/default/report/_support.html index f4bdb8c20..3e372ba69 100644 --- a/templates/web/default/report/_support.html +++ b/templates/web/default/report/_support.html @@ -1,11 +1,17 @@ [% IF c.cobrand.can_support_problems %] -<p id="supporter"><small> - [% IF !problem.interest_count %][% text=loc('No supporters') %][% ELSIF problem.interest_count == 1 %][% text = loc('1 supporter') %][% ELSE %][% text = tprintf( loc('%d supporters' ), problem.interest_count ) %][% END %] - [% IF c.user && c.user.from_body %]<form action="[% c.uri_for( '/report/support' ) %]"> - [% text %] <input type="hidden" name="id" value="[% problem.id %]"><input type="submit" class="green-btn" value="Add support"> +[% + IF !problem.interest_count; + SET text = loc('No supporters'); + ELSE; + SET text = tprintf( nget( "%d supporter", "%d supporters", problem.interest_count ), problem.interest_count ); + END; +%] + + [% IF c.user AND c.user.from_body %] + <form action="[% c.uri_for( '/report/support' ) %]"> + <p id="supporter"><small>[% text %] <input type="hidden" name="id" value="[% problem.id %]"><input type="submit" class="green-btn" value="Add support"></small></p> </form> [% ELSE %] - [% text %] + <p id="supporter"><small>[% text %]</small></p> [% END %] -</small></p> [% END %] diff --git a/templates/web/default/report/banner.html b/templates/web/default/report/banner.html index 52bfa6e67..bd7798d79 100644 --- a/templates/web/default/report/banner.html +++ b/templates/web/default/report/banner.html @@ -5,7 +5,7 @@ </p> [% END %] -[% IF problem.is_open AND date.now - problem.lastupdate_local.epoch > 8 * 7 * 24 * 60 * 60 %] +[% IF problem.is_open AND date.now - problem.lastupdate.epoch > 8 * 7 * 24 * 60 * 60 %] [% INCLUDE banner, id = 'unknown', text = loc('This problem is old and of unknown status.') %] [% END %] [% IF problem.is_fixed %] diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index 2ade45a8a..fd7580ac1 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -1,7 +1,7 @@ [% PROCESS "maps/${map.type}.html"; - problem_title = problem.title _ ' - ' _ loc('Viewing a problem'); + problem_title = problem.title_safe _ ' - ' _ loc('Viewing a problem'); SET rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] IF c.cobrand.moniker != 'emptyhomes'; SET robots = 'index, nofollow'; SET robots = 'noindex, nofollow' IF c.cobrand.moniker == 'emptyhomes'; diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index b7adb014f..83f746d56 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -7,21 +7,21 @@ [% IF update.whenanswered %] [%# A questionnaire update, currently saying report is still open %] - [% tprintf( loc( 'Still open, via questionnaire, %s' ), prettify_dt( update.whenanswered_local ) ) %] + [% tprintf( loc( 'Still open, via questionnaire, %s' ), prettify_dt( update.whenanswered ) ) %] [% RETURN %] [% END %] [% IF update.anonymous || update.name == '' %] - [% tprintf( loc( 'Posted anonymously at %s' ), prettify_dt( update.confirmed_local ) ) -%] + [% tprintf( loc( 'Posted anonymously at %s' ), prettify_dt( update.confirmed ) ) -%] [%- ELSIF update.user.from_body; user_name = update.user.name | html; body = update.user.body; IF body == 'Bromley Council'; body = "$body <img src='/cobrands/bromley/favicon.png' alt=''>"; END %] - [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, body, prettify_dt( update.confirmed_local ) ) -%] + [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, body, prettify_dt( update.confirmed ) ) -%] [%- ELSE %] - [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_dt( update.confirmed_local ) ) | html -%] + [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_dt( update.confirmed ) ) | html -%] [%- END -%] [%- update_state = '' %] [%- IF update.mark_fixed %][% update_state = ", " _ loc( 'marked as fixed' ) %][% END %] diff --git a/templates/web/emptyhomes/around/extra_text.html b/templates/web/emptyhomes/around/extra_text.html new file mode 100644 index 000000000..bb9d18d8e --- /dev/null +++ b/templates/web/emptyhomes/around/extra_text.html @@ -0,0 +1,9 @@ +[% +# Need to ignore any county council +FOR c IN all_areas.values; + SET council = c IF c.type != 'CTY'; +END; +%] +<a href="/local/[% c.cobrand.short_name(council) | lower %]"> + Find out local news and stats for [% council.name %] +</a> diff --git a/templates/web/emptyhomes/front/stats.html b/templates/web/emptyhomes/front/stats.html new file mode 100644 index 000000000..f6aacf859 --- /dev/null +++ b/templates/web/emptyhomes/front/stats.html @@ -0,0 +1,7 @@ +[% USE Comma %] +[% stats = c.cobrand.front_stats_data %] + +<div id="front_stats"> + <div>[% tprintf( loc("<big>%s</big> reports"), stats ) | comma %]</div> + <div><a href="/local/">[% loc('Find latest local and national news') %]</a></div> +</div> diff --git a/templates/web/fixmybarangay/alert/index.html b/templates/web/fixmybarangay/alert/index.html index d9bb74ee9..8e2ce7518 100644 --- a/templates/web/fixmybarangay/alert/index.html +++ b/templates/web/fixmybarangay/alert/index.html @@ -30,9 +30,11 @@ FixMyBarangay has a RSS feeds and email alerts for local problems. <div class="sticky-sidebar" id="alert_recent"> <aside> <h2>[% loc('Some photos of recent reports') %]</h2> - [% FOREACH p IN photos %] + [% FOREACH p IN photos; + photo = p.get_photo_params + %] <a href="/report/[% p.id %]"><img border="0" height="100" - src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> + src="[% photo.url_tn %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] </aside> </div> diff --git a/templates/web/fixmystreet/contact/index.html b/templates/web/fixmystreet/contact/index.html index 450b6e2ef..f6648ab37 100644 --- a/templates/web/fixmystreet/contact/index.html +++ b/templates/web/fixmystreet/contact/index.html @@ -19,9 +19,9 @@ <blockquote> <p> [% IF update.anonymous %] - [% tprintf( loc('Update below added anonymously at %s'), prettify_dt( update.confirmed_local ) ) %] + [% tprintf( loc('Update below added anonymously at %s'), prettify_dt( update.confirmed ) ) %] [% ELSE %] - [% tprintf( loc('Update below added by %s at %s'), update.name, prettify_dt( update.confirmed_local ) ) | html %] + [% tprintf( loc('Update below added by %s at %s'), update.name, prettify_dt( update.confirmed ) ) | html %] [% END %] </p> @@ -39,13 +39,13 @@ </p> <blockquote> - <h2>[% problem.title | html %]</h2> + <h2>[% problem.title_safe | html %]</h2> <p> [% IF problem.anonymous %] - [% tprintf( loc('Reported anonymously at %s'), prettify_dt( problem.confirmed_local ) ) %] + [% tprintf( loc('Reported anonymously at %s'), prettify_dt( problem.confirmed ) ) %] [% ELSE %] - [% tprintf( loc('Reported by %s at %s'), problem.user.name, prettify_dt( problem.confirmed_local ) ) | html %] + [% tprintf( loc('Reported by %s at %s'), problem.user.name, prettify_dt( problem.confirmed ) ) | html %] [% END %] </p> diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index 5d7d31baa..f45509891 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -47,8 +47,7 @@ kinds of problems like missed bins use our <section class="full-width"> <ul class="issue-list-a"> [% FOREACH problem IN recent_photos %] - [% problem.photo = 1; # Definitely is - INCLUDE 'report/_item.html', no_fixed = 1 %] + [% INCLUDE 'report/_item.html', no_fixed = 1 %] [% END %] </ul> </section> diff --git a/templates/web/fixmystreet/my/my.html b/templates/web/fixmystreet/my/my.html index 3134c335f..12f68bd80 100644 --- a/templates/web/fixmystreet/my/my.html +++ b/templates/web/fixmystreet/my/my.html @@ -57,7 +57,7 @@ END %] <li>“[% u.text | html %]” – <a href="[% c.uri_for( '/report', u.problem_id ) %]#update_[% u.id %]">[% u.problem.title | html %]</a>. <p><small class="council_sent_info"> - [% tprintf( loc("Added %s"), prettify_dt( u.confirmed_local, 'date' ) ) %] + [% tprintf( loc("Added %s"), prettify_dt( u.confirmed, 'date' ) ) %] </small></p> </li> [% "</ul>" IF loop.last %] diff --git a/templates/web/fixmystreet/pagination.html b/templates/web/fixmystreet/pagination.html deleted file mode 100644 index 4f4d00a79..000000000 --- a/templates/web/fixmystreet/pagination.html +++ /dev/null @@ -1,15 +0,0 @@ -[% IF pager.last_page > 1 %] -<section class="full-width"> - <p class="pagination"> - [% IF pager.previous_page %] - <a class="prev" href="[% c.req.uri_with({ $param => pager.previous_page }) %]">Previous</a> - [% END %] - - [% pager.first %] to [% pager.last %] of [% pager.total_entries %] - - [% IF pager.next_page %] - <a class="next" href="[% c.req.uri_with({ $param => pager.next_page }) %]">Next</a> - [% END %] - </p> -</section> -[% END %] diff --git a/templates/web/fixmystreet/report/_item.html b/templates/web/fixmystreet/report/_item.html index 508b02614..852633f76 100644 --- a/templates/web/fixmystreet/report/_item.html +++ b/templates/web/fixmystreet/report/_item.html @@ -1,13 +1,15 @@ <li> <a class="text" href="[% c.uri_for('/report', problem.id ) %]"> - [% IF problem.photo %] - <img class="img" height="60" width="90" src="/photo/[% problem.id %].fp.jpeg" alt=""> + [% IF problem.photo; + photo = problem.get_photo_params + %] + <img class="img" height="60" width="90" src="[% photo.url_fp %]" alt=""> [% END %] <h4>[% problem.title | html %]</h4> - <small>[% prettify_dt( problem.confirmed_local, 1 ) %] + <small>[% prettify_dt( problem.confirmed, 1 ) %] [%- IF dist %], [% dist %]km[% END %] [%- IF include_lastupdate AND problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %], - [% tprintf('last updated %s', prettify_dt( problem.lastupdate_local, 1 ) ) %] + [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 1 ) ) %] [%- END %] [% IF include_lastupdate %] [% IF problem.bodies_str_ids.size > 1 %] [% loc('(sent to both)') %] diff --git a/templates/web/fixmystreet/report/banner.html b/templates/web/fixmystreet/report/banner.html index ce4666a6a..83c780958 100644 --- a/templates/web/fixmystreet/report/banner.html +++ b/templates/web/fixmystreet/report/banner.html @@ -5,7 +5,7 @@ </div> [% END %] -[% IF c.cobrand.moniker != 'bromley' AND problem.bodies_str != '2482' AND problem.is_open AND date.now - problem.lastupdate_local.epoch > 8 * 7 * 24 * 60 * 60 %] +[% IF c.cobrand.moniker != 'bromley' AND problem.bodies_str != '2482' AND problem.is_open AND date.now - problem.lastupdate.epoch > 8 * 7 * 24 * 60 * 60 %] [% INCLUDE banner, id = 'unknown', text = loc('Unknown') %] [% END %] [% IF problem.is_fixed %] diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 44838c0ab..b75ef92bc 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -2,7 +2,7 @@ PROCESS "report/photo-js.html"; PROCESS "maps/${map.type}.html"; - problem_title = problem.title _ ' - ' _ loc('Viewing a problem'); + problem_title = problem.title_safe _ ' - ' _ loc('Viewing a problem'); INCLUDE 'header.html' title = problem_title rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] @@ -49,7 +49,7 @@ [% IF c.cobrand.moniker == 'fixmystreet' %] <div id="report-share" class="hidden-js" align="center"> - <a href="https://twitter.com/share" class="twitter-share-button" data-text="I just reported ‘[% problem.title | html %]’" data-via="fixmystreet" data-related="mysociety" data-count="none" data-dnt="true">Tweet</a> + <a href="https://twitter.com/share" class="twitter-share-button" data-text="I just reported ‘[% problem.title_safe | html %]’" data-via="fixmystreet" data-related="mysociety" data-count="none" data-dnt="true">Tweet</a> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> <iframe src="//www.facebook.com/plugins/like.php?href=[% c.req.uri | uri %]&send=false&layout=button_count&width=90&show_faces=false&action=like&colorscheme=light&font&height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:90px; height:21px;" allowTransparency="true"></iframe> </div> diff --git a/templates/web/oxfordshire/around/intro.html b/templates/web/oxfordshire/around/intro.html index 81b2569f6..3b96ec82f 100644 --- a/templates/web/oxfordshire/around/intro.html +++ b/templates/web/oxfordshire/around/intro.html @@ -1 +1 @@ - <h1 class="main">Reporting a problem in Oxfordshire</h1> + <h1 class="main">Report a street or road problem</h1> diff --git a/templates/web/oxfordshire/faq/faq-en-gb.html b/templates/web/oxfordshire/faq/faq-en-gb.html index 5aafa0bc4..a85c8b96b 100755 --- a/templates/web/oxfordshire/faq/faq-en-gb.html +++ b/templates/web/oxfordshire/faq/faq-en-gb.html @@ -25,6 +25,10 @@ to make it easier for our customers to report highways faults directly to us by using their computer or mobile phone. </p> + <p> + Here is a <a href="http://vimeo.com/61275718">short video</a> + about FixMyStreet and how you can use it to report road and street problems. + </p> </dd> <dt>What sort of problems should I report with FixMyStreet?</dt> @@ -107,6 +111,32 @@ The map shows all faults submitted online through FixMyStreet. You can view the exact location of each fault and see its current status. </dd> + + <dt>What updates will I receive?</dt> + <dd> + <p> + When you record a fault you can sign up to receive updates and you will receive an + initial email to acknowledge the report. + </p> + <p> + You will then receive an email every time that fault is updated. This could be when + a member of the public posts an update onto the fault or when we post a status update. + </p> + <p> + Road problems that are the responsibility of our Highways department, such as potholes, + will receive automatic updates at different stages. You will receive an email when the + problem has been inspected and another one when the fault is fixed. + </p> + <p> + Some faults may be marked as referred when they are not the responsibility of Oxfordshire + County Council, for example problems such as graffiti or rubbish which are the + responsibility of the District Council for that area. + </p> + <p> + All of these updates will also be posted on the mapped fault so that anyone can see the + status of any fault recorded via FixMyStreet by clicking on it on the map. + </p> + </dd> <dt>How can I get an update on a fault?</dt> <dd> @@ -148,12 +178,12 @@ <h2><a name="practical"></a>Practical Questions</h2> <dl> - <dt>Do you remove silly or illegal content?</dt> + <dt>Inappropriate use</dt> <dd> Oxfordshire County Council and FixMyStreet are not responsible for the content and - accuracy of material submitted by its users. We reserve the right to edit or remove - any problems or updates which we consider to be inappropriate upon being informed - by a user of the site. + accuracy of material submitted by its users. Oxfordshire County Council will monitor + this website for instances of inappropriate use, and reserves the right to moderate + comments if such instances occur. </dd> <dt>Why does the site use kilometres for measurements?</dt> diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index e9a592fd4..67afb2334 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -37,10 +37,10 @@ <div id="oxford-header" class="desk-only oxford-left"> <a href="http://www.oxfordshire.gov.uk/" title="Home" class="logo">Oxfordshire County Council<span></span></a> <span id="oxford-links"> - <a href="http://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a>|<a href="/" title="">FixMyStreet</a> + <a href="http://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a> </span> <div style="clear:both"></div> - <span class="header"><a href="/">FixMyStreet</a></span> + <span class="header"><a href="/">Report a road or street problem</a></span> <div class="oxford-user"> <p> [% IF c.user_exists %] diff --git a/templates/web/oxfordshire/tracking_code.html b/templates/web/oxfordshire/tracking_code.html new file mode 100644 index 000000000..1ed17651b --- /dev/null +++ b/templates/web/oxfordshire/tracking_code.html @@ -0,0 +1,22 @@ +[% IF c.config.BASE_URL == "http://www.fixmystreet.com" %] + +<script type="text/javascript"> + + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-22094787-2']); + _gaq.push(['_setDomainName', '.oxfordshire.gov.uk']); + _gaq.push(['_setCustomVar',1,'level1','Roads and transport',3]); + _gaq.push(['_setCustomVar',2,'level2','FixMyStreet',3]); + _gaq.push(['_trackPageview']); + jQuery(document).ready( function () { + jQuery.occ.gaico({ + messageIcon: '/cms/sites/all/themes/publicsite/images/gaico_exclamation.png', + permanentMessageIcon: '/cms/sites/all/themes/publicsite/images/gaico_question.png' + }); + }); + +</script> + +[% ELSE %] +<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "http://www.fixmystreet.com" --> +[% END %] diff --git a/templates/web/zurich/admin/header.html b/templates/web/zurich/admin/header.html index 41cb520f5..be146f0e1 100644 --- a/templates/web/zurich/admin/header.html +++ b/templates/web/zurich/admin/header.html @@ -14,9 +14,20 @@ %] <style type="text/css"> .adminhidden { color: #666666; } + .active { background-color: #ffffee; cursor: pointer; } .error { color: red; } .overdue { background-color: #ffcccc; } select { width: auto; } + #fms_pan_zoom { top: 13em !important; } </style> +<script> +$(function(){ + $('.row-link').hover(function(){ + $(this).toggleClass("active"); + }).click(function(){ + window.location = this.getElementsByTagName('a')[0]; + }).find('td:last').hide(); + $('th.edit').hide(); +}); +</script> - <h1 style="clear:both;">[% title %]</h1> diff --git a/templates/web/zurich/admin/index-dm.html b/templates/web/zurich/admin/index-dm.html index a88100ee4..530e72c59 100644 --- a/templates/web/zurich/admin/index-dm.html +++ b/templates/web/zurich/admin/index-dm.html @@ -3,14 +3,15 @@ [% status_message %] -<h2>[% loc('Submitted') %]</h2> -[% INCLUDE list, problems = unconfirmed.all %] +<h2 id="submitted">[% loc('Submitted') %]</h2> +[% INCLUDE list, problems = unconfirmed.all, hash = 'submitted' %] -<h2>[% loc('Planned') %]</h2> -[% INCLUDE list, problems = approval.all %] +<h2 id="planned">[% loc('Planned') %]</h2> +[% INCLUDE list, problems = approval.all, hash = 'planned' %] -<h2>[% loc('All reports') %]</h2> -[% INCLUDE list, problems = other.all, include_subdiv = 1 %] +<h2 id="alle">[% loc('All reports') %]</h2> +[% INCLUDE list, problems = other.all, include_subdiv = 1, hash = 'alle' %] +[% INCLUDE 'pagination.html', admin = 1, param = 'p', hash = 'alle' %] [% INCLUDE 'admin/footer.html' %] @@ -19,14 +20,13 @@ <tr> <th>[% loc('ID') %]</th> <th>[% loc('Description') %]</th> - <th>[% loc('Category') %]</th> - <th>[% loc('Submitted') %]</th> - <th>[% loc('Updated') %]</th> - <th>[% loc('Status') %]</th> + [% FOREACH col IN [ [ 'category', loc('Category') ], [ 'created', loc('Submitted') ], [ 'lastupdate', loc('Updated') ], [ 'state', loc('Status') ] ] %] + <th><a href="[% INCLUDE sort_link choice = col.0 %]#[% hash %]">[% col.1 %] [% INCLUDE sort_arrow choice = col.0 %]</a></th> + [% END %] [% IF include_subdiv %] <th>[% loc('Subdivision/Body') %]</th> [% END %] - <th>*</th> + <th class='edit'>*</th> </tr> <tr class="filter-row"> <td colspan="8"><input type="text" placeholder="[%= loc('Filter report list') %]" /></td> diff --git a/templates/web/zurich/admin/index-sdm.html b/templates/web/zurich/admin/index-sdm.html index 4e4009c16..76593ead0 100644 --- a/templates/web/zurich/admin/index-sdm.html +++ b/templates/web/zurich/admin/index-sdm.html @@ -1,14 +1,15 @@ [% PROCESS 'admin/header.html' title=loc('Summary') -%] [% PROCESS 'admin/report_blocks.html' %] -<h2>[% loc('New reports') %]</h2> -[% INCLUDE list, problems = reports_new.all %] +<h2 id="new">[% loc('New reports') %]</h2> +[% INCLUDE list, problems = reports_new.all, hash = 'new' %] -<h2>[% loc('Reports awaiting approval') %]</h2> -[% INCLUDE list, problems = reports_unpublished.all, no_edit = 1 %] +<h2 id="wait">[% loc('Reports awaiting approval') %]</h2> +[% INCLUDE list, problems = reports_unpublished.all, no_edit = 1, hash = 'wait' %] -<h2>[% loc('Reports published') %]</h2> -[% INCLUDE list, problems = reports_published.all, no_edit = 1 %] +<h2 id="alle">[% loc('Reports published') %]</h2> +[% INCLUDE list, problems = reports_published.all, no_edit = 1, hash = 'alle' %] +[% INCLUDE 'pagination.html', admin = 1, param = 'p', hash = 'alle' %] [% INCLUDE 'admin/footer.html' %] @@ -17,12 +18,11 @@ <tr> <th>[% loc('ID') %]</th> <th>[% loc('Description') %]</th> - <th>[% loc('Category') %]</th> - <th>[% loc('Submitted') %]</th> - <th>[% loc('Updated') %]</th> - <th>[% loc('Status') %]</th> + [% FOREACH col IN [ [ 'category', loc('Category') ], [ 'created', loc('Submitted') ], [ 'lastupdate', loc('Updated') ], [ 'state', loc('Status') ] ] %] + <th><a href="[% INCLUDE sort_link choice = col.0 %]#[% hash %]">[% col.1 %] [% INCLUDE sort_arrow choice = col.0 %]</a></th> + [% END %] [% IF NOT no_edit %] - <th>*</th> + <th class='edit'>*</th> [% END %] </tr> <tr class="filter-row"> diff --git a/templates/web/zurich/admin/index.html b/templates/web/zurich/admin/index.html index ab835b5a3..a51c7f6fe 100644 --- a/templates/web/zurich/admin/index.html +++ b/templates/web/zurich/admin/index.html @@ -6,12 +6,6 @@ <li>[% tprintf( loc('%d council contacts – %d confirmed, %d unconfirmed'), contacts.total, contacts.1, contacts.0) %]</li> </ul> -[% IF c.cobrand.admin_show_creation_graph -%] - <p> - <a href="[% c.config.BASE_URL %]/fms-live-creation.png">[% loc('Graph of problem creation by status over time') %]</a> - </p> -[% END -%] - <h2>[% loc('Problem breakdown by state') %]</h2> <ul> [% FOREACH state IN problems.keys.sort %] diff --git a/templates/web/zurich/admin/list_updates.html b/templates/web/zurich/admin/list_updates.html index 7a78d4c63..c475d839e 100644 --- a/templates/web/zurich/admin/list_updates.html +++ b/templates/web/zurich/admin/list_updates.html @@ -1,3 +1,4 @@ +[% IF updates.size %] <h2>[% loc('Updates') %]</h2> <table cellspacing="0" cellpadding="2" border="1"> @@ -14,3 +15,4 @@ </tr> [% END -%] </table> +[% END %] diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html index 617490232..8b1a30cb0 100644 --- a/templates/web/zurich/admin/problem_row.html +++ b/templates/web/zurich/admin/problem_row.html @@ -1,18 +1,19 @@ [%- FOR problem IN problems %] [% SET p_body = problem.bodies.values.0 %] - [% IF page == 'search' %] - [% NEXT IF admin_type == 'sdm' AND p_body.id != body.id %] - [% NEXT IF admin_type == 'dm' AND p_body.id != body.id AND p_body.parent.id != body.id %] - [% END %] <tr[% - ' class="adminhidden"' IF problem.state == 'hidden'; - ' class="overdue"' IF c.cobrand.overdue( problem ); + SET classes = []; + classes.push('adminhidden') IF problem.state == 'hidden'; + classes.push('overdue') IF c.cobrand.overdue( problem ); + classes.push('row-link') IF NOT no_edit; + ' class="' _ classes.join(' ') _ '"' IF classes.size; %]> - <td class="record-id">[%- IF problem.is_visible -%] - <a href="[% c.uri_for_email( '/report', problem.id ) %]">[% problem.id %]</a> - [%- ELSE %] - [%- problem.id %] - [%- END -%]</td> + <td class="record-id"> + [% IF no_edit AND problem.is_visible %] + <a href="[% c.uri_for_email( '/report', problem.id ) %]">[% problem.id %]</a> + [% ELSE %] + [% problem.id %] + [% END %] + </td> <td>[% PROCESS value_or_nbsp value=problem.title %]</td> <td>[% PROCESS value_or_nbsp value=problem.category %]</td> <td>[% PROCESS format_date this_date=problem.created %]</td> diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html index faad3ec55..85fa0a067 100644 --- a/templates/web/zurich/admin/report_edit-sdm.html +++ b/templates/web/zurich/admin/report_edit-sdm.html @@ -1,5 +1,16 @@ -[% PROCESS 'admin/header.html' title=tprintf(loc('Editing problem %d'), problem.id ) -%] -[% PROCESS 'admin/report_blocks.html' %] +[% + PROCESS "maps/zurich.html"; + PROCESS 'admin/header.html' + title = tprintf(loc('Editing problem %d'), problem.id ), + bodyclass = 'mappage'; + PROCESS 'admin/report_blocks.html' +-%] + +[% map_html %] + <p id='sub_map_links'> + <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a> + </p> +</div> [% status_message %] @@ -9,9 +20,9 @@ <p align="right"><input type="submit" name="send_back" value="[% loc('Not for my subdivision') %]"></p> -<ul> +<ul class="no-bullets"> <li><a href="[% c.uri_for_email( '/report', problem.id ) %]">[% loc('View report on site' )%]</a></li> -<li>[% loc('Details:') %] [% problem.detail | html %] +<li><span class="mock-label">[% loc('Details:') %]</span> [% problem.detail | html %] [% IF problem.extra.original_detail %] <br>[% SET safe = problem.extra.original_detail | html; @@ -19,26 +30,28 @@ %] [% END %] </li> -<li>[% loc('Co-ordinates:') %] [% problem.local_coords.join(',') %] +<li><span class="mock-label">[% loc('Co-ordinates:') %]</span> [% problem.local_coords.join(',') %] + <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% problem.latitude %]"> + <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% problem.longitude %]"> ([% SET safe = problem.postcode | html; tprintf( loc('originally entered: “%s”'), safe ) %], [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> -<li>[% loc('Category:') %] [% problem.category | html %] </li> -<li>[% loc('Name:') %] [% problem.name | html %] -<li>[% loc('Email:') %] [% problem.user.email | html %] +<li><span class="mock-label">[% loc('Category:') %]</span> [% problem.category | html %] </li> +<li><span class="mock-label">[% loc('Name:') %]</span> [% problem.name | html %] +<li><span class="mock-label">[% loc('Email:') %]</span> [% problem.user.email | html %] [% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %] -<li>[% loc('Phone:') %] [% IF problem.user.phone %][% problem.user.phone | html %][% ELSE %]<em>[% loc('None') %]</em>[% END %]</li> -<li>[% loc('Created:') %] [% PROCESS format_date this_date=problem.created %] [% problem.created.hms %]</li> +<li><span class="mock-label">[% loc('Phone:') %]</span> [% IF problem.user.phone %][% problem.user.phone | html %][% ELSE %]<em>[% loc('None') %]</em>[% END %]</li> +<li><span class="mock-label">[% loc('Created:') %]</span> [% PROCESS format_date this_date=problem.created %] [% problem.created.hms %]</li> [% IF problem.photo %] [% photo = problem.get_photo_params %] <li><img alt="" src="[% c.cobrand.base_url %][% photo.url %]"></li> [% END %] -<li>[% loc('State:') %] [% states.${problem.state} %]</li> +<li><span class="mock-label">[% loc('State:') %]</span> [% states.${problem.state} %]</li> <li><label for="internal_notes">[% loc('Internal notes:') %]</label> <textarea name='internal_notes' id='internal_notes' cols=60 rows=5>[% problem.extra.internal_notes | html %]</textarea></li> @@ -48,8 +61,10 @@ </ul> -<p><input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" ></p> -<p align="right"><input type="submit" name="no_more_updates" value="[% loc('No further updates') %]"></p> +<p class="cf"> + <input style="float:left" type="submit" name="Submit changes" value="[% loc('Submit changes') %]" > + <input style="float:right" type="submit" name="no_more_updates" value="[% loc('No further updates') %]"> +</p> </form> [% INCLUDE 'admin/list_updates.html' %] diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html index 7fdaeabff..b604a7ea0 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -7,6 +7,9 @@ -%] [% map_html %] + <p id='sub_map_links'> + <a class="hidden-nojs" id="map_layer_toggle" href="">Stadtplan</a> + </p> </div> [% status_message %] @@ -15,11 +18,11 @@ <input type="hidden" name="token" value="[% token %]" > <input type="hidden" name="submit" value="1" > -<ul> +<ul class="no-bullets"> <li><a href="[% c.uri_for_email( '/report', problem.id ) %]">[% loc('View report on site' )%]</a></li> [% IF problem.state == 'fixed - council' OR problem.state == 'closed' %] - <li>[% loc('Details:') %] [% problem.detail | html %] + <li><span class="mock-label">[% loc('Details:') %]</span> [% problem.detail | html %] [% IF problem.extra.original_detail %] <br>[% SET detail_safe = problem.extra.original_detail | html; @@ -40,26 +43,28 @@ </li> [% END %] -<li>[% loc('Co-ordinates:') %] [% problem.local_coords.join(',') %] +<li><span class="mock-label">[% loc('Co-ordinates:') %]</span> [% problem.local_coords.join(',') %] + <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% problem.latitude %]"> + <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% problem.longitude %]"> + ([% SET safe = problem.postcode | html; tprintf( loc('originally entered: “%s”'), safe ) %], [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> -<li>[% loc('Name:') %] [% problem.name | html %] <input type='hidden' name='name' id='name' value='[% problem.name | html %]'></li> -<li>[% loc('Email:') %] [% problem.user.email | html %] <input type='hidden' id='email' name='email' value='[% problem.user.email | html %]'> +<li><span class="mock-label">[% loc('Name:') %]</span> [% problem.name | html %] <input type='hidden' name='name' id='name' value='[% problem.name | html %]'></li> +<li><span class="mock-label">[% loc('Email:') %]</span> [% problem.user.email | html %] <input type='hidden' id='email' name='email' value='[% problem.user.email | html %]'> [% IF NOT problem.extra.email_confirmed %]<span class="error">[% loc('Unconfirmed') %]</span>[% END %] </li> -<li>[% loc('Phone:') %] [% IF problem.user.phone %][% problem.user.phone | html %][% ELSE %]<em>[% loc('None') %]</em>[% END %]</li> -<li>[% loc('Created:') %] [% PROCESS format_date this_date=problem.created %] [% problem.created.hms %]</li> +<li><span class="mock-label">[% loc('Phone:') %]</span> [% IF problem.user.phone %][% problem.user.phone | html %][% ELSE %]<em>[% loc('None') %]</em>[% END %]</li> +<li><span class="mock-label">[% loc('Created:') %]</span> [% PROCESS format_date this_date=problem.created %] [% problem.created.hms %]</li> [% IF problem.photo %] [% photo = problem.get_photo_params %] <li><img alt="" src="[% c.cobrand.base_url %][% photo.url %]"> <br> -[% IF rotated %]Photo may be cached for a while.<br>[% END %] <input type="submit" name="rotate_photo" value="[% loc('Rotate Left') %]"> <input type="submit" name="rotate_photo" value="[% loc('Rotate Right') %]"> <br> @@ -71,7 +76,7 @@ <p><label for="internal_notes">[% loc('Internal notes:') %]</label> <textarea name='internal_notes' id='internal_notes' cols=60 rows=5>[% problem.extra.internal_notes | html %]</textarea></p> -<p>[% loc('State:') %] <select name="state" id="state"> +<p><span class="mock-label">[% loc('State:') %]</span> <select name="state" id="state"> <option value="">--</option> [% FOREACH s IN [ ['unconfirmed', loc('Submitted')] @@ -92,16 +97,20 @@ [% IF problem.state == 'unconfirmed' OR problem.state == 'confirmed' %] -<ul> -<li class="assignation"> -<label for="body_subdivision">[% loc('Assign to subdivision:') %]</label> +<ul class="no-bullets"> +[% list = FOR body IN bodies %] + [%- NEXT UNLESS body.parent.id == c.user.from_body.id %] + <option value="[% body.id %]"[% IF body.id == problem.bodies_str %] selected[% END %]>[% body.name %]</option> +[% END %] + [% IF admin_type != 'super' AND list %] + <li class="assignation"> + <label for="body_subdivision">[% loc('Assign to subdivision:') %]</label> <select name="body_subdivision" id="body_subdivision"> <option value="">--</option> - [% FOR body IN bodies %] - [% NEXT UNLESS body.parent.id == c.user.from_body.id %] - <option value="[% body.id %]"[% IF body.id == problem.bodies_str %] selected[% END %]>[% body.name %]</option> - [% END %] + [% list %] </select> + </li> + [% END %] <li class="assignation"> <label for="category"> @@ -145,24 +154,41 @@ $(function(){ [% ELSIF problem.state == 'planned' %] -<ul> +<ul class="no-bullets"> +[% list = FOR body IN bodies %] + [%- NEXT UNLESS body.parent.id == c.user.from_body.id %] + <option value="[% body.id %]">[% body.name %]</option> +[% END %] + [% IF admin_type != 'super' AND list %] <li class="assignation"> <label for="body_subdivision">[% loc('Assign to subdivision:') %]</label> <select name="body_subdivision" id="body_subdivision"> <option value="" selected>--</option> - [% FOR body IN bodies %] - [% NEXT UNLESS body.parent.id == c.user.from_body.id %] - <option value="[% body.id %]">[% body.name %]</option> - [% END %] + [% list %] </select> </li> + [% END %] <li><label for="status_update">[% loc('Public response:') %]</label> - <textarea name='status_update' id='status_update' cols=60 rows=5>[% problem.extra.public_response | html %]</textarea> + <textarea name='status_update' id='status_update' cols=60 rows=5> + [%- IF problem.extra.public_response -%] + [%- problem.extra.public_response | html -%] + [%- ELSE -%] + +Freundliche Grüsse + +Ihre Stadt Zürich + [%- END %]</textarea> </li> </ul> +[% ELSIF problem.state == 'fixed - council' %] + +<p><span class="mock-label">[% loc('Public response:') %]</span> +[% problem.extra.public_response | html %] +</p> + [% END %] <p align="right"> diff --git a/templates/web/zurich/admin/reports.html b/templates/web/zurich/admin/reports.html index f8c022630..b0bc733c4 100644 --- a/templates/web/zurich/admin/reports.html +++ b/templates/web/zurich/admin/reports.html @@ -5,23 +5,23 @@ <p><label for="search">[% loc('Search:') %]</label> <input type="text" name="search" size="30" id="search" value="[% searched | html %]"> </form> - -[% IF searched %] +[% IF problems.size %] <table cellspacing="0" cellpadding="2" border="1"> <tr> <th>[% loc('ID') %]</th> <th>[% loc('Description') %]</th> - <th>[% loc('Category') %]</th> - <th>[% loc('Submitted') %]</th> - <th>[% loc('Updated') %]</th> - <th>[% loc('Status') %]</th> - <th>*</th> + [% FOREACH col IN [ [ 'category', loc('Category') ], [ 'created', loc('Submitted') ], [ 'lastupdate', loc('Updated') ], [ 'state', loc('Status') ] ] %] + <th><a href="[% INCLUDE sort_link choice = col.0 %]">[% col.1 %] [% INCLUDE sort_arrow choice = col.0 %]</a></th> + [% END %] + <th class='edit'>*</th> </tr> - [% INCLUDE 'admin/problem_row.html', page = 'search' %] + [% INCLUDE 'admin/problem_row.html' %] </table> -[% INCLUDE 'admin/list_updates.html' %] +[% INCLUDE 'pagination.html', admin = 1, param = 'p' IF pager %] [% END %] +[% INCLUDE 'admin/list_updates.html' %] + [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/zurich/admin/stats.html b/templates/web/zurich/admin/stats.html new file mode 100644 index 000000000..92521ff1d --- /dev/null +++ b/templates/web/zurich/admin/stats.html @@ -0,0 +1,54 @@ +[% INCLUDE 'admin/header.html' title=loc('Stats') %] +[% PROCESS 'admin/report_blocks.html' %] +[% USE date %] + +<p style="float:right"><a href="[% c.uri_with( { export=1 } ) %]">[% loc('All Reports') %]</a></p> + +[% IF start_date AND end_date %] +<p><strong>[% tprintf( loc( 'All reports between %s and %s' ), start_date.ymd, end_date.ymd ) | html %]</strong></p> +[% END %] + +<form method="get" action="[% c.uri_for('stats') %]"> +<p><select name="ym"> + <option value="">[% loc('All reports') %]</option> + [% FOR y IN [ 2013 .. date.format(date.now, '%Y') ]; + SET max = 12; + max = date.format(date.now, '%m') IF y == date.format(date.now, '%Y'); + FOR m IN [ 1 .. max ]; + m = m | format('%02d'); + SET v = m _ '.' _ y; + %] + <option[% ' selected' IF v == ym %]>[% v %]</option> + [% END %] + [% END %] +</select> + +<input type="submit" value="[% loc('Go') %]"> +</form> + +<ul> +<li>[% loc('Total') %]: [% reports_total || 0 %] +<li>[% loc('Closed') %]: [% reports_solved || 0 %] +<li>[% loc('Hidden') %]: [% reports_spam || 0 %] +<li>Externe Adressen: [% reports_assigned || 0 %] +<li>[% loc('Moderated by division within one working day') %]: [% reports_moderated || 0 %] +<li>[% loc('Dealt with by subdivision within 5 working days') %]: [% reports_dealtwith || 0 %] +<li>[% loc('Assign to different category:') %] [% reports_category_changed || 0 %] +<li>[% loc('Photo') %]: [% pictures_taken || 0 %] +<li>[% loc('Publish photo') %]: [% pictures_published || 0 %] +<!-- <li>[% loc('Phone:') %] [% users_phone || 0 %] --> +<li>[% loc('Confirmed') %]: [% email_confirmed || 0 %] +<li>[% loc('Name:') %] [% name_provided || 0 %] +</ul> + +<table> +<tr><th>[% loc('Service:') %]</th><th>[% loc('Count') %]</th></tr> +[% WHILE ( s = per_service.next ) %]<tr><td>[% s.service || 'Web' %]</td><td>[% s.get_column('c') %]</td></tr>[% END %] +</table> + +<table> +<tr><th>[% loc('Category') %]</th><th>[% loc('Count') %]</th></tr> +[% WHILE ( c = per_category.next ) %]<tr><td>[% c.category %]</td><td>[% c.get_column('c') %]</td></tr>[% END %] +</table> + +[% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/zurich/around/intro.html b/templates/web/zurich/around/intro.html index f7a4904e3..b60fa7388 100644 --- a/templates/web/zurich/around/intro.html +++ b/templates/web/zurich/around/intro.html @@ -5,11 +5,6 @@ $(function() { $( "#pc" ).autocomplete({ minLength: 3, - select: function(event, ui) { - $(this).val(ui.item.value); - this.form.submit(); - return true; - }, source: "/ajax/geocode" }); }); diff --git a/templates/web/zurich/auth/general.html b/templates/web/zurich/auth/general.html new file mode 100644 index 000000000..7f6403d00 --- /dev/null +++ b/templates/web/zurich/auth/general.html @@ -0,0 +1,71 @@ +[% INCLUDE 'header.html', title = loc('Sign in or create an account') %] + +[% IF email_error; + + # other keys include fqdn, mxcheck if you'd like to write a custom error message + + errors = { + missing => loc('Please enter your email'), + other => loc('Please check your email address is correct') + }; + + loc_email_error = errors.$email_error || errors.other; +END %] + +<form action="[% c.uri_for() %]" method="post" name="general_auth_login" class="validate"> + <fieldset> + + <h1>[% loc('Sign in') %]</h1> + + <input type="hidden" name="r" value="[% c.req.params.r | html %]"> + + <div id="form_sign_in_yes" class="form-box"> + + <label class="n" for="email">[% loc('Email') %]</label> + [% IF loc_email_error %] + <div class="form-error">[% loc_email_error %]</div> + [% ELSIF sign_in_error %] + <div class="form-error">[% loc('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.') %]</div> + [% END %] + <input type="email" class="required email" id="email" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]"> + + <label for="password_sign_in">[% loc('Password (optional)') %]</label> + <div class="form-txt-submit-box"> + <input type="password" class="required" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]"> + <input class="green-btn" type="submit" name="sign_in" value="[% loc('Sign in') %]"> + </div> + + <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> + <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label> + + </div> + </fieldset> +</form> + +<form action="[% c.uri_for() %]" method="post" name="general_auth_register" class="validate"> + <fieldset> + <input type="hidden" name="r" value="[% c.req.params.r | html %]"> + + <h1>[% loc('<strong>No</strong> let me sign in by email') %]</h1> + <div id="form_sign_in_no" class="form-box"> + + <label class="n" for="email2">[% loc('Email') %]</label> + [% IF loc_email_error %] + <div class="form-error">[% loc_email_error %]</div> + [% END %] + <input type="email" class="required email" id="email2" name="email" value="[% email | html %]" placeholder="[% loc('Your email address') %]"> + + <label for="name">[% loc('Name') %]</label> + <input type="text" class="required" name="name" value="" placeholder="[% loc('Your name') %]"> + + <label for="password_register">[% loc('Password (optional)') %]</label> + <div class="form-txt-submit-box"> + <input type="password" class="required" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input class="green-btn" type="submit" name="email_sign_in" value="Registrieren"> + </div> + + </div> + </fieldset> +</form> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/zurich/faq/faq-de-ch.html b/templates/web/zurich/faq/faq-de-ch.html index a354810df..f15196f8d 100755..100644 --- a/templates/web/zurich/faq/faq-de-ch.html +++ b/templates/web/zurich/faq/faq-de-ch.html @@ -1,190 +1,85 @@ -[% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass => 'twothirdswidthpage' %] +[% INCLUDE 'header.html', title => loc('Help'), bodyclass => 'fullwidthpage' %] -<div class="sticky-sidebar"> - <aside> - <ul class="plain-list"> - <li><a href="#faq">Frequently Asked Questions</a></li> - <li><a href="#practical">Practical Questions</a></li> - <li><a href="#organisation">Organisation Questions</a></li> - <li><a href="/privacy">Privacy and cookies</a></li> - </ul> - </aside> -</div> +<h1><a name="faq"></a>Hilfe</h1> -<h1><a name="faq"></a>Frequently Asked Questions</h1> <dl> - <dt>What is FixMyStreet?</dt> - <dd>FixMyStreet is a site to help people report, view, -or discuss local problems they’ve found to their local council by -simply locating them on a map. It launched in early February -2007.</dd> - <dt>What sort of problems should I report with FixMyStreet?</dt> - <dd>FixMyStreet is primarily for reporting things which are -<strong>broken or dirty or damaged or dumped, and need fixing, cleaning -or clearing</strong>, such as: - <ul><li>Abandoned vehicles - <li>Dog Fouling - <li>Flyposting or graffiti - <li>Flytipping or litter - <li>Streetcleaning, such as broken glass in a cycle lane - <li>Unlit lampposts - <li>Potholes - </ul> - </dd> +<dt>Was ist «Züri wie neu»</dt> +<dd> +«Züri wie neu» ist eine Online-Plattform, über die die Einwohnerinnen und +Einwohner der Stadt Zürich auf Mängel und Schäden der städtischen Infrastruktur +hinweisen können. «Züri wie neu» wird von der Stadtverwaltung moderiert und +transparent geführt. Die Meldungen werden innerhalb von einem Arbeitstag den zuständigen Fachstellen +zugewiesen und innert fünf Arbeitstagen abschliessend beantwortet. Fällt eine +Meldung nicht in den Zuständigkeitsbereich der Stadtverwaltung, wird die +Meldung anonymisiert der zuständigen dritten Stelle per E-Mail zugestellt. +</dd> - <dt>What isn’t FixMyStreet for?</dt> - <dd>FixMyStreet is not a way of getting in touch with [% c.cobrand.is_council ? 'the' : 'your' %] council for all - issues – please use FixMyStreet only for problems such as the above. We - often route problem reports via cleansing services or highways and so using - FixMyStreet for other matters may result in a delay in your report getting - to the right department. <strong>You will need to contact [% c.cobrand.is_council ? 'the' : 'your' %] council - directly for problems such as</strong>: +<dt>Welche Probleme kann ich über «Züri wie neu» melden?</dt> +<dd> +<p>Gemeldet werden können sämtliche Schäden an der Infrastruktur der Stadt Zürich. +Dabei kann es sich um ein Loch im Strassenbelag, ein Graffiti am Stadthaus oder +eine durch Vandalen beschädigte Parkbank handeln. - <ul><li>Anti-social behaviour - <li>Any urgent or emergency problems - <li>Noise pollution or barking dogs - <li>Fires and smoke/smell pollution - <li>Missing wheelie bins or recycling boxes or missed rubbish collections - <li>Proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc. - <li>Complaining about your neighbours - <li>Complaining about the council - <li>Joy riding, drug taking, animal cruelty, or other criminal activity - </ul> - <p>Councils often have direct hotlines for these sorts of issues.</p> - </dd> +<p>Es können Probleme zu folgenden Kategorien gemeldet werden: - <dt>How do I use the site?</dt> - <dd>After entering a postcode or location, you are presented -with a map of that area. You can view problems already reported in that area, -or report ones of your own simply by clicking on the map at the location of -the problem.</dd> - <dt>How are the problems solved?</dt> - <dd>They are reported to the [% IF !c.cobrand.is_council %]relevant[% END %] council by email. The -council can then resolve the problem the way they normally would. -Alternatively, you can discuss the problem on the website with others, and -then together lobby the council to fix it, or fix it directly yourselves.</dd> - <dt>Is it free?</dt> - <dd>The site is free to use, yes. FixMyStreet is run -by a registered charity, though, so if you want to make a contribution, <a -href="https://secure.mysociety.org/donate/">please do</a>.</dd> +<ul> +<li>Abfall / Sammelstellen</li> +<li>Beleuchtung</li> +<li>Graffiti</li> +<li>Spielplatz / Sitzbank</li> +<li>Strasse / Trottoir / Platz</li> +<li>Tiere / Grünflächen</li> +</ul> - <dt>Can I use FixMyStreet on my mobile?</dt> - <dd> - <p>The FixMyStreet website should work on your mobile phone, adapting to - the size of your screen automatically. We plan to release updated native - apps in the near future. - <ul> - <li><em>iPhone:</em> Our basic app from 2008 is available for download - on the App Store: - <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>, - <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app - available from the - <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. - <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the - <a href="http://store.ovi.com/content/107557">Ovi Store</a>. - </ul> - </dd> +</dd> - </dl> +<dt>Was kann ich nicht über «Züri wie neu» melden?</dt> +<dd> +<ul> +<li>Mängel die nicht auf Stadtgebiet liegen.</li> +<li>Melden Sie «Züri wie neu» KEINE Notfälle. Die Notrufnummern lauten: + <br>Medizinisch - 144 Polizei - 117 Feuer - 118 Allgemein - 112</li> +<li>Allgemeine Verschönerungs- und Verbesserungsvorschläge</li> +</ul> +</dd> - <h2><a name="practical"></a>Practical Questions</h2> - <dl> - <dt>I’m from a council, where do you send the reports?</dt> - <dd>You can either leave a test report or <a href="/contact">contact us</a> -to find out where reports go at the moment. Also <a href="/contact">contact us</a> -to update the address or addresses we use.</dd> - <dt>I’m from a council, can we have FixMyStreet on our website?</dt> - <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. <a href="http://www.mysociety.org/for-councils/fixmystreet/">Full details</a>.</dd> - <dt>Do you remove silly or illegal content?</dt> - <dd>FixMyStreet is not responsible for the content and accuracy -of material submitted by its users. We reserve the right to edit or remove any -problems or updates which we consider to be inappropriate upon being informed -by a user of the site.</dd> - <dt>Why does the site use kilometres for measurements?</dt> - <dd>Thanks for asking politely – we never quite understand why some of the rudest - emails we receive are on this topic. The British national - grid reference system, devised by Ordnance Survey (the British national - mapping agency) around the time of the second world war, uses eastings and - northings measured in metres and kilometres; the maps we use are from - Ordnance Survey and so this is what we use to display distances. - There you have it: not everything British is in miles!</dd> +<dt>Wie verwende ich die Webseite?</dt> +<dd> +<p> +Geben Sie zuerst eine Adresse an oder lassen Sie Ihren Standort automatisch +über den entsprechenden Link lokalisieren. Mittels Mausklick in die danach +angezeigte Karte können Sie den exakten Ort des Mangels angeben. Als letzten +Schritt füllen Sie die Felder des Formulars aus und schicken die Meldung ab. +</p> +<p> +Weiter können Sie bestehende Meldungen sowie auch die Rückmeldungen der +Verwaltung betrachten. +</p> +</dd> - <dt>Why can’t I zoom out more on the reporting map?</dt> - <dd>We want to keep FixMyStreet locally focused, so restrict the ability to - move radically between areas. The map on Your Reports will let you see all - the reports you’ve made, wherever they are. If you’re from the - council then the emailed version of the problem report also contains the - closest road and postcode to the pin on the map.</dd> +<dt>Wie werden die Probleme gelöst?</dt> +<dd> +Die Meldungen werden innerhalb von einem Arbeitstag den zuständigen Fachstellen +zugewiesen und innert fünf Arbeitstagen von den dafür zuständigen +Fachstellen bearbeitet sowie mit einer entsprechenden Rückmeldung versehen. +</dd> - <dt>This site is great – why aren’t you better publicised?</dt> - <dd>As a tiny charity we simply don’t have a publicity budget, and we - rely on word of mouth to advertise the site. We have a whole <a - href="posters/">array of posters, flyers and badges</a> if you’d like - to publicise us on the web or in your local area, and why not write to your - local paper to let them know about us?</dd> </dl> - - <h2><a name="organisation"></a>Organisation Questions</h2> - <dl> - <dt>Who built FixMyStreet?</dt> - <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, - in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. -mySociety is the project of a registered charity which has grown out of the community of -volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. -mySociety’s primary mission is to build Internet projects which give people simple, tangible -benefits in the civic and community aspects of their lives. Our first project -was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your -elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety -can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, -or by post at mySociety, 483 Green Lanes, London, N13 4BS, UK.</dd> - <dt><img src="/i/moj.png" align="right" alt="Ministry of Justice" hspace="10">Who pays for it?</dt> - <dd>FixMyStreet was originally paid for via the Department for - Constitutional Affairs Innovations Fund. It is now funded by a variety of means, from commercial - work to <a href="http://www.mysociety.org/donate/">donations</a>.</dd> - <dt><a name="nfi"></a>Wasn’t this site called Neighbourhood Fix-It?</dt> - <dd>Yes, we changed the name mid June 2007. We decided -Neighbourhood Fix-It was a bit of a mouthful, hard to spell, and hard to publicise (does the URL have a dash in it or not?). The domain FixMyStreet became available, and everyone liked the name.</dd> - <dt>Do you need any help with the project?</dt> - <dd>Yes, we can use help in all sorts of ways, technical or -non-technical. Please see our <a -href="http://www.mysociety.org/helpus/">Get Involved page</a>.</dd> - <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> - <dd> -The software behind this site is open source, and available -to you mainly under the GNU Affero GPL software license. You can <a -href="http://github.com/mysociety/fixmystreet">download the -source code</a> and help us develop it. -You’re welcome to use it in your own projects, although you must also -make available the source code to any such projects. -<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code -being used in a Norwegian version of this site. +<dt>Kann ich «Züri wie neu» auf meinem Smartphone nutzen?</dt> +<dd> +Ja, sowohl über die für mobile Geräte optimierte Webseite, als auch über die +iOS- und Android-App. </dd> -<dt>I’d prefer code in a different language?</dt> + +<dt>Kann ich auch Probleme ausserhalb von Zürich melden?</dt> +<dd>Nein.</dd> + +<dt>Werden meine E-Mail-Adresse, mein Name und meine Telefonnummer vertraulich behandelt?</dt> <dd> -VisibleGovernment.ca wrote their own code for -<a href="http://www.fixmystreet.ca/">http://www.fixmystreet.ca/</a>, which is -written in GeoDjango and available under an MIT licence at <a -href="http://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a>. -Or <a href="http://www.fixmystreet.org.nz/">FixMyStreet.org.nz</a> is written in -Drupal. -</p> +Die Kontaktinformationen werden nur stadtintern für Rückfragen verwendet. Sie +werden weder im Internet publiziert noch an Dritte weitergegeben. </dd> - <dt>People build things, not organisations. Who <em>actually</em> built it?</dt> - <dd>Matthew Somerville and Francis Irving wrote the site, -Chris Lightfoot wrote the tileserver and map cutter, Richard Pope created -our pins, Deborah Kerr keeps things up-to-date and does user support, -Ayesha Garrett designed our posters, and Tom Steinberg managed it all. -Thanks also to -<a href="http://www.ordnancesurvey.co.uk">Ordnance Survey</a> (for the maps, -UK postcodes, and UK addresses – data © Crown copyright, all -rights reserved, Ministry of Justice 100037819 2008), -Yahoo! for their BSD-licensed JavaScript libraries, the entire free software -community (this particular project was brought to you by Perl, PostgreSQL, -and the number 161.290) and <a -href="http://www.bytemark.co.uk/">Bytemark</a> (who kindly host all -our servers). +</dl> -Let us know if we’ve missed anyone.</dd> - </dl> [% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/zurich/footer.html b/templates/web/zurich/footer.html index a570a66a3..2304c048e 100644 --- a/templates/web/zurich/footer.html +++ b/templates/web/zurich/footer.html @@ -9,18 +9,17 @@ [% IF c.user_exists %] <p> [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - </p><p><a href="/auth/sign_out">[% loc('sign out') %]</a> + </p><p><a href="/admin">[% loc('Summary') %]</a> | <a href="/auth/sign_out">[% loc('sign out') %]</a> </p> - [% ELSE %] + [% END %] <ul id="main-menu" class="mob-only"> - <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] - >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% + <li><[% IF c.req.uri.path == '/' %]a onclick="$('html, body').animate({scrollTop:0}, 500); return false;" href="#site-header"[% ELSE %]a href="/"[% END %] + >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'a' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> </ul> - [% END %] </div> </div> </div> @@ -29,11 +28,12 @@ <!-- [% INCLUDE 'debug_footer.html' %] --> </div> <!-- .wrapper --> - <div id="zurich-footer" class="desk-only"> - © 2012 Stadt Zürich + <div id="zurich-footer-wrapper" class="desk-only"> + <div id="zurich-footer"> + © 2013 Stadt Zürich <span class="hidden">|</span> <a href="http://www.stadt-zuerich.ch/content/portal/de/index/footer/rechtliche_hinweise.html">Rechtliche Hinweise</a> <span class="hidden">|</span> <a href="http://www.stadt-zuerich.ch/content/portal/de/index/footer/impressum.html">Impressum</a> - <span class="hidden">|</span> <a href="http://www.stadt-zuerich.ch/content/portal/de/index/footer/barrierefreiheit.html">Barrierefreiheit</a> + </div> </div> </body> diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html index 8c8e49775..891c6f1d3 100644 --- a/templates/web/zurich/header.html +++ b/templates/web/zurich/header.html @@ -20,14 +20,14 @@ <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> <![endif]--> -<!-- CDN for now FIXME --><link rel="stylesheet" href="http://code.jquery.com/ui/1.9.2/themes/redmond/jquery-ui.css"> + <link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/themes/redmond/jquery-ui.css"> <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script> - [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'FixMyZurich' %] + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'Züri wie neu' %] [% extra_js %] -<!-- CDN for now FIXME --><script src="http://code.jquery.com/ui/1.9.2/jquery-ui.js" charset="utf-8"></script> + <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.2/jquery-ui.min.js" charset="utf-8"></script> [% INCLUDE 'tracking_code.html' %] @@ -38,7 +38,8 @@ <div class="table-cell"> <header id="site-header" role="banner"> <div class="container"> - <a href="http://www.stadt-zuerich.ch/" id="site-logo">FixMyZurich</a> + <a href="/" id="site-logo-text">Züri wie neu</a> + <a href="http://www.stadt-zuerich.ch/" id="site-logo">Stadt Zürich</a> <a href="#main-nav" id="nav-link">Main Navigation</a> </div> </header> @@ -67,6 +68,9 @@ <li [% IF pagename == 'users' OR pagename == 'user_edit' %]class="current"[% END %]> <a href="/admin/users">[% loc('Users') %]</a> </li> + <li [% IF pagename == 'stats' %]class="current"[% END %]> + <a href="/admin/stats">[% loc('Stats') %]</a> + </li> [% END %] <li class="search-box"> <form method="get" action="[% c.uri_for('reports') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> diff --git a/templates/web/zurich/report/_item.html b/templates/web/zurich/report/_item.html index 41164cdd1..7adb7cdd4 100644 --- a/templates/web/zurich/report/_item.html +++ b/templates/web/zurich/report/_item.html @@ -1,17 +1,19 @@ <li> <a class="text" href="[% c.uri_for('/report', problem.id ) %]"> - [% IF problem.state != 'unconfirmed' AND problem.photo AND problem.extra.publish_photo %] - <img class="img" height="60" width="90" src="/photo/[% problem.id %].fp.jpeg" alt=""> + [% IF problem.state != 'unconfirmed' AND problem.photo AND problem.extra.publish_photo; + photo = problem.get_photo_params + %] + <img class="img" height="60" width="90" src="[% photo.url_fp %]" alt=""> [% END %] [% IF problem.state != 'unconfirmed' %] <h4>[% problem.title | html %]</h4> [% ELSE %] <h4><em>[% loc('Awaiting moderation') %]</em></h4> [% END %] - <small>[% prettify_dt( problem.created_local, 'zurich' ) %] + <small>[% prettify_dt( problem.created, 'zurich' ) %] [%- IF dist %], [% dist %]km[% END %] [%- IF include_lastupdate AND problem.created != problem.lastupdate AND problem.whensent != problem.lastupdate %], - [% tprintf('last updated %s', prettify_dt( problem.lastupdate_local, 'zurich' ) ) %] + [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 'zurich' ) ) %] [%- END %] [% IF NOT no_fixed AND problem.is_fixed %] [% loc('(fixed)') %] diff --git a/templates/web/zurich/report/_main.html b/templates/web/zurich/report/_main.html index e6c310873..c5fbabf1c 100644 --- a/templates/web/zurich/report/_main.html +++ b/templates/web/zurich/report/_main.html @@ -1,7 +1,7 @@ <div class="problem-header cf"> <h1>[% tprintf( loc('Reported in the %s category'), problem.category ) %]</h1> <p class="sub"> - [% prettify_dt( problem.created_local, 'zurich' ) %] + [% prettify_dt( problem.created, 'zurich' ) %] [%- IF !problem.used_map %]<br>[% loc('there is no pin shown as the user did not use the map') %][% END %] </p> diff --git a/templates/web/zurich/report/updates.html b/templates/web/zurich/report/updates.html index 69c8af99f..786ecd582 100644 --- a/templates/web/zurich/report/updates.html +++ b/templates/web/zurich/report/updates.html @@ -4,7 +4,7 @@ <li> <div class="update-wrap"> <div class="update-text"> - <p class="meta-2">[% prettify_dt( problem.lastupdate_local, 'zurich' ) %]</p> + <p class="meta-2">[% prettify_dt( problem.lastupdate, 'zurich' ) %]</p> [% IF problem.state == 'fixed - council' %] [% add_links( problem.extra.public_response ) | html_para %] [% ELSIF problem.state == 'closed' AND problem.external_body %] diff --git a/templates/web/zurich/tracking_code.html b/templates/web/zurich/tracking_code.html new file mode 100644 index 000000000..bffd0fd6f --- /dev/null +++ b/templates/web/zurich/tracking_code.html @@ -0,0 +1,18 @@ +[% + SET ga_code = 'UA-38427437-1'; + SET ga_code = 'UA-39223200-1' IF c.config.BASE_URL == "https://www.zueriwieneu.ch"; +%] +<script type="text/javascript"> + + var _gaq = _gaq || []; + _gaq.push(['_setAccount', '[% ga_code %]']); + _gaq.push (['_gat._anonymizeIp']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + +</script> diff --git a/web/cobrands/emptyhomes/css.css b/web/cobrands/emptyhomes/css.css index 97d0e1192..da9afd104 100644 --- a/web/cobrands/emptyhomes/css.css +++ b/web/cobrands/emptyhomes/css.css @@ -168,8 +168,8 @@ a:hover, a:active { clear: both; font-size: 83%; border-top: solid 2em #ffffff; - background-color: #80AE7D; - color: #FFFFFF; + background-color: #fe6500; + color: #000; margin: 2em 0 1em 0; padding: 20px; overflow: auto; @@ -185,20 +185,24 @@ a:hover, a:active { } #emptyhomes-footer a { - color: #FFFFFF; + color: #000; } #mysociety #postcodeForm { - background-color: #80AE7D; + background-color: #B1BECF; color: #000000; font-size: 130%; } #mysociety #front_stats div { - background-color: #80AE7D; + vertical-align: middle; + background-color: #B1BECF; + color: #000000; + padding: 0.5em; + width: 7em; +} +#mysociety #front_stats div a { color: #000000; - /*padding: 0.5em 0; */ - width: 9em; } #mysociety #problem_form { diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss index d72910450..a7670b434 100644 --- a/web/cobrands/fixmystreet/_base.scss +++ b/web/cobrands/fixmystreet/_base.scss @@ -255,10 +255,13 @@ fieldset { margin: 1em; } +input[type=file] { + width: 100%; +} + input[type=text], input[type=password], input[type=email], -input[type=file], textarea { @include box-sizing(border-box); width: 100%; @@ -269,7 +272,6 @@ textarea { input[type=text], input[type=password], input[type=email], - input[type=file], textarea { max-width: 95%; } @@ -295,17 +297,13 @@ textarea { input[type=text], input[type=password], -input[type=email], -input[type=file] { +input[type=email] { border: 0.125em solid #888888; @include border-radius(0.25em); display: block; font-size: 1em; line-height: 1em; } -input[type=file] { - margin-bottom:1em; -} label{ display: block; @@ -1020,7 +1018,7 @@ a:hover.button-left { // Left and right so that zoom can be left, pan right. #fms_pan_zoom { right: 0.5em !important; - top: 0.5em !important; + top: 2.75em !important; left: 0.5em !important; } // The left and right of the above causes the navigation to move off-screen left in IE6. @@ -1409,9 +1407,7 @@ table.nicetable { background: $primary; padding-left:0.5em; padding-right:0.5em; - color:#1a1a1a; &:hover { - color:#1a1a1a; text-decoration:none; background:$primary/1.1; } diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss index 80ac35edc..07f944ffa 100644 --- a/web/cobrands/fixmystreet/_layout.scss +++ b/web/cobrands/fixmystreet/_layout.scss @@ -981,6 +981,59 @@ body.frontpage { } } +// Admin tables + +$table_border_color: #ccc; +$table_heading_bg_col: #595959; +$table_heading_border_col: #7a7a7a; +$table_heading_col: #fff; +$table_heading_underline_col: #393939; +$button_col: #fff; +$button_bg_col: #a1a1a1; // also search bar (tables) + +.admin { + table { + width: 100%; + font-size: 0.9em; + border: 1px solid $table_border_color; + border-collapse: collapse; + margin-bottom: 1em; + th, td { + padding: 0.666em 0.5em; + border: 1px solid $table_border_color; + } + th { + color: white; + background-color: $table_heading_bg_col; + border-bottom: 2px solid $table_heading_underline_col; + border-left: 1px solid $table_heading_border_col; + border-right: 1px solid $table_heading_border_col; + a:link, a:visited { + color: white; + } + } + td.record-id { + text-align: center; + font-weight: bold; + } + tr.filter-row td { + display: none; /* TODO: reveal when filtering is implemented */ + padding: 4px 4px 4px 40px; + background-color: $button_bg_col; + background-image: url('search-icon-white.png'); + background-position: 14px center; + background-repeat: no-repeat; + border-bottom: 2px solid $table_border_color; + } + tr.filter-row td input[type=text] { + background-color: #e1e1e1; + width: 16em; + @include border-radius(4px); + border: none; + padding: 3px 0.5em; + } + } +} diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index d9360d0e2..b490c6177 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -61,7 +61,7 @@ $(function(){ } else if (window.location.href.indexOf('oxfordshire') != -1) { cobrand = 'oxfordshire'; is_small_map = true; - } else if (window.location.href.indexOf('zurich') != -1) { + } else if (window.location.href.indexOf('zurich') != -1 || window.location.href.indexOf('zueri') != -1) { cobrand = 'zurich'; } diff --git a/web/cobrands/fixmystreet/images/spinner-white.gif b/web/cobrands/fixmystreet/images/spinner-white.gif Binary files differnew file mode 100644 index 000000000..7db88b06b --- /dev/null +++ b/web/cobrands/fixmystreet/images/spinner-white.gif diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss index 542cffd96..a46c15875 100644 --- a/web/cobrands/stevenage/layout.scss +++ b/web/cobrands/stevenage/layout.scss @@ -1,5 +1,5 @@ @import "colours"; -@import "../fixmystreet/layout"; +@import "../fixmystreet/_layout"; // d523b431 - "Stevenage Home page styles" // 2a23e09f - Moved menu on map page and reverted to full header. diff --git a/web/cobrands/zurich/_colours.scss b/web/cobrands/zurich/_colours.scss index 73fb36577..e2a2587f0 100644 --- a/web/cobrands/zurich/_colours.scss +++ b/web/cobrands/zurich/_colours.scss @@ -16,12 +16,3 @@ $col_fixed_label_dark: #4B8304; $mobile_menu_tab_bg_col: #FFFFFF; // the white border and tab on mobile site $mobile_header_blue: #366AB6; // close match to Zurich logo_portal.jpg -// Zurich admin tables: - -$table_border_color: #ccc; -$table_heading_bg_col: #595959; -$table_heading_border_col: #7a7a7a; -$table_heading_col: #fff; -$table_heading_underline_col: #393939; -$button_col: #fff; -$button_bg_col: #a1a1a1; // also search bar (tables) diff --git a/web/cobrands/zurich/_zurich.scss b/web/cobrands/zurich/_zurich.scss index b71670a92..c9eb7a080 100644 --- a/web/cobrands/zurich/_zurich.scss +++ b/web/cobrands/zurich/_zurich.scss @@ -8,9 +8,14 @@ a:hover { text-decoration: underline; } +// mySociety addition for box shadow on front page with static image +body.frontpage #zurich-footer-wrapper { + padding: 1px 0; + @include box-shadow(0 -6px 6px -5px #000); +} + #zurich-footer { - margin-top: 2em; // mySociety - margin-left: 12px; // mySociety + margin: 2em auto; // mySociety font-size: 67.5%; line-height: 1.5em; clear: both; diff --git a/web/cobrands/zurich/base.scss b/web/cobrands/zurich/base.scss index 8111f2726..a89aec2fd 100644 --- a/web/cobrands/zurich/base.scss +++ b/web/cobrands/zurich/base.scss @@ -40,6 +40,14 @@ &:before { display: none; } + &#closed { + color: #1a1a1a; + background: #e25436; + } + &#progress { + color: #1a1a1a; + background: #f3d74b; + } } } @@ -51,7 +59,7 @@ #site-logo { background: url(logo_portal.jpg) 0px -24px no-repeat; width: 200px; - height:44px; + height: 48px; left:0; top:4px; } @@ -66,6 +74,22 @@ background-color: $mobile_header_blue; } +// fix here: +// a percentage width on input#pc breaks iPhone landscape/portrait switching +// and the other changes make this fix pretty + +#front-main #postcodeForm div { + background: inherit; + border-color:transparent; + input#pc { + max-width: 15em; + background-color: #fff; + } + input#sub { + width: 3em; + } +} + // No grey background or other bits // The amount of resetting here shows this needs refactoring, so that it is FMS making the changes // Also look into why full-width pulls things out, but then it is its children @@ -106,3 +130,10 @@ h4.static-with-rule { padding-left: 0.8em; padding-right: 0.8em; } + +#fms_pan_zoom_panup, +#fms_pan_zoom_pandown, +#fms_pan_zoom_panleft, +#fms_pan_zoom_panright { + display: none; +} diff --git a/web/cobrands/zurich/layout.scss b/web/cobrands/zurich/layout.scss index 3a2d8ddb0..2b16636b9 100644 --- a/web/cobrands/zurich/layout.scss +++ b/web/cobrands/zurich/layout.scss @@ -1,5 +1,5 @@ @import "colours"; -@import "../fixmystreet/layout"; +@import "../fixmystreet/_layout"; @import "zurich"; // Things to override from parent stylesheet @@ -19,12 +19,12 @@ body { border: none; } } -// Except on map pages -body.mappage .content { +// Except on map pages (which includes the front page) +body.mappage .content, body.frontpage .content { @include box-shadow(0 0 6px 1px #000); } .ie6, .ie7, .ie8 { - body.mappage .content { + body.mappage .content, body.frontpage .content { border: 1px solid #666; } } @@ -45,20 +45,53 @@ body.mappage.admin .nav-wrapper-2 { body.frontpage #site-logo, #site-logo { width: 415px; - height: 16px; + height: 83px; background: url(logo_portal.jpg) top left no-repeat; top: 0; - text-indent: 0; - padding-left: 10px; + left: auto; // base set this to 0 +} + +// Static map on front page +body.frontpage { + .table-cell { + background-position: 50% 117px; + background-repeat: no-repeat; + background-image: url(mapbg-1024.jpg); + @media all and (min-width: 1025px) { + background-image: url(mapbg-1600.jpg); + } + .content { + margin: 2em auto; // Spacing around front content on top of static map + } + } + + #site-header { + height: 117px; + background-color: #fff; + @include box-shadow(0 0 6px 1px #000); + } +} + +#site-logo-text { + position: absolute; + top: 0; + z-index: 3; padding-top: 83px; + padding-left: 10px; color: #585858; font-size: 85%; - left: auto; // base set this to 0 +} +body.mappage #site-logo-text { + position: fixed; } .nav-wrapper { .nav-wrapper-2 { - border-top: solid 18px white; + border-top: none; + } + .nav-wrapper-3 { + height: 99px; + padding-top: 18px; } } @@ -109,9 +142,14 @@ body.mappage { background-color: inherit; color: inherit; margin: 0 0 2em 0; + #postcodeForm div { + border-color: $dark_blue; + input#pc { + max-width: none; + } + } } -/* TODO Change the main-nav to be what is wanted */ #main-nav { ul#main-menu { li { @@ -160,6 +198,9 @@ body.mappage { } body.mappage { + #main-nav { + width: auto; + } #main-nav ul#main-menu li a, #main-nav ul#main-menu li span { padding: 0.75em; @@ -191,6 +232,10 @@ body.twothirdswidthpage { background: $col_fixed_label; @include background(linear-gradient(#769643, $col_fixed_label 4px)); } + &#closed { + padding-top: 2em; + background-image: none; + } } } .ie6 .banner p { @@ -200,7 +245,13 @@ body.twothirdswidthpage { } #fms_pan_zoom { - top: 7.75em !important; + top: 9em !important; +} +#fms_pan_zoom_zoomin { + top: 0 !important; +} +#fms_pan_zoom_zoomout { + top: 44px !important; } // Admin specific changes @@ -212,55 +263,29 @@ body.fullwidthpage.admin .content { body.mappage.admin .content { margin-top: 6em; margin-left: 0.5em; - } .admin { .content { margin: 2em 0 1em; padding: 0 0 0 0; + ul.no-bullets { + margin-left: 0; + > li { + list-style: none; + } + } + li.assignation { + list-style: none; + } + .mock-label { + font-weight: bold; + padding-right: 0.333em; + } } #zurich-footer { margin: 2em auto 3em auto; } - - table { - width: 100%; - font-size: 0.9em; - border: 1px solid $table_border_color; - border-collapse:collapse; - th, td { - padding: 0.666em 0.5em; - border: 1px solid $table_border_color; - } - th { - color: white; - background-color: $table_heading_bg_col; - border-bottom: 2px solid $table_heading_underline_col; - border-left: 1px solid $table_heading_border_col; - border-right: 1px solid $table_heading_border_col; - } - td.record-id { - text-align: center; - font-weight: bold; - } - tr.filter-row td { - display: none; /* TODO: reveal when filtering is implemented */ - padding: 4px 4px 4px 40px; - background-color: $button_bg_col; - background-image: url('search-icon-white.png'); - background-position: 14px center; - background-repeat: no-repeat; - border-bottom: 2px solid $table_border_color; - } - tr.filter-row td input[type=text] { - background-color: #e1e1e1; - width: 16em; - @include border-radius(4px); - border: none; - padding: 3px 0.5em; - } - } } .admin-nav-wrapper { diff --git a/web/cobrands/zurich/mapbg-1024.jpg b/web/cobrands/zurich/mapbg-1024.jpg Binary files differnew file mode 100644 index 000000000..9adb82b98 --- /dev/null +++ b/web/cobrands/zurich/mapbg-1024.jpg diff --git a/web/cobrands/zurich/mapbg-1600.jpg b/web/cobrands/zurich/mapbg-1600.jpg Binary files differnew file mode 100644 index 000000000..9321bd612 --- /dev/null +++ b/web/cobrands/zurich/mapbg-1600.jpg diff --git a/web/i/pin-green-big.png b/web/i/pin-green-big.png Binary files differnew file mode 100644 index 000000000..16d73230a --- /dev/null +++ b/web/i/pin-green-big.png diff --git a/web/i/pin-red-big.png b/web/i/pin-red-big.png Binary files differnew file mode 100644 index 000000000..2d970b9e2 --- /dev/null +++ b/web/i/pin-red-big.png diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index e25c2a571..838351e8b 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -52,7 +52,8 @@ $(function(){ var form_submitted = 0; var submitted = false; - $("form.validate").validate({ + $("form.validate").each(function(){ + $(this).validate({ rules: validation_rules, messages: translation_strings, onkeyup: false, @@ -85,6 +86,7 @@ $(function(){ submitted = false; }, invalidHandler: function(form, validator) { submitted = true; } + }); }); $('input[type=submit]').click( function(e) { form_submitted = 1; } ); @@ -142,7 +144,8 @@ $(function(){ if($('.mobile').length){ $link.append(' <img src="/cobrands/fixmystreet/images/spinner-black.gif" alt="" align="bottom">'); }else{ - $link.append(' <img src="/cobrands/fixmystreet/images/spinner-yellow.gif" alt="" align="bottom">'); + var spincolor = $('<span>').css("color","white").css("color") === $('#front-main').css("background-color")? 'white' : 'yellow'; + $link.append(' <img src="/cobrands/fixmystreet/images/spinner-' + spincolor + '.gif" alt="" align="bottom">'); } geo_position_js.getCurrentPosition(function(pos) { $link.find('img').remove(); diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 88dc6d69e..62e94ed29 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -411,14 +411,30 @@ OpenLayers.Control.PanZoomFMS = OpenLayers.Class(OpenLayers.Control.PanZoom, { /* Overriding Permalink so that it can pass the correct zoom to OSM */ OpenLayers.Control.PermalinkFMS = OpenLayers.Class(OpenLayers.Control.Permalink, { - updateLink: function() { + _updateLink: function(alter_zoom) { var separator = this.anchor ? '#' : '?'; var href = this.base; if (href.indexOf(separator) != -1) { href = href.substring( 0, href.indexOf(separator) ); } - href += separator + OpenLayers.Util.getParameterString(this.createParams(null, this.map.getZoom()+fixmystreet.zoomOffset)); + var center = this.map.getCenter(); + if ( center && fixmystreet.state_map && fixmystreet.state_map == 'full' ) { + // Translate the permalink co-ords so that 'centre' is accurate + var $content = $('.content'), mb = $('#map_box'), + q = ( $content.offset().left - mb.offset().left + $content.width() ) / 2; + if (q < 0) { q = 0; } + var p = this.map.getViewPortPxFromLonLat(center); + p.x += q; + p.y += 25; + center = this.map.getLonLatFromViewPortPx(p); + } + + var zoom = this.map.getZoom(); + if ( alter_zoom ) { + zoom += fixmystreet.zoomOffset; + } + href += separator + OpenLayers.Util.getParameterString(this.createParams(center, zoom)); // Could use mlat/mlon here as well if we are on a page with a marker if (this.anchor && !this.element) { window.location.href = href; @@ -426,6 +442,14 @@ OpenLayers.Control.PermalinkFMS = OpenLayers.Class(OpenLayers.Control.Permalink, else { this.element.href = href; } + }, + updateLink: function() { + this._updateLink(0); + } +}); +OpenLayers.Control.PermalinkFMSz = OpenLayers.Class(OpenLayers.Control.PermalinkFMS, { + updateLink: function() { + this._updateLink(1); } }); diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 54bf95964..9b8916946 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -7,8 +7,8 @@ function set_map_config(perm) { new OpenLayers.Control.ArgParser(), //new OpenLayers.Control.LayerSwitcher(), new OpenLayers.Control.Navigation(), - new OpenLayers.Control.Permalink(permalink_id), - new OpenLayers.Control.PermalinkFMS('osm_link', 'http://www.openstreetmap.org/'), + new OpenLayers.Control.PermalinkFMS(permalink_id), + new OpenLayers.Control.PermalinkFMSz('osm_link', 'http://www.openstreetmap.org/'), new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; } diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 6d86663f0..34ea255e8 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -16,9 +16,14 @@ function set_map_config(perm) { new OpenLayers.Control.Attribution(), new OpenLayers.Control.ArgParser(), fixmystreet.nav_control, - new OpenLayers.Control.Permalink(permalink_id), + new OpenLayers.Control.PermalinkFMS(permalink_id), new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; + /* Linking back to around from report page, keeping track of map moves */ + if ( fixmystreet.page == 'report' ) { + fixmystreet.controls.push( new OpenLayers.Control.PermalinkFMS('key-tool-problems-nearby', '/around') ); + } + if (fixmystreet.map_type) { tile_base = fixmystreet.map_type; } diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js index 682c62f39..cfff686e6 100644 --- a/web/js/map-wmts-zurich.js +++ b/web/js/map-wmts-zurich.js @@ -2,6 +2,34 @@ * Maps for FMZ using Zurich council's WMTS tile server */ +function fixmystreet_zurich_admin_drag() { + var admin_drag = new OpenLayers.Control.DragFeature( fixmystreet.markers, { + onComplete: function(feature, e) { + var lonlat = feature.geometry.clone(); + lonlat.transform( + fixmystreet.map.getProjectionObject(), + new OpenLayers.Projection("EPSG:4326") + ); + if (window.confirm( 'Richtiger Ort?' ) ) { + // Store new co-ordinates + document.getElementById('fixmystreet.latitude').value = lonlat.y; + document.getElementById('fixmystreet.longitude').value = lonlat.x; + } else { + // Put it back + var lat = document.getElementById('fixmystreet.latitude').value; + var lon = document.getElementById('fixmystreet.longitude').value; + lonlat = new OpenLayers.LonLat(lon, lat).transform( + new OpenLayers.Projection("EPSG:4326"), + fixmystreet.map.getProjectionObject() + ); + fixmystreet.markers.features[0].move(lonlat); + } + } + } ); + fixmystreet.map.addControl( admin_drag ); + admin_drag.activate(); +} + $(function(){ $('#map_layer_toggle').toggle(function(){ $(this).text('Luftbild'); @@ -10,6 +38,15 @@ $(function(){ $(this).text('Stadtplan'); fixmystreet.map.setBaseLayer(fixmystreet.map.layers[0]); }); + + /* Admin dragging of pin */ + if (fixmystreet.page == 'admin') { + if ($.browser.msie) { + $(window).load(fixmystreet_zurich_admin_drag); + } else { + fixmystreet_zurich_admin_drag(); + } + } }); /* @@ -34,6 +71,11 @@ $(function(){ fixmystreet.controls.push( new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ); } + /* Linking back to around from report page, keeping track of map moves */ + if ( fixmystreet.page == 'report' ) { + fixmystreet.controls.push( new OpenLayers.Control.PermalinkFMS('key-tool-problems-nearby', '/around') ); + } + fixmystreet.map_type = OpenLayers.Layer.WMTS; // Set DPI - default is 72 @@ -51,7 +93,7 @@ $(function(){ layer: "Hybrid", matrixSet: "nativeTileMatrixSet", requestEncoding: "REST", - url: "http://www.wmts.stadt-zuerich.ch/Hybrid/MapServer/WMTS/tile/", + url: "/maps/Hybrid/", style: "default", matrixIds: [ //{ identifier: "0", matrixHeight: 2, matrixWidth: 2, scaleDenominator: 250000, supportedCRS: "urn:ogc:def:crs:EPSG::21781", tileHeight: 256, tileWidth: 256, topLeftCorner: { lat: 30814423, lon: -29386322 } }, @@ -70,7 +112,7 @@ $(function(){ layer_options, OpenLayers.Util.applyDefaults({ name: "Stadtplan", layer: "Stadtplan", - url: "http://www.wmts.stadt-zuerich.ch/Stadtplan/MapServer/WMTS/tile/" + url: "/maps/Stadtplan/" }, layer_options) ]; |
