diff options
| -rw-r--r-- | README.md | 37 | ||||
| -rwxr-xr-x | bin/install-as-user | 92 | ||||
| -rw-r--r-- | bin/site-specific-install.sh | 24 | ||||
| -rwxr-xr-x[-rw-r--r--] | bin/update-schema | 7 | ||||
| -rwxr-xr-x | conf/Vagrantfile.example | 90 | ||||
| -rw-r--r-- | locale/FixMyStreet.po | 649 | ||||
| -rw-r--r-- | notes/vagrant.md | 66 | ||||
| -rw-r--r-- | templates/web/default/admin/body.html | 10 |
8 files changed, 720 insertions, 255 deletions
@@ -14,10 +14,15 @@ 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.2.4. +Platform is now at version 1.2.5. ## Releases +* v1.2.5 (13th September 2013) + - Adds various useful hints and notices to the admin interface + - Improves the install script, including an example Vagrantfile + - It is now easier for tests to override particular configuration + variables should they need to. * v1.2.4 (5th September 2013) - A fix for the long-standing issue where multiline strings were not being translated (reported at https://github.com/abw/Template2/pull/29 ) @@ -25,13 +30,13 @@ Platform is now at version 1.2.4. - Less noise when running the tests * v1.2.3 (2nd September 2013) - Maintenance release to deal with failing installation - - Improve reuse of make_css and shared CSS - - Remove hardcoded UK URLs on couple of admin error emails - - Mark couple of strings missing translation - - mapquest URL update + - Improves reuse of make_css and shared CSS + - Removes hardcoded UK URLs on a couple of admin error emails + - Marks a couple of strings missing translation + - Updates mapquest URLs * v1.2.2 (26th July 2013) - Maintenance release to deal with failing installation - - Improve Google Maps plugin somewhat, though still needs work + - Improves the Google Maps plugin somewhat, though still needs work * v1.2.1 (5th June 2013) - Maintenance release to deal with failing carton installation - Test and module fixes for installation on Debian wheezy @@ -39,23 +44,23 @@ Platform is now at version 1.2.4. - The install script adds gem environment variables to the user's .bashrc so that make_css can be run directly after installation - make_css automatically spots which cobrands use compass - - Some missing states added to the admin report edit page + - Adds some missing states to the admin report edit page * v1.2 (3rd May 2013) - - Add MAPIT_ID_WHITELIST to allow easier use of global MapIt - - Add postfix to the install script/ AMI so emailing works out of the box - - Add an extra zoom level to the OSM maps - - Add the Catalyst gzip plugin so HTML pages are gzipped - - Fix an issue with the All Reports summary statistics not including some + - Adds MAPIT_ID_WHITELIST to allow easier use of global MapIt + - Adds postfix to the install script/ AMI so emailing works out of the box + - Adds an extra zoom level to the OSM maps + - Adds the Catalyst gzip plugin so HTML pages are gzipped + - Fixes an issue with the All Reports summary statistics not including some open states, such as 'in progress' * v1.1.2 (15th March 2013) - - Include the 'cpanfile' now required by carton, the Perl package + - Includes the 'cpanfile' now required by carton, the Perl package management program we use. * 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 + - Adds 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, diff --git a/bin/install-as-user b/bin/install-as-user index 1d6cce982..0813a6b70 100755 --- a/bin/install-as-user +++ b/bin/install-as-user @@ -1,7 +1,10 @@ #!/bin/sh set -e -set -x +error_msg() { printf "\033[31m%s\033[0m\n" "$*"; } +notice_msg() { printf "\033[33m%s\033[0m " "$*"; } +done_msg() { printf "\033[32m%s\033[0m\n" "$*"; } +DONE_MSG=$(done_msg done) if [ $# -ne 3 ] then @@ -14,6 +17,15 @@ fi UNIX_USER="$1" HOST="$2" DIRECTORY="$3" + +misuse() { + echo The variable $1 was not defined, and it should be. + echo This script should not be run directly. + exit 1 +} + +[ -z "$DEVELOPMENT_INSTALL" ] && misuse DEVELOPMENT_INSTALL + DB_NAME="fixmystreet" # Check that the arguments we've been passed are sensible: @@ -22,19 +34,19 @@ IP_ADDRESS_FOR_HOST="$(dig +short $HOST)" if [ x = x"$IP_ADDRESS_FOR_HOST" ] then - echo "The hostname $HOST didn't resolve to an IP address" + error_msg "The hostname $HOST didn't resolve to an IP address" exit 1 fi if ! id "$UNIX_USER" 2> /dev/null > /dev/null then - echo "The user '$UNIX_USER' didn't exist." + error_msg "The user '$UNIX_USER' didn't exist." exit 1 fi if [ "$(whoami)" != "$UNIX_USER" ] then - echo "This script should be run by the user '$UNIX_USER'." + error_msg "This script should be run by the user '$UNIX_USER'." exit 1 fi @@ -44,24 +56,23 @@ LINK_DESTINATION="$HOME/fixmystreet" ln -sfn "$REPOSITORY" $LINK_DESTINATION cd "$REPOSITORY" -# Add regularly scheduled tasks to cron: - -TEMPORARY_CRONTAB=$(mktemp) - -echo crontab file is $TEMPORARY_CRONTAB - -cp "$REPOSITORY"/conf/crontab.example "$TEMPORARY_CRONTAB" - -sed -i \ - -e 's,$FMS,'"$REPOSITORY,g" \ - -e 's,$LOCK_DIR,'"$DIRECTORY,g" \ - "$TEMPORARY_CRONTAB" - -crontab $TEMPORARY_CRONTAB +if [ ! "$DEVELOPMENT_INSTALL" = true ]; then + echo -n "Adding crontab... " + # Add regularly scheduled tasks to cron: + TEMPORARY_CRONTAB=$(mktemp) + echo crontab file is $TEMPORARY_CRONTAB + cp "$REPOSITORY"/conf/crontab.example "$TEMPORARY_CRONTAB" + sed -i \ + -e 's,$FMS,'"$REPOSITORY,g" \ + -e 's,$LOCK_DIR,'"$DIRECTORY,g" \ + "$TEMPORARY_CRONTAB" + crontab $TEMPORARY_CRONTAB + echo $DONE_MSG +fi # Install the compass gem locally - it's required for generating the # CSS: - +echo "Setting up CSS... " export GEM_HOME="$DIRECTORY/gems" mkdir -p "$GEM_HOME" export GEM_PATH= @@ -81,25 +92,29 @@ gem install --no-ri --no-rdoc compass # Use compass to generate the CSS, if it doesn't seem to already # exist: - if [ ! -f web/cobrands/default/base.css ] then bin/make_css fi - -# Write sensible values into the config file: - -sed -r \ - -e "s,^( *FMS_DB_HOST:).*,\\1 ''," \ - -e "s,^( *FMS_DB_NAME:).*,\\1 '$DB_NAME'," \ - -e "s,^( *FMS_DB_USER:).*,\\1 '$UNIX_USER'," \ - -e "s,^( *BASE_URL:).*,\\1 'http://$HOST'," \ - -e "s,^( *EMAIL_DOMAIN:).*,\\1 '$HOST'," \ - -e "s,^( *CONTACT_EMAIL:).*,\\1 'help@$HOST'," \ - -e "s,^( *DO_NOT_REPLY_EMAIL:).*,\\1 'help@$HOST'," \ - conf/general.yml-example > conf/general.yml +echo $DONE_MSG + +# Write sensible values into the config file, if it doesn't already exist +if [ ! -f conf/general.yml ]; then + echo -n "Setting up default conf/general.yml file... " + sed -r \ + -e "s,^( *FMS_DB_HOST:).*,\\1 ''," \ + -e "s,^( *FMS_DB_NAME:).*,\\1 '$DB_NAME'," \ + -e "s,^( *FMS_DB_USER:).*,\\1 '$UNIX_USER'," \ + -e "s,^( *BASE_URL:).*,\\1 'http://$HOST'," \ + -e "s,^( *EMAIL_DOMAIN:).*,\\1 '$HOST'," \ + -e "s,^( *CONTACT_EMAIL:).*,\\1 'help@$HOST'," \ + -e "s,^( *DO_NOT_REPLY_EMAIL:).*,\\1 'help@$HOST'," \ + conf/general.yml-example > conf/general.yml + echo $DONE_MSG +fi # Create the database if it doesn't exist: +echo -n "Setting up database... " if ! psql -l | egrep "^ *$DB_NAME *\|" > /dev/null then createdb --owner "$UNIX_USER" "$DB_NAME" @@ -107,16 +122,21 @@ then psql -U "$UNIX_USER" "$DB_NAME" < "$REPOSITORY"/db/schema.sql psql -U "$UNIX_USER" "$DB_NAME" < "$REPOSITORY"/db/alert_types.sql psql -U "$UNIX_USER" "$DB_NAME" < "$REPOSITORY"/db/generate_secret.sql +else + bin/cron-wrapper update-schema --commit fi +echo $DONE_MSG -# Install the required Perl modules - this may take a very long time: - +echo "Installing required Perl modules - this may take some time" cd "$REPOSITORY" bin/install_perl_modules +echo $DONE_MSG # Generate po and mo files (these invocations taken from Kagee's script): - +echo "Creating locale .mo files" bin/cron-wrapper bin/make_po FixMyStreet-EmptyHomes bin/cron-wrapper bin/make_emptyhomes_welsh_po - commonlib/bin/gettext-makemo FixMyStreet +echo $DONE_MSG + +bin/cron-wrapper update-all-reports diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh index d3da12104..54d1c7154 100644 --- a/bin/site-specific-install.sh +++ b/bin/site-specific-install.sh @@ -1,7 +1,7 @@ #!/bin/sh # Set this to the version we want to check out -VERSION=${VERSION_OVERRIDE:-v1.2.4} +VERSION=${VERSION_OVERRIDE:-v1.2.5} PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh @@ -25,25 +25,33 @@ misuse() { [ -z "$HOST" ] && misuse HOST [ -z "$DISTRIBUTION" ] && misuse DISTRIBUTION [ -z "$VERSION" ] && misuse VERSION +[ -z "$DEVELOPMENT_INSTALL" ] && misuse DEVELOPMENT_INSTALL -install_nginx +add_locale cy_GB +add_locale nb_NO +add_locale de_CH install_postfix -# Check out the current released version -su -l -c "cd '$REPOSITORY' && git checkout '$VERSION'" "$UNIX_USER" +if [ ! "$DEVELOPMENT_INSTALL" = true ]; then + install_nginx + add_website_to_nginx + # Check out the current released version + su -l -c "cd '$REPOSITORY' && git checkout '$VERSION' && git submodule update" "$UNIX_USER" +fi install_website_packages su -l -c "touch '$DIRECTORY/admin-htpasswd'" "$UNIX_USER" -add_website_to_nginx - add_postgresql_user -su -l -c "$REPOSITORY/bin/install-as-user '$UNIX_USER' '$HOST' '$DIRECTORY'" "$UNIX_USER" +export DEVELOPMENT_INSTALL +su -c "$REPOSITORY/bin/install-as-user '$UNIX_USER' '$HOST' '$DIRECTORY'" "$UNIX_USER" -install_sysvinit_script +if [ ! "$DEVELOPMENT_INSTALL" = true ]; then + install_sysvinit_script +fi if [ $DEFAULT_SERVER = true ] && [ x != x$EC2_HOSTNAME ] then diff --git a/bin/update-schema b/bin/update-schema index 81c9ff4ab..92868e1b6 100644..100755 --- a/bin/update-schema +++ b/bin/update-schema @@ -19,13 +19,14 @@ use mySociety::DBHandle qw(dbh); use mySociety::MaPit; mySociety::Config::set_file("$FindBin::Bin/../conf/general"); -mySociety::DBHandle::configure( +my %args = ( 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) ); +$args{Host} = mySociety::Config::get('FMS_DB_HOST', undef) if mySociety::Config::get('FMS_DB_HOST'); +$args{Port} = mySociety::Config::get('FMS_DB_PORT', undef) if mySociety::Config::get('FMS_DB_PORT'); +mySociety::DBHandle::configure( %args ); my $commit = 0; $commit = 1 if @ARGV && $ARGV[0] eq '--commit'; diff --git a/conf/Vagrantfile.example b/conf/Vagrantfile.example new file mode 100755 index 000000000..fbc647746 --- /dev/null +++ b/conf/Vagrantfile.example @@ -0,0 +1,90 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +BOX_NAME = ENV['BOX_NAME'] || "precise64" +BOX_URI = ENV['BOX_URI'] || "http://files.vagrantup.com/precise64.box" + +# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! +VAGRANTFILE_API_VERSION = "2" + +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| + # All Vagrant configuration is done here. The most common configuration + # options are documented and commented below. For a complete reference, + # please see the online documentation at vagrantup.com. + + # Every Vagrant virtual environment requires a box to build off of. + config.vm.box = BOX_NAME + + # The url from where the 'config.vm.box' box will be fetched if it + # doesn't already exist on the user's system. + config.vm.box_url = BOX_URI + + # Create a forwarded port mapping which allows access to a specific port + # within the machine from a port on the host machine. In the example below, + # accessing "localhost:8080" will access port 80 on the guest machine. + config.vm.network :forwarded_port, guest: 3000, host: 3000 + + config.vm.provider "virtualbox" do |v| + v.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/vagrant", "1"] + end + + config.vm.provision :shell, :inline => <<-EOS + # To prevent "dpkg-preconfigure: unable to re-open stdin: No such file or directory" warnings + export DEBIAN_FRONTEND=noninteractive + # To be in the shared directory where the repository might already be + cd /vagrant/ + # We need curl to fetch the install script + apt-get update -qq + apt-get install -qq -y curl >/dev/null + curl -s https://raw.github.com/mysociety/commonlib/master/bin/install-site.sh | \ + sh -s -- --dev fixmystreet vagrant 127.0.0.1.xip.io + # Assume a developer will want to run the tests. + # TODO The tests should be further altered to work regardless of + # configuration file settings + sed -i -r \ + -e "s,(MAPIT_URL:) '',\\1 'http://mapit.mysociety.org/'," \ + -e "s, - cobrand_one, - barnet\\n - bromley\\n - emptyhomes\\n - fiksgatami\\n - fixmybarangay\\n - lichfielddc\\n - reading\\n - seesomething\\n - southampton\\n - zurich," \ + -e "s, - cobrand_two: 'hostname_substring2', - fixmystreet: '.'," \ + fixmystreet/conf/general.yml + # All done + echo "****************" + echo "You can now ssh into your vagrant box: vagrant ssh" + echo "The website code is found in: ~/fixmystreet" + echo "You can run the dev server with: bin/cron-wrapper script/fixmystreet_app_server.pl [-d] [-r] [--fork]" + EOS + + # Create a private network, which allows host-only access to the machine + # using a specific IP. + # config.vm.network :private_network, ip: "192.168.33.10" + + # Create a public network, which generally matched to bridged network. + # Bridged networks make the machine appear as another physical device on + # your network. + # config.vm.network :public_network + + # If true, then any SSH connections made will enable agent forwarding. + # Default value: false + # config.ssh.forward_agent = true + + # Share an additional folder to the guest VM. The first argument is + # the path on the host to the actual folder. The second argument is + # the path on the guest to mount the folder. And the optional third + # argument is a set of non-required options. + # config.vm.synced_folder "../data", "/vagrant_data" + + # Provider-specific configuration so you can fine-tune various + # backing providers for Vagrant. These expose provider-specific options. + # Example for VirtualBox: + # + # config.vm.provider :virtualbox do |vb| + # # Don't boot with headless mode + # vb.gui = true + # + # # Use VBoxManage to customize the VM. For example to change memory: + # vb.customize ["modifyvm", :id, "--memory", "1024"] + # end + # + # View the documentation for the provider you're using for more + # information on available options. + +end diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index f629176d4..eb8d7cc8c 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-09-05 17:39+0100\n" +"POT-Creation-Date: 2013-09-13 13:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:636 perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 msgid " and " msgstr "" @@ -29,27 +29,27 @@ msgstr "" msgid " or " msgstr "" -#: templates/web/default/admin/bodies.html:36 +#: templates/web/default/admin/bodies.html:47 msgid "%d addresses" msgstr "" -#: templates/web/default/admin/index.html:17 +#: templates/web/default/admin/index.html:25 msgid "%d confirmed alerts, %d unconfirmed" msgstr "" -#: templates/web/default/admin/index.html:19 templates/web/zurich/admin/index.html:6 +#: templates/web/default/admin/index.html:27 templates/web/zurich/admin/index.html:6 msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "" -#: templates/web/default/admin/edit-league.html:5 +#: templates/web/default/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "" -#: templates/web/default/admin/index.html:16 +#: templates/web/default/admin/index.html:24 msgid "%d live updates" msgstr "" -#: templates/web/default/admin/index.html:18 +#: templates/web/default/admin/index.html:26 msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "" @@ -61,7 +61,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:685 +#: perllib/FixMyStreet/DB/Result/Problem.pm:646 msgid "%s ref: %s" msgstr "" @@ -69,7 +69,7 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:533 msgid "%s, reported at %s" msgstr "" @@ -89,7 +89,7 @@ msgstr "" msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" msgstr "" -#: templates/web/default/admin/report_blocks.html:11 templates/web/default/admin/users.html:26 +#: templates/web/default/admin/report_blocks.html:11 templates/web/default/admin/users.html:29 msgid "(Email in abuse table)" msgstr "" @@ -133,11 +133,11 @@ msgstr "" msgid "(we never show your email)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 perllib/FixMyStreet/App/Controller/Report/New.pm:664 perllib/FixMyStreet/DB/Result/Problem.pm:418 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 perllib/FixMyStreet/App/Controller/Report/New.pm:664 perllib/FixMyStreet/DB/Result/Problem.pm:379 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 perllib/FixMyStreet/DB/Result/Problem.pm:424 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 perllib/FixMyStreet/DB/Result/Problem.pm:385 msgid "-- Pick a property type --" msgstr "" @@ -145,6 +145,13 @@ msgstr "" msgid "<big>%s</big> reports" msgstr "" +#: templates/web/default/admin/body-form.html:42 templates/web/default/admin/body-form.html:43 +msgid "" +"<code>MAPIT_URL</code> is set (<code>%s</code>) but no <code>MAPIT_TYPES</code>.<br>\n" +" This is probably why \"area covered\" is empty (below).<br>\n" +" Maybe add some <code>MAPIT_TYPES</code> to your config file?" +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 "" @@ -213,7 +220,7 @@ msgstr "" msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" msgstr "" -#: templates/web/default/admin/index.html:14 templates/web/zurich/admin/index.html:4 +#: templates/web/default/admin/index.html:22 templates/web/zurich/admin/index.html:4 msgid "<strong>%d</strong> live problems" msgstr "" @@ -253,15 +260,26 @@ msgstr "" msgid "Action Scheduled" msgstr "" -#: templates/web/default/admin/bodies.html:53 templates/web/default/admin/bodies.html:57 templates/web/default/admin/body-form.html:82 templates/web/zurich/admin/body-form.html:47 +#: templates/web/default/admin/body-form.html:3 templates/web/default/admin/body-form.html:4 +msgid "" +"Add a <strong>body</strong> for each administrative body, such as a council or department\n" +" to which problem reports can be sent. You can add one or more contacts (for different\n" +" categories of problem) to each body." +msgstr "" + +#: templates/web/default/admin/body.html:35 +msgid "Add a contact using the form below." +msgstr "" + +#: templates/web/default/admin/bodies.html:65 templates/web/default/admin/bodies.html:69 templates/web/default/admin/body-form.html:211 templates/web/zurich/admin/body-form.html:50 msgid "Add body" msgstr "" -#: templates/web/default/admin/body.html:69 templates/web/zurich/admin/body.html:30 +#: templates/web/default/admin/body.html:78 templates/web/zurich/admin/body.html:30 msgid "Add new category" msgstr "" -#: templates/web/default/admin/users.html:36 +#: templates/web/default/admin/users.html:45 msgid "Add user" msgstr "" @@ -337,23 +355,23 @@ msgstr "" msgid "Are you from a council?" msgstr "" -#: templates/web/default/admin/body-form.html:19 templates/web/zurich/admin/body-form.html:25 +#: templates/web/default/admin/body-form.html:59 templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:124 templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/report_edit.html:144 templates/web/zurich/admin/stats.html:36 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:133 +#: templates/web/zurich/admin/report_edit.html:153 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:113 templates/web/zurich/admin/report_edit.html:170 +#: templates/web/zurich/admin/report_edit.html:133 templates/web/zurich/admin/report_edit.html:190 msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:100 templates/web/zurich/report/updates.html:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -365,11 +383,11 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 templates/web/zurich/report/_item.html:11 +#: perllib/FixMyStreet/DB/Result/Problem.pm:334 templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" -#: templates/web/default/js/translation_strings.html:26 +#: templates/web/default/js/translation_strings.html:29 msgid "Back" msgstr "" @@ -381,15 +399,15 @@ 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:1144 perllib/FixMyStreet/Cobrand/Zurich.pm:208 templates/web/default/admin/bodies.html:1 templates/web/zurich/header.html:64 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1160 perllib/FixMyStreet/Cobrand/Zurich.pm:249 templates/web/default/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" -#: templates/web/default/admin/flagged.html:12 templates/web/default/admin/reports.html:14 templates/web/default/admin/users.html:14 +#: templates/web/default/admin/flagged.html:17 templates/web/default/admin/reports.html:14 templates/web/default/admin/users.html:17 msgid "Body" msgstr "" -#: templates/web/default/admin/user-form.html:7 +#: templates/web/default/admin/user-form.html:28 msgid "Body:" msgstr "" @@ -405,19 +423,19 @@ 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/index.html:36 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 +#: templates/web/bromley/report/new/fill_in_details_form.html:68 templates/web/default/admin/bodies.html:21 templates/web/default/admin/body.html:43 templates/web/default/admin/index.html:44 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 "" -#: templates/web/default/admin/index.html:34 +#: templates/web/default/admin/index.html:42 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:61 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:123 +#: templates/web/default/admin/body.html:99 templates/web/default/admin/body_edit.html:23 templates/web/default/admin/report_edit.html:61 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:45 templates/web/zurich/admin/report_edit.html:143 msgid "Category:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 msgid "Category: %s" msgstr "" @@ -425,15 +443,44 @@ msgstr "" msgid "Change Password" msgstr "" -#: templates/web/default/js/translation_strings.html:41 templates/web/fixmystreet/around/_report_banner.html:2 +#: templates/web/default/admin/body.html:121 +msgid "" +"Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" +" If you are not sure of the origin or validity of the contact, leave this unchecked." +msgstr "" + +#: templates/web/default/admin/body.html:132 +msgid "" +"Check <strong>deleted</strong> to remove the category from use. \n" +" It will not appear as an available category in the drop-down menu on the report-a-problem page." +msgstr "" + +#: templates/web/default/admin/body.html:152 +msgid "" +"Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" +" <br>\n" +" Normally, categories are not private.\n" +" <br>\n" +" This is suitable for issues that you want to allow users to report to the body, but for which there is no public\n" +" interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin\n" +" at a specific address." +msgstr "" + +#: templates/web/default/admin/body.html:91 +msgid "" +"Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" +" to the body too. These will appear in the drop-down menu on the report-a-problem page." +msgstr "" + +#: templates/web/default/js/translation_strings.html:44 templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:77 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:45 templates/web/default/admin/report_edit.html:47 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:96 templates/web/zurich/admin/report_edit.html:98 templates/web/zurich/admin/stats.html:31 templates/web/zurich/report/banner.html:13 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:118 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:45 templates/web/default/admin/report_edit.html:47 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:100 templates/web/zurich/admin/report_edit.html:98 templates/web/zurich/admin/stats.html:31 templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:778 +#: perllib/FixMyStreet/DB/Result/Problem.pm:739 msgid "Closed by council" msgstr "" @@ -449,7 +496,7 @@ msgstr "" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" -#: templates/web/default/admin/report_edit.html:23 templates/web/zurich/admin/report_edit-sdm.html:33 templates/web/zurich/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:23 templates/web/zurich/admin/report_edit-sdm.html:36 templates/web/zurich/admin/report_edit.html:49 msgid "Co-ordinates:" msgstr "" @@ -465,7 +512,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:407 +#: perllib/FixMyStreet/App/Controller/Admin.pm:409 msgid "Configuration updated - contacts will be generated automatically later" msgstr "" @@ -473,7 +520,7 @@ msgstr "" msgid "Configure Endpoint" msgstr "" -#: templates/web/default/admin/body.html:44 +#: templates/web/default/admin/body.html:52 msgid "Confirm" msgstr "" @@ -489,7 +536,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/zurich/admin/stats.html:40 +#: templates/web/default/admin/body.html:127 templates/web/default/admin/body.html:45 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 "" @@ -517,11 +564,11 @@ msgstr "" msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 perllib/FixMyStreet/App/Controller/Admin.pm:1305 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1293 perllib/FixMyStreet/App/Controller/Admin.pm:1321 msgid "Could not find user" msgstr "" -#: templates/web/default/js/translation_strings.html:31 +#: templates/web/default/js/translation_strings.html:34 msgid "Could not look up location" msgstr "" @@ -545,7 +592,7 @@ msgstr "" msgid "Create a report" msgstr "" -#: templates/web/default/admin/body.html:103 templates/web/zurich/admin/body.html:53 +#: templates/web/default/admin/body.html:169 templates/web/zurich/admin/body.html:53 msgid "Create category" msgstr "" @@ -553,7 +600,7 @@ msgstr "" msgid "Created" msgstr "" -#: templates/web/default/admin/report_edit.html:69 templates/web/default/admin/update_edit.html:51 templates/web/zurich/admin/report_edit-sdm.html:47 templates/web/zurich/admin/report_edit.html:62 templates/web/zurich/admin/update_edit.html:29 +#: templates/web/default/admin/report_edit.html:69 templates/web/default/admin/update_edit.html:51 templates/web/zurich/admin/report_edit-sdm.html:50 templates/web/zurich/admin/report_edit.html:64 templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -561,6 +608,10 @@ msgstr "" msgid "Current state" msgstr "" +#: templates/web/default/admin/bodies.html:7 templates/web/default/admin/index.html:5 +msgid "Currently no bodies have been created." +msgstr "" + #: templates/web/default/dashboard/index.html:5 templates/web/default/dashboard/index.html:7 msgid "Dashboard" msgstr "" @@ -569,7 +620,7 @@ msgstr "" 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 +#: templates/web/default/admin/bodies.html:19 templates/web/default/admin/body.html:138 templates/web/default/admin/body.html:46 templates/web/default/admin/body_edit.html:37 templates/web/default/admin/body_edit.html:85 msgid "Deleted" msgstr "" @@ -577,19 +628,19 @@ msgstr "" msgid "Description" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:54 templates/web/default/js/translation_strings.html:28 templates/web/fixmystreet/report/new/fill_in_details_form.html:66 templates/web/seesomething/report/new/fill_in_details_form.html:16 templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/bromley/report/new/fill_in_details_form.html:54 templates/web/default/js/translation_strings.html:31 templates/web/fixmystreet/report/new/fill_in_details_form.html:66 templates/web/seesomething/report/new/fill_in_details_form.html:16 templates/web/zurich/report/new/fill_in_details_form.html:42 msgid "Details" msgstr "" -#: templates/web/default/admin/report_edit.html:20 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:26 templates/web/zurich/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:20 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:28 templates/web/zurich/admin/report_edit.html:28 templates/web/zurich/admin/report_edit.html:38 msgid "Details:" msgstr "" -#: templates/web/default/admin/body.html:39 +#: templates/web/default/admin/body.html:47 msgid "Devolved" msgstr "" -#: templates/web/default/admin/edit-league.html:1 +#: templates/web/default/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "" @@ -609,11 +660,19 @@ msgstr "" msgid "Duplicate" msgstr "" -#: templates/web/default/admin/list_updates.html:42 templates/web/default/admin/problem_row.html:41 templates/web/default/admin/users.html:28 templates/web/zurich/admin/problem_row.html:44 +#: templates/web/default/admin/body.html:80 +msgid "" +"Each contact for the body has a category, which is displayed to the public. \n" +" Different categories <strong>can have the same contact</strong> (email address).\n" +" This means you can add many categories even if you only have one contact for the body.\n" +" " +msgstr "" + +#: templates/web/default/admin/list_updates.html:42 templates/web/default/admin/problem_row.html:41 templates/web/default/admin/users.html:31 templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "" -#: templates/web/default/admin/body.html:112 templates/web/zurich/admin/body.html:64 +#: templates/web/default/admin/body.html:178 templates/web/zurich/admin/body.html:64 msgid "Edit body details" msgstr "" @@ -633,15 +692,19 @@ 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:29 templates/web/default/admin/list_updates.html:9 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 +#: templates/web/bromley/report/display.html:128 templates/web/default/admin/bodies.html:18 templates/web/default/admin/body.html:44 templates/web/default/admin/body_edit.html:83 templates/web/default/admin/flagged.html:38 templates/web/default/admin/list_updates.html:9 templates/web/default/admin/users.html:16 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:1253 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1269 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1250 +#: templates/web/default/admin/body.html:116 +msgid "Email address:" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1266 msgid "Email already in abuse list" msgstr "" @@ -653,11 +716,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:67 templates/web/default/admin/update_edit.html:33 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:58 +#: templates/web/default/admin/body_edit.html:26 templates/web/default/admin/report_edit.html:67 templates/web/default/admin/update_edit.html:33 templates/web/default/admin/user-form.html:16 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:47 templates/web/zurich/admin/report_edit.html:60 msgid "Email:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:318 msgid "Email: %s" msgstr "" @@ -685,6 +748,21 @@ msgstr "" msgid "Empty public building - school, hospital, etc." msgstr "" +#: templates/web/default/admin/body-form.html:139 templates/web/default/admin/body-form.html:140 +msgid "" +"Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n" +" updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" +" For more information, see \n" +" <a href='http://www.mysociety.org/2013/02/20/open311-extended/'>this article</a>." +msgstr "" + +#: templates/web/default/admin/body-form.html:196 templates/web/default/admin/body-form.html:197 +msgid "" +"Enable this <strong>can be devolved</strong> setting if one or more contacts have a \n" +" different endpoint (and send method) from the body's. For example, if reports for some categories of\n" +" problem must be emailed, while others can be sent over Open311." +msgstr "" + #: templates/web/default/admin/stats.html:70 msgid "End Year:" msgstr "" @@ -697,11 +775,11 @@ msgstr "" msgid "End month:" msgstr "" -#: templates/web/default/admin/body-form.html:40 +#: templates/web/default/admin/body-form.html:107 msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:30 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:71 msgid "Enter a Zürich street name" msgstr "" @@ -794,7 +872,7 @@ 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:35 templates/web/default/admin/report_edit.html:41 templates/web/default/admin/report_edit.html:42 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:44 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:41 templates/web/default/admin/report_edit.html:42 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 "" @@ -814,15 +892,31 @@ msgstr "" msgid "Fixed:" msgstr "" +#: templates/web/zurich/admin/body-form.html:35 +msgid "Flag as deleted" +msgstr "" + #: templates/web/default/admin/report_blocks.html:16 msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1149 templates/web/default/admin/users.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1165 templates/web/default/admin/users.html:19 msgid "Flagged" msgstr "" -#: templates/web/default/admin/report_edit.html:78 templates/web/default/admin/user-form.html:14 +#: templates/web/default/admin/flagged.html:1 +msgid "Flagged reports and users" +msgstr "" + +#: templates/web/default/admin/user-form.html:41 +msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." +msgstr "" + +#: templates/web/default/admin/flagged.html:31 +msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." +msgstr "" + +#: templates/web/default/admin/report_edit.html:78 templates/web/default/admin/user-form.html:47 msgid "Flagged:" msgstr "" @@ -870,7 +964,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: templates/web/default/admin/index.html:24 +#: templates/web/default/admin/index.html:32 msgid "Graph of problem creation by status over time" msgstr "" @@ -898,7 +992,7 @@ msgstr "" msgid "Hi %s" msgstr "" -#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:50 templates/web/default/admin/report_edit.html:51 templates/web/default/admin/update_edit.html:28 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/report_edit.html:87 templates/web/zurich/admin/report_edit.html:91 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:50 templates/web/default/admin/report_edit.html:51 templates/web/default/admin/update_edit.html:28 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/report_edit.html:89 templates/web/zurich/admin/report_edit.html:93 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" @@ -914,7 +1008,7 @@ msgstr "" msgid "History" msgstr "" -#: templates/web/default/js/translation_strings.html:25 +#: templates/web/default/js/translation_strings.html:28 msgid "Home" msgstr "" @@ -922,11 +1016,11 @@ msgstr "" msgid "How to report a problem" msgstr "" -#: templates/web/default/js/translation_strings.html:27 +#: templates/web/default/js/translation_strings.html:30 msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -942,10 +1036,22 @@ 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: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 +#: templates/web/default/admin/flagged.html:14 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 "" +#: templates/web/default/admin/body-form.html:24 templates/web/default/admin/body-form.html:25 +msgid "" +"Identify a <strong>parent</strong> if this body is itself part of another body.\n" +" For basic installations, you don't need to join bodies in this way." +msgstr "" + +#: templates/web/default/admin/body.html:94 +msgid "" +"If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" +" the menu. Make sure you use the same category name in the bodies if you want this to happen." +msgstr "" + #: templates/web/default/email_sent.html:19 msgid "If you do not, your alert will not be activated." msgstr "" @@ -977,6 +1083,30 @@ msgid "" "your experience of getting the problem fixed?" msgstr "" +#: templates/web/default/admin/body.html:110 +msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." +msgstr "" + +#: templates/web/default/admin/body-form.html:181 templates/web/default/admin/body-form.html:182 +msgid "" +"If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" +" its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" +" Check that your cobrand supports this feature before switching it on." +msgstr "" + +#: templates/web/default/admin/body-form.html:168 templates/web/default/admin/body-form.html:169 +msgid "" +"If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" +" if you do <strong>not</strong> want that user to be notified whenever these updates are created." +msgstr "" + +#: templates/web/default/admin/body-form.html:154 templates/web/default/admin/body-form.html:155 +msgid "" +"If you've enabled Open311 update-sending above, you must identify which \n" +" FixMyStreet <strong>user</strong> will be attributed as the creator of those updates\n" +" when they are shown on the site. Enter the ID (number) of that user." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:111 msgid "Illegal ID" msgstr "" @@ -989,11 +1119,15 @@ msgstr "" msgid "In Progress" msgstr "" +#: templates/web/default/admin/flagged.html:39 +msgid "In abuse table?" +msgstr "" + #: templates/web/default/open311/index.html:90 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:80 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:38 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:100 templates/web/zurich/report/banner.html:15 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:121 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:38 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:102 templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" @@ -1001,7 +1135,7 @@ msgstr "" msgid "Incident Category" msgstr "" -#: templates/web/zurich/admin/report_edit.html:143 +#: templates/web/zurich/admin/report_edit.html:163 msgid "Include reporter personal details" msgstr "" @@ -1013,10 +1147,6 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:55 templates/web/zurich/admin/report_edit.html:82 -msgid "Internal notes:" -msgstr "" - #: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:48 msgid "Internal referral" msgstr "" @@ -1025,7 +1155,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1064 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1080 msgid "Invalid end date" msgstr "" @@ -1033,7 +1163,7 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1054 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1070 msgid "Invalid start date" msgstr "" @@ -1053,7 +1183,7 @@ msgstr "" msgid "Last Name" msgstr "" -#: templates/web/default/admin/body.html:40 templates/web/zurich/admin/body.html:15 +#: templates/web/default/admin/body.html:48 templates/web/zurich/admin/body.html:15 msgid "Last editor" msgstr "" @@ -1089,7 +1219,7 @@ msgstr "" msgid "Locate the problem on a map of the area" msgstr "" -#: templates/web/default/js/translation_strings.html:37 +#: templates/web/default/js/translation_strings.html:40 msgid "MAP" msgstr "" @@ -1097,6 +1227,10 @@ msgstr "" msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "" +#: templates/web/default/admin/user-form.html:39 +msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." +msgstr "" + #: templates/web/fixmystreet/contact/index.html:98 msgid "Message" msgstr "" @@ -1121,7 +1255,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:28 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:9 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 +#: templates/web/default/admin/bodies.html:16 templates/web/default/admin/body-form.html:18 templates/web/default/admin/flagged.html:16 templates/web/default/admin/flagged.html:37 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/reports.html:13 templates/web/default/admin/users.html:15 templates/web/default/reports/index.html:15 templates/web/emptyhomes/reports/index.html:9 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 "" @@ -1129,11 +1263,11 @@ msgstr "" msgid "Name (optional)" msgstr "" -#: templates/web/default/admin/report_edit.html:66 templates/web/default/admin/update_edit.html:32 templates/web/default/admin/user-form.html:5 templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:57 templates/web/zurich/admin/stats.html:41 +#: templates/web/default/admin/report_edit.html:66 templates/web/default/admin/update_edit.html:32 templates/web/default/admin/user-form.html:14 templates/web/zurich/admin/report_edit-sdm.html:46 templates/web/zurich/admin/report_edit.html:59 templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:317 msgid "Name: %s" msgstr "" @@ -1167,14 +1301,18 @@ msgstr "" msgid "New <br>problems" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:250 +#: perllib/FixMyStreet/App/Controller/Admin.pm:252 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:364 msgid "New category contact added" msgstr "" +#: templates/web/zurich/admin/report_edit-sdm.html:58 templates/web/zurich/admin/report_edit.html:84 +msgid "New internal note:" +msgstr "" + #: db/alert_types.pl:18 db/alert_types.pl:22 msgid "New local problems on FixMyStreet" msgstr "" @@ -1235,7 +1373,7 @@ msgstr "" msgid "New state" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:58 +#: templates/web/zurich/admin/report_edit-sdm.html:61 msgid "New update:" msgstr "" @@ -1247,11 +1385,11 @@ msgstr "" 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:37 templates/web/default/admin/list_updates.html:38 templates/web/default/admin/list_updates.html:39 templates/web/default/admin/problem_row.html:20 templates/web/default/admin/report_edit.html:64 templates/web/default/admin/report_edit.html:77 templates/web/default/admin/update_edit.html:25 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/admin/body.html:58 templates/web/default/admin/body.html:59 templates/web/default/admin/body.html:60 templates/web/default/admin/body_edit.html:4 templates/web/default/admin/list_updates.html:37 templates/web/default/admin/list_updates.html:38 templates/web/default/admin/list_updates.html:39 templates/web/default/admin/problem_row.html:20 templates/web/default/admin/report_edit.html:64 templates/web/default/admin/report_edit.html:77 templates/web/default/admin/update_edit.html:25 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 "" -#: templates/web/default/admin/user-form.html:8 +#: templates/web/default/admin/user-form.html:29 msgid "No body" msgstr "" @@ -1259,23 +1397,23 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:362 msgid "No council selected" msgstr "" -#: templates/web/default/admin/edit-league.html:10 +#: templates/web/default/admin/edit-league.html:17 msgid "No edits have yet been made." msgstr "" -#: templates/web/default/admin/flagged.html:20 -msgid "No flagged problems found" +#: templates/web/default/admin/flagged.html:25 +msgid "No flagged problems found." msgstr "" -#: templates/web/default/admin/flagged.html:41 -msgid "No flagged users found" +#: templates/web/default/admin/flagged.html:58 +msgid "No flagged users found." msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:65 +#: templates/web/zurich/admin/report_edit-sdm.html:68 msgid "No further updates" msgstr "" @@ -1287,7 +1425,7 @@ msgstr "" msgid "No problems have been reported yet." msgstr "" -#: templates/web/default/js/translation_strings.html:32 +#: templates/web/default/js/translation_strings.html:35 msgid "No result returned" msgstr "" @@ -1295,14 +1433,22 @@ msgstr "" msgid "No supporters" msgstr "" -#: templates/web/default/admin/body.html:55 +#: templates/web/default/admin/body.html:63 msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:30 templates/web/zurich/admin/report_edit-sdm.html:46 templates/web/zurich/admin/report_edit.html:61 +#: templates/web/default/admin/report_edit.html:30 templates/web/zurich/admin/report_edit-sdm.html:49 templates/web/zurich/admin/report_edit.html:63 msgid "None" msgstr "" +#: templates/web/default/admin/user-form.html:20 templates/web/default/admin/user-form.html:21 +msgid "" +"Normal (public) users should not be associated with any <strong>body</strong>.<br>\n" +" Authorised staff users can be associated with the body they represent.<br>\n" +" Depending on the implementation, staff users may have access to the dashboard (summary of\n" +" activity across their body), the ability to hide reports or set special report statuses." +msgstr "" + #: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:83 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:46 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:33 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:31 msgid "Not Responsible" msgstr "" @@ -1319,7 +1465,7 @@ msgstr "" msgid "Not reported to council" msgstr "" -#: templates/web/default/admin/body.html:41 templates/web/default/admin/body_edit.html:87 templates/web/zurich/admin/body.html:16 +#: templates/web/default/admin/body.html:49 templates/web/default/admin/body_edit.html:87 templates/web/zurich/admin/body.html:16 msgid "Note" msgstr "" @@ -1327,7 +1473,7 @@ msgstr "" msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" msgstr "" -#: templates/web/default/admin/body.html:92 templates/web/default/admin/body_edit.html:44 templates/web/zurich/admin/body.html:47 +#: templates/web/default/admin/body.html:147 templates/web/default/admin/body_edit.html:44 templates/web/zurich/admin/body.html:47 msgid "Note:" msgstr "" @@ -1351,7 +1497,7 @@ msgstr "" msgid "Now to submit your update… do you have a FixMyStreet password?" msgstr "" -#: templates/web/default/js/translation_strings.html:36 +#: templates/web/default/js/translation_strings.html:39 msgid "OK" msgstr "" @@ -1387,7 +1533,7 @@ msgstr "" msgid "Older problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:74 templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:36 templates/web/default/admin/report_edit.html:37 templates/web/default/admin/update_edit.html:28 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:87 templates/web/zurich/admin/report_edit.html:89 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:115 templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:36 templates/web/default/admin/report_edit.html:37 templates/web/default/admin/update_edit.html:28 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:89 templates/web/zurich/admin/report_edit.html:91 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 msgid "Open" msgstr "" @@ -1415,7 +1561,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:1046 perllib/FixMyStreet/App/Controller/Report/New.pm:664 perllib/FixMyStreet/App/Controller/Report/New.pm:665 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:357 perllib/FixMyStreet/DB/ResultSet/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 perllib/FixMyStreet/App/Controller/Report/New.pm:664 perllib/FixMyStreet/App/Controller/Report/New.pm:665 perllib/FixMyStreet/DB/Result/Problem.pm:539 perllib/FixMyStreet/DB/Result/Problem.pm:549 perllib/FixMyStreet/DB/Result/Problem.pm:559 perllib/FixMyStreet/DB/Result/Problem.pm:571 perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 perllib/FixMyStreet/DB/ResultSet/Problem.pm:374 msgid "Other" msgstr "" @@ -1431,7 +1577,7 @@ msgstr "" msgid "Page Not Found" msgstr "" -#: templates/web/default/admin/body-form.html:9 templates/web/zurich/admin/body-form.html:15 +#: templates/web/default/admin/body-form.html:31 templates/web/zurich/admin/body-form.html:14 msgid "Parent" msgstr "" @@ -1447,19 +1593,23 @@ msgstr "" msgid "Password:" msgstr "" -#: templates/web/default/js/translation_strings.html:39 +#: templates/web/default/js/translation_strings.html:42 msgid "Permalink" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:136 templates/web/bromley/report/new/fill_in_details_form.html:183 templates/web/fixmystreet/report/new/fill_in_details_form.html:138 templates/web/fixmystreet/report/new/fill_in_details_form.html:205 templates/web/seesomething/report/new/fill_in_details_form.html:89 templates/web/zurich/report/new/fill_in_details_form.html:106 +#: templates/web/zurich/report/new/fill_in_details_form.html:106 +msgid "Phone number" +msgstr "" + +#: templates/web/bromley/report/new/fill_in_details_form.html:136 templates/web/bromley/report/new/fill_in_details_form.html:183 templates/web/fixmystreet/report/new/fill_in_details_form.html:138 templates/web/fixmystreet/report/new/fill_in_details_form.html:205 templates/web/seesomething/report/new/fill_in_details_form.html:89 msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:278 templates/web/default/admin/report_edit.html:68 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:61 templates/web/zurich/admin/stats.html:39 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:282 templates/web/default/admin/report_edit.html:68 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:49 templates/web/zurich/admin/report_edit.html:63 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/admin/index-dm.html:29 templates/web/zurich/admin/index-sdm.html:24 templates/web/zurich/admin/stats.html:37 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/index-dm.html:29 templates/web/zurich/admin/index-sdm.html:24 templates/web/zurich/admin/reports.html:16 templates/web/zurich/admin/stats.html:37 templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Photo" msgstr "" @@ -1471,11 +1621,11 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "" -#: templates/web/default/js/translation_strings.html:24 +#: templates/web/default/js/translation_strings.html:27 msgid "Place pin on map" msgstr "" -#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:38 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:87 templates/web/zurich/admin/report_edit.html:90 +#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:38 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:89 templates/web/zurich/admin/report_edit.html:92 msgid "Planned" msgstr "" @@ -1499,11 +1649,11 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 perllib/FixMyStreet/App/Controller/Report/New.pm:855 perllib/FixMyStreet/App/Controller/Report/New.pm:874 perllib/FixMyStreet/App/Controller/Report/New.pm:917 perllib/FixMyStreet/DB/Result/Problem.pm:420 templates/web/default/js/translation_strings.html:9 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 perllib/FixMyStreet/App/Controller/Report/New.pm:855 perllib/FixMyStreet/App/Controller/Report/New.pm:874 perllib/FixMyStreet/App/Controller/Report/New.pm:917 perllib/FixMyStreet/DB/Result/Problem.pm:381 templates/web/default/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:387 msgid "Please choose a property type" msgstr "" @@ -1534,7 +1684,7 @@ msgstr "" msgid "Please do not give address or personal information in this section." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 templates/web/default/js/translation_strings.html:2 +#: perllib/FixMyStreet/DB/Result/Comment.pm:126 templates/web/default/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" @@ -1542,7 +1692,7 @@ msgstr "" msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:395 templates/web/default/js/translation_strings.html:3 +#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:356 templates/web/default/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" @@ -1554,7 +1704,7 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:398 templates/web/default/js/translation_strings.html:4 templates/web/seesomething/js/translation_strings.html:2 +#: perllib/FixMyStreet/DB/Result/Problem.pm:359 templates/web/default/js/translation_strings.html:4 templates/web/seesomething/js/translation_strings.html:2 msgid "Please enter some details" msgstr "" @@ -1566,23 +1716,27 @@ msgstr "" msgid "Please enter your email address" msgstr "" -#: templates/web/default/js/translation_strings.html:19 +#: templates/web/default/js/translation_strings.html:22 msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 templates/web/default/js/translation_strings.html:7 templates/web/seesomething/js/translation_strings.html:4 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 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:142 perllib/FixMyStreet/DB/Result/Problem.pm:406 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:123 perllib/FixMyStreet/DB/Result/Problem.pm:367 perllib/FixMyStreet/DB/Result/User.pm:108 templates/web/default/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" -#: templates/web/default/js/translation_strings.html:20 +#: templates/web/default/js/translation_strings.html:19 +msgid "Please enter your phone number" +msgstr "" + +#: templates/web/default/js/translation_strings.html:23 msgid "Please enter your second name" msgstr "" -#: templates/web/default/js/translation_strings.html:18 +#: templates/web/default/js/translation_strings.html:21 msgid "Please enter your title" msgstr "" @@ -1679,11 +1833,11 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:174 +#: perllib/FixMyStreet/App/Controller/Photo.pm:176 msgid "Please upload a JPEG image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:181 +#: perllib/FixMyStreet/App/Controller/Photo.pm:183 msgid "Please upload a JPEG image only\n" msgstr "" @@ -1715,7 +1869,7 @@ msgstr "" 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:79 +#: templates/web/default/admin/body.html:163 templates/web/default/admin/body_edit.html:40 templates/web/default/admin/report_edit.html:79 msgid "Private" msgstr "" @@ -1739,11 +1893,11 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/default/admin/index.html:28 templates/web/zurich/admin/index.html:9 +#: templates/web/default/admin/index.html:36 templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:929 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 msgid "Problem marked as open." msgstr "" @@ -1751,7 +1905,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: templates/web/default/admin/flagged.html:5 +#: templates/web/default/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -1823,7 +1977,7 @@ msgstr "" msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/default/admin/body.html:42 templates/web/default/admin/body.html:55 +#: templates/web/default/admin/body.html:50 templates/web/default/admin/body.html:63 msgid "Public" msgstr "" @@ -1831,15 +1985,15 @@ msgstr "" msgid "Public information (shown on site)" msgstr "" -#: templates/web/zurich/admin/report_edit.html:178 templates/web/zurich/admin/report_edit.html:194 +#: templates/web/zurich/admin/report_edit.html:198 templates/web/zurich/admin/report_edit.html:214 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:78 templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/report_edit.html:80 templates/web/zurich/admin/stats.html:38 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:202 +#: templates/web/zurich/admin/report_edit.html:222 msgid "Publish the response" msgstr "" @@ -1971,7 +2125,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:58 +#: perllib/FixMyStreet/DB/Result/Problem.pm:554 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "" @@ -1979,23 +2133,23 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:546 msgid "Reported by %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 templates/web/default/contact/index.html:47 templates/web/fixmystreet/contact/index.html:60 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 templates/web/default/contact/index.html:47 templates/web/fixmystreet/contact/index.html:60 msgid "Reported by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported by %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:542 msgid "Reported by %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 msgid "Reported by %s in the %s category by %s at %s" msgstr "" @@ -2003,23 +2157,23 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:550 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported in the %s category by %s at %s" msgstr "" -#: templates/web/default/around/around_index.html:1 templates/web/default/js/translation_strings.html:35 templates/web/default/report/new/fill_in_details.html:0 templates/web/default/report/new/fill_in_details.html:3 templates/web/default/report/new/fill_in_details_form.html:1 templates/web/emptyhomes/report/new/fill_in_details_form.html:1 templates/web/fixmystreet/around/around_index.html:2 templates/web/fixmystreet/report/new/fill_in_details.html:0 templates/web/fixmystreet/report/new/fill_in_details.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:2 templates/web/seesomething/around/around_index.html:1 templates/web/seesomething/report/new/fill_in_details_form.html:3 templates/web/zurich/report/new/fill_in_details_form.html:2 +#: templates/web/default/around/around_index.html:1 templates/web/default/js/translation_strings.html:38 templates/web/default/report/new/fill_in_details.html:0 templates/web/default/report/new/fill_in_details.html:3 templates/web/default/report/new/fill_in_details_form.html:1 templates/web/emptyhomes/report/new/fill_in_details_form.html:1 templates/web/fixmystreet/around/around_index.html:2 templates/web/fixmystreet/report/new/fill_in_details.html:0 templates/web/fixmystreet/report/new/fill_in_details.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:2 templates/web/seesomething/around/around_index.html:1 templates/web/seesomething/report/new/fill_in_details_form.html:3 templates/web/zurich/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1145 perllib/FixMyStreet/Cobrand/Zurich.pm:201 templates/web/seesomething/admin/stats.html:1 templates/web/zurich/header.html:60 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1161 perllib/FixMyStreet/Cobrand/Zurich.pm:242 templates/web/seesomething/admin/stats.html:1 templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:432 +#: perllib/FixMyStreet/DB/Result/Problem.pm:393 msgid "Reports are limited to 2000 characters in length. Please shorten your report" msgstr "" @@ -2039,7 +2193,7 @@ msgstr "" msgid "Resend report" msgstr "" -#: templates/web/default/js/translation_strings.html:22 +#: templates/web/default/js/translation_strings.html:25 msgid "Right place?" msgstr "" @@ -2051,11 +2205,11 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 perllib/FixMyStreet/App/Controller/Admin.pm:1355 templates/web/default/admin/report_edit.html:85 templates/web/zurich/admin/report_edit.html:74 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1360 perllib/FixMyStreet/App/Controller/Admin.pm:1371 templates/web/default/admin/report_edit.html:85 templates/web/zurich/admin/report_edit.html:76 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1344 templates/web/default/admin/report_edit.html:86 templates/web/zurich/admin/report_edit.html:75 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1360 templates/web/default/admin/report_edit.html:86 templates/web/zurich/admin/report_edit.html:77 msgid "Rotate Right" msgstr "" @@ -2063,7 +2217,7 @@ msgstr "" msgid "Save changes" msgstr "" -#: templates/web/default/admin/flagged.html:1 templates/web/default/admin/reports.html:1 templates/web/zurich/admin/reports.html:1 +#: templates/web/default/admin/reports.html:1 templates/web/zurich/admin/reports.html:1 msgid "Search Reports" msgstr "" @@ -2075,15 +2229,23 @@ msgstr "" msgid "Search reports" msgstr "" -#: templates/web/default/admin/reports.html:5 templates/web/default/admin/users.html:5 templates/web/zurich/admin/reports.html:5 +#: templates/web/default/admin/reports.html:5 templates/web/default/admin/users.html:8 templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "" -#: templates/web/default/admin/body-form.html:11 templates/web/zurich/admin/body-form.html:17 +#: templates/web/default/admin/reports.html:26 +msgid "Searching found no reports." +msgstr "" + +#: templates/web/default/admin/users.html:39 +msgid "Searching found no users." +msgstr "" + +#: templates/web/default/admin/body-form.html:33 templates/web/zurich/admin/body-form.html:16 msgid "Select a body" msgstr "" -#: templates/web/default/admin/body-form.html:21 templates/web/zurich/admin/body-form.html:27 +#: templates/web/default/admin/body-form.html:61 templates/web/zurich/admin/body-form.html:26 msgid "Select an area" msgstr "" @@ -2091,7 +2253,7 @@ 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:698 +#: perllib/FixMyStreet/DB/Result/Problem.pm:659 msgid "Sent to %s %s later" msgstr "" @@ -2143,6 +2305,12 @@ msgstr "" msgid "Some categories may require additional information." msgstr "" +#: templates/web/default/admin/body-form.html:126 templates/web/default/admin/body-form.html:127 +msgid "" +"Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" +" sent from your FixMyStreet installation." +msgstr "" + #: templates/web/default/alert/index.html:42 templates/web/fixmybarangay/alert/index.html:32 msgid "Some photos of recent reports" msgstr "" @@ -2183,15 +2351,15 @@ msgstr "" msgid "Start month:" msgstr "" -#: templates/web/bromley/report/display.html:78 templates/web/default/admin/flagged.html:13 templates/web/default/admin/list_updates.html:7 templates/web/default/admin/reports.html:15 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:15 templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "" -#: templates/web/default/admin/report_edit.html:34 templates/web/default/admin/update_edit.html:27 templates/web/default/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:53 templates/web/zurich/admin/report_edit.html:85 templates/web/zurich/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:34 templates/web/default/admin/update_edit.html:27 templates/web/default/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:56 templates/web/zurich/admin/report_edit.html:87 templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 perllib/FixMyStreet/Cobrand/Zurich.pm:216 templates/web/default/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1166 perllib/FixMyStreet/Cobrand/Zurich.pm:257 templates/web/default/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" msgstr "" @@ -2203,7 +2371,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370 msgid "Subcategory: %s" msgstr "" @@ -2215,15 +2383,15 @@ msgstr "" msgid "Subject" msgstr "" -#: templates/web/default/admin/report_edit.html:19 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:35 +#: templates/web/default/admin/report_edit.html:19 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:37 msgid "Subject:" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:140 templates/web/bromley/report/new/fill_in_details_form.html:190 templates/web/bromley/report/new/fill_in_details_form.html:204 templates/web/default/questionnaire/creator_fixed.html:19 templates/web/default/report/new/fill_in_details_form.html:114 templates/web/default/report/new/fill_in_details_form.html:154 templates/web/default/report/new/fill_in_details_form.html:176 templates/web/emptyhomes/report/new/fill_in_details_form.html:144 templates/web/fixmystreet/report/new/fill_in_details_form.html:142 templates/web/fixmystreet/report/new/fill_in_details_form.html:167 templates/web/fixmystreet/report/new/fill_in_details_form.html:212 templates/web/seesomething/report/new/fill_in_details_form.html:93 templates/web/zurich/report/new/fill_in_details_form.html:111 +#: templates/web/bromley/report/new/fill_in_details_form.html:140 templates/web/bromley/report/new/fill_in_details_form.html:190 templates/web/bromley/report/new/fill_in_details_form.html:204 templates/web/default/questionnaire/creator_fixed.html:19 templates/web/default/report/new/fill_in_details_form.html:114 templates/web/default/report/new/fill_in_details_form.html:154 templates/web/default/report/new/fill_in_details_form.html:176 templates/web/emptyhomes/report/new/fill_in_details_form.html:144 templates/web/fixmystreet/report/new/fill_in_details_form.html:142 templates/web/fixmystreet/report/new/fill_in_details_form.html:167 templates/web/fixmystreet/report/new/fill_in_details_form.html:212 templates/web/seesomething/report/new/fill_in_details_form.html:93 templates/web/zurich/report/new/fill_in_details_form.html:114 msgid "Submit" msgstr "" -#: templates/web/default/admin/report_edit.html:92 templates/web/default/admin/update_edit.html:60 templates/web/default/admin/user-form.html:17 templates/web/zurich/admin/report_edit-sdm.html:64 templates/web/zurich/admin/report_edit.html:204 templates/web/zurich/admin/update_edit.html:38 +#: templates/web/default/admin/report_edit.html:92 templates/web/default/admin/update_edit.html:60 templates/web/default/admin/user-form.html:51 templates/web/zurich/admin/report_edit-sdm.html:67 templates/web/zurich/admin/report_edit.html:224 templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -2231,7 +2399,7 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:70 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:87 templates/web/zurich/admin/report_edit.html:88 templates/web/zurich/admin/reports.html:13 templates/web/zurich/report/banner.html:9 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:111 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:89 templates/web/zurich/admin/report_edit.html:90 templates/web/zurich/admin/reports.html:13 templates/web/zurich/report/banner.html:9 msgid "Submitted" msgstr "" @@ -2247,7 +2415,7 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1143 perllib/FixMyStreet/Cobrand/Zurich.pm:200 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 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1159 perllib/FixMyStreet/Cobrand/Zurich.pm:241 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 "" @@ -2255,7 +2423,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1163 msgid "Survey" msgstr "" @@ -2263,7 +2431,7 @@ msgstr "" msgid "Survey Results" msgstr "" -#: templates/web/default/admin/list_updates.html:15 templates/web/zurich/admin/list_updates.html:8 +#: templates/web/default/admin/list_updates.html:15 templates/web/zurich/admin/list_updates.html:9 msgid "Text" msgstr "" @@ -2311,7 +2479,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:188 +#: perllib/FixMyStreet/App/Controller/Photo.pm:190 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2327,7 +2495,7 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:683 +#: perllib/FixMyStreet/App/Controller/Admin.pm:687 msgid "That problem will now be resent." msgstr "" @@ -2339,10 +2507,40 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" +#: templates/web/default/admin/body.html:105 +msgid "" +"The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" +" Other categories for this body may have the same email address." +msgstr "" + +#: templates/web/default/admin/body-form.html:100 templates/web/default/admin/body-form.html:101 +msgid "" +"The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" +" when sending reports to this body." +msgstr "" + +#: templates/web/default/admin/body-form.html:113 templates/web/default/admin/body-form.html:114 +msgid "" +"The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" +" than one. If the body is running its own endpoint, you can usually leave this blank." +msgstr "" + +#: templates/web/default/admin/body-form.html:71 templates/web/default/admin/body-form.html:72 +msgid "" +"The <strong>send method</strong> determines how problem reports will be sent to the body.\n" +" If you leave this blank, <strong>send method defaults to email</strong>." +msgstr "" + #: templates/web/default/open311/index.html:92 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/admin/body-form.html:11 templates/web/default/admin/body-form.html:12 +msgid "" +"The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n" +" and may be displayed publically." +msgstr "" + #: 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 "" @@ -2359,6 +2557,10 @@ msgstr "" msgid "The details of your problem are available on the right hand side of this page." msgstr "" +#: templates/web/default/admin/edit-league.html:3 templates/web/default/admin/edit-league.html:4 +msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 perllib/FixMyStreet/App/Controller/Reports.pm:72 msgid "The error was: %s" msgstr "" @@ -2431,10 +2633,16 @@ 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:287 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" +#: templates/web/default/admin/user-form.html:8 templates/web/default/admin/user-form.html:9 +msgid "" +"The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n" +" Names are not necessarily unique." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:69 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -2463,19 +2671,38 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/default/admin/body-form.html:89 templates/web/default/admin/body-form.html:90 +msgid "" +"These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br>\n" +" <strong>You don't need to set them if the Send Method is email.</strong>.\n" +" For more information on Open311, see \n" +" <a href='http://www.mysociety.org/2013/01/17/open311-explained//'>this article</a>.\n" +" " +msgstr "" + #: templates/web/default/open311/index.html:79 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:371 +#: templates/web/default/admin/body.html:33 +msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." +msgstr "" + +#: templates/web/default/admin/body-form.html:52 templates/web/default/admin/body-form.html:53 +msgid "" +"This body will only be sent reports for problems that are located in the <strong>area covered</strong>.\n" +" A body will not receive any reports unless it covers at least one area." +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:375 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:374 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:894 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 perllib/FixMyStreet/Cobrand/UK.pm:58 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:894 perllib/FixMyStreet/App/Controller/Report/New.pm:960 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 perllib/FixMyStreet/Cobrand/UK.pm:58 msgid "This information is required" msgstr "" @@ -2519,7 +2746,7 @@ msgstr "" msgid "This problem is old and of unknown status." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:67 perllib/FixMyStreet/Cobrand/Zurich.pm:68 templates/web/zurich/report/_main.html:14 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:108 perllib/FixMyStreet/Cobrand/Zurich.pm:109 templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -2535,19 +2762,19 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:280 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:284 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 templates/web/default/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1162 templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" -#: templates/web/default/admin/flagged.html:10 templates/web/default/admin/reports.html:12 +#: templates/web/default/admin/flagged.html:15 templates/web/default/admin/reports.html:12 msgid "Title" msgstr "" @@ -2559,11 +2786,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:286 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:290 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/zurich/admin/stats.html:30 +#: templates/web/default/admin/index.html:44 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 "" @@ -2571,7 +2798,7 @@ msgstr "" msgid "Transport Category" msgstr "" -#: templates/web/default/js/translation_strings.html:23 +#: templates/web/default/js/translation_strings.html:26 msgid "Try again" msgstr "" @@ -2579,7 +2806,7 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:51 templates/web/default/admin/update_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:45 templates/web/zurich/admin/report_edit.html:59 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:51 templates/web/default/admin/update_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:48 templates/web/zurich/admin/report_edit.html:61 templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "" @@ -2591,7 +2818,7 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: templates/web/default/js/translation_strings.html:33 +#: templates/web/default/js/translation_strings.html:36 msgid "Unknown error" msgstr "" @@ -2615,11 +2842,11 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/default/admin/body-form.html:82 templates/web/zurich/admin/body-form.html:47 +#: templates/web/default/admin/body-form.html:211 templates/web/zurich/admin/body-form.html:50 msgid "Update body" msgstr "" -#: templates/web/default/admin/index.html:30 +#: templates/web/default/admin/index.html:38 msgid "Update breakdown by state" msgstr "" @@ -2639,7 +2866,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/default/admin/body.html:65 +#: templates/web/default/admin/body.html:73 msgid "Update statuses" msgstr "" @@ -2651,7 +2878,7 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1011 perllib/FixMyStreet/App/Controller/Admin.pm:775 perllib/FixMyStreet/App/Controller/Admin.pm:919 perllib/FixMyStreet/App/Controller/Admin.pm:972 perllib/FixMyStreet/Cobrand/Zurich.pm:424 perllib/FixMyStreet/Cobrand/Zurich.pm:488 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1015 perllib/FixMyStreet/App/Controller/Admin.pm:779 perllib/FixMyStreet/App/Controller/Admin.pm:923 perllib/FixMyStreet/App/Controller/Admin.pm:976 perllib/FixMyStreet/Cobrand/Zurich.pm:487 perllib/FixMyStreet/Cobrand/Zurich.pm:556 msgid "Updated!" msgstr "" @@ -2659,7 +2886,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:150 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to 2000 characters in length. Please shorten your update" msgstr "" @@ -2671,19 +2898,31 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 +#: templates/web/default/admin/body.html:143 +msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." +msgstr "" + +#: templates/web/zurich/admin/list_updates.html:8 +msgid "User" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1297 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1148 perllib/FixMyStreet/Cobrand/Zurich.pm:215 templates/web/default/admin/flagged.html:24 templates/web/zurich/header.html:69 +#: templates/web/default/admin/users.html:5 +msgid "User search finds matches in users' names and email addresses." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1164 perllib/FixMyStreet/Cobrand/Zurich.pm:256 templates/web/default/admin/flagged.html:29 templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:357 perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:359 perllib/FixMyStreet/App/Controller/Admin.pm:389 msgid "Values updated" msgstr "" @@ -2735,7 +2974,7 @@ msgstr "" msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:380 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384 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 +2998,7 @@ msgstr "" msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" msgstr "" -#: templates/web/default/admin/body.html:43 templates/web/default/admin/body_edit.html:82 templates/web/zurich/admin/body.html:17 +#: templates/web/default/admin/body.html:51 templates/web/default/admin/body_edit.html:82 templates/web/zurich/admin/body.html:17 msgid "When edited" msgstr "" @@ -2795,7 +3034,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:37 templates/web/default/admin/list_updates.html:38 templates/web/default/admin/list_updates.html:39 templates/web/default/admin/problem_row.html:20 templates/web/default/admin/report_edit.html:63 templates/web/default/admin/report_edit.html:77 templates/web/default/admin/update_edit.html:24 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:58 templates/web/default/admin/body.html:59 templates/web/default/admin/body.html:60 templates/web/default/admin/body_edit.html:5 templates/web/default/admin/flagged.html:47 templates/web/default/admin/list_updates.html:37 templates/web/default/admin/list_updates.html:38 templates/web/default/admin/list_updates.html:39 templates/web/default/admin/problem_row.html:20 templates/web/default/admin/report_edit.html:63 templates/web/default/admin/report_edit.html:77 templates/web/default/admin/update_edit.html:24 templates/web/default/admin/users.html:29 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 "" @@ -2815,11 +3054,22 @@ msgstr "" msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" +#: templates/web/default/admin/user-form.html:43 +msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." +msgstr "" + +#: templates/web/default/admin/flagged.html:5 +msgid "" +"You can flag any report or user by editing them, and they will be listed on this page.\n" +" For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n" +" reports in the past." +msgstr "" + #: templates/web/default/report/new/councils_text_none.html:11 templates/web/default/report/new/councils_text_none.html:13 templates/web/default/report/new/councils_text_some.html:20 templates/web/default/report/new/councils_text_some.html:22 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: templates/web/default/js/translation_strings.html:30 +#: templates/web/default/js/translation_strings.html:33 msgid "You declined; please fill in the box above" msgstr "" @@ -2875,6 +3125,17 @@ msgstr "" msgid "You must now click the link in the email we've just sent you." msgstr "" +#: templates/web/default/admin/index.html:7 +msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent." +msgstr "" + +#: templates/web/default/admin/bodies.html:9 +msgid "" +"You need to add bodies (such as councils or departments) so that you can then add\n" +" the categories of problems they can handle (such as potholes or streetlights) and the\n" +" contacts (such as an email address) to which reports are sent." +msgstr "" + #: templates/web/default/admin/report_edit.html:71 msgid "You really want to resend?" msgstr "" @@ -2931,7 +3192,7 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:137 templates/web/bromley/report/new/fill_in_details_form.html:184 templates/web/fixmystreet/report/new/fill_in_details_form.html:139 templates/web/fixmystreet/report/new/fill_in_details_form.html:206 templates/web/seesomething/report/new/fill_in_details_form.html:90 templates/web/zurich/report/new/fill_in_details_form.html:107 +#: templates/web/bromley/report/new/fill_in_details_form.html:137 templates/web/bromley/report/new/fill_in_details_form.html:184 templates/web/fixmystreet/report/new/fill_in_details_form.html:139 templates/web/fixmystreet/report/new/fill_in_details_form.html:206 templates/web/seesomething/report/new/fill_in_details_form.html:90 templates/web/zurich/report/new/fill_in_details_form.html:110 msgid "Your phone number" msgstr "" @@ -2963,11 +3224,11 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:644 msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:55 +#: templates/web/default/admin/report_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:57 msgid "didn't use map" msgstr "" @@ -2975,7 +3236,11 @@ msgstr "" msgid "e.g. ‘%s’ or ‘%s’" msgstr "" -#: templates/web/default/admin/index.html:15 templates/web/zurich/admin/index.html:5 +#: templates/web/default/admin/flagged.html:51 +msgid "edit user" +msgstr "" + +#: templates/web/default/admin/index.html:23 templates/web/zurich/admin/index.html:5 msgid "from %d different users" msgstr "" @@ -3035,11 +3300,11 @@ msgstr "" msgid "or" msgstr "" -#: templates/web/default/js/translation_strings.html:21 +#: templates/web/default/js/translation_strings.html:24 msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:24 templates/web/default/admin/report_edit.html:26 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:28 templates/web/zurich/admin/report_edit.html:30 templates/web/zurich/admin/report_edit.html:39 templates/web/zurich/admin/report_edit.html:41 templates/web/zurich/admin/report_edit.html:51 templates/web/zurich/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:24 templates/web/default/admin/report_edit.html:26 templates/web/zurich/admin/report_edit-sdm.html:30 templates/web/zurich/admin/report_edit-sdm.html:32 templates/web/zurich/admin/report_edit-sdm.html:39 templates/web/zurich/admin/report_edit-sdm.html:41 templates/web/zurich/admin/report_edit.html:30 templates/web/zurich/admin/report_edit.html:32 templates/web/zurich/admin/report_edit.html:41 templates/web/zurich/admin/report_edit.html:43 templates/web/zurich/admin/report_edit.html:53 templates/web/zurich/admin/report_edit.html:55 msgid "originally entered: “%s”" msgstr "" @@ -3063,7 +3328,7 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:358 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362 msgid "this type of local problem" msgstr "" @@ -3071,7 +3336,7 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/default/admin/report_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:55 +#: templates/web/default/admin/report_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:57 msgid "used map" msgstr "" diff --git a/notes/vagrant.md b/notes/vagrant.md new file mode 100644 index 000000000..0ef9202f7 --- /dev/null +++ b/notes/vagrant.md @@ -0,0 +1,66 @@ +# Using Vagrant + +Vagrant provides an easy method to setup virtual development environments, for +further information see [their website](http://www.vagrantup.com). + +The included steps will use vagrant to create a dev environment where you can +run the test suite, the development server and of course make changes to the +codebase. + +The basic process is to create a "base" vm, and then "provision" it with the +software packages and setup needed. There are several ways to do this, including +Chef, Puppet, or the existing FixMyStreet install script which we will use. The +supplied scripts will create you a Vagrant VM based on the server edition of +Ubuntu 12.04 LTS that contains everything you need to work on FixMyStreet. + +## Pre-requisites + +1. Install [VirtualBox](http://www.virtualbox.org/wiki/Downloads) +2. Install [Vagrant](http://downloads.vagrantup.com/) + +## Get the FixMyStreet code + +Create a folder somewhere that you'll be doing your work from and clone the repo +into it. + +``` bash +mkdir FMS-vagrant +cd FMS-vagrant +git clone --recursive https://github.com/mysociety/fixmystreet.git +``` + +## Set up the Vagrant box + +The vagrant configuration needs to be placed in the correct place. + +``` bash +# NOTE - you need to be in the 'FMS-vagrant' dir + +cp fixmystreet/conf/Vagrantfile.example Vagrantfile + +# start the vagrant box. This will provision the system and can take a long time. +vagrant up --no-color +``` + +## Working with the vagrant box + +You should now have a local FixMyStreet development server to work with. You +can edit the files locally and the changes will be reflected on the virtual +machine. + +To start the dev server: + +``` bash +vagrant ssh + +# You are now in a terminal on the virtual machine +cd /vagrant/fixmystreet + +# run the dev server +bin/cron-wrapper script/fixmystreet_app_server.pl -d -r --fork +``` + +The server should now be running and you can visit it at the address +http://127.0.0.1.xip.io:3000/ + +Enjoy! diff --git a/templates/web/default/admin/body.html b/templates/web/default/admin/body.html index 9cb9125a6..5256d3313 100644 --- a/templates/web/default/admin/body.html +++ b/templates/web/default/admin/body.html @@ -28,6 +28,16 @@ <p class="error">Do not give these out except to people at the council.</p> [% END %] +[% IF body.areas.size == 0 %] + <p class="fms-admin-warning"> + [% loc("This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>. + Consequently, none of its categories will appear in the drop-down category menu when users report problems. + Currently, users <strong>cannot report problems to this body</strong>.") %] + <br> + [% loc("Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below.") %] + </p> +[% END %] + [% IF live_contacts == 0 %] <p class="fms-admin-warning"> [% loc("This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>.") %] |