From e88422c78d0ad852db9486dfd15a2ac4df119e8b Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 17 Dec 2010 13:36:50 +0000 Subject: REH text updates. --- .../website/cobrands/emptyhomes/emptyhomes-footer | 27 ++++++++++++++++------ web/confirm.cgi | 23 +++++++++--------- web/css/cobrands/emptyhomes/emptyhomes.css | 5 ++++ 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/templates/website/cobrands/emptyhomes/emptyhomes-footer b/templates/website/cobrands/emptyhomes/emptyhomes-footer index 2f704b8f1..f93ad0102 100644 --- a/templates/website/cobrands/emptyhomes/emptyhomes-footer +++ b/templates/website/cobrands/emptyhomes/emptyhomes-footer @@ -2,19 +2,32 @@ - EOF - $out .= '
' if $params{watermark}; + $out .= '
' if $self->watermark(); $out .= compass($q, $x, $y); - my $copyright = $params{copyright}; + my $copyright = $self->copyright(); $out .= < @@ -142,13 +146,6 @@ EOF return $out; } -sub display_map_end { - my ($type) = @_; - my $out = ''; - $out .= '' if ($type); - return $out; -} - sub display_pin { my ($q, $px, $py, $col, $num) = @_; $num = '' if !$num || $num > 9; @@ -165,31 +162,32 @@ sub display_pin { } sub map_pins { - my ($q, $x, $y, $sx, $sy, $interval) = @_; + my ($self, $q, $x, $y, $sx, $sy, $interval) = @_; - my $e = FixMyStreet::Map::tile_to_os($x); - my $n = FixMyStreet::Map::tile_to_os($y); + my $e = tile_to_os($x); + my $n = tile_to_os($y); + my ( $lat, $lon ) = Utils::convert_en_to_latlon( $e, $n ); my ( $around_map, $around_map_list, $nearby, $dist ) = - FixMyStreet::Map::map_features_easting_northing( $q, $e, $n, $interval ); + FixMyStreet::Map::map_features( $q, $lat, $lon, $interval ); my $pins = ''; foreach (@$around_map) { ( $_->{easting}, $_->{northing} ) = _ll_to_en( $_->{latitude}, $_->{longitude} ); - my $px = FixMyStreet::Map::os_to_px($_->{easting}, $sx); - my $py = FixMyStreet::Map::os_to_px($_->{northing}, $sy, 1); + my $px = os_to_px($_->{easting}, $sx); + my $py = os_to_px($_->{northing}, $sy, 1); my $col = $_->{state} eq 'fixed' ? 'green' : 'red'; - $pins .= FixMyStreet::Map::display_pin($q, $px, $py, $col); + $pins .= display_pin($q, $px, $py, $col); } foreach (@$nearby) { ( $_->{easting}, $_->{northing} ) = _ll_to_en( $_->{latitude}, $_->{longitude} ); - my $px = FixMyStreet::Map::os_to_px($_->{easting}, $sx); - my $py = FixMyStreet::Map::os_to_px($_->{northing}, $sy, 1); + my $px = os_to_px($_->{easting}, $sx); + my $py = os_to_px($_->{northing}, $sy, 1); my $col = $_->{state} eq 'fixed' ? 'green' : 'red'; - $pins .= FixMyStreet::Map::display_pin($q, $px, $py, $col); + $pins .= display_pin($q, $px, $py, $col); } return ($pins, $around_map_list, $nearby, $dist); @@ -231,7 +229,7 @@ Takes the tile x,y and converts to lat, lon. =cut sub tile_xy_to_wgs84 { - my ( $x, $y ) = @_; + my ( $self, $x, $y ) = @_; my $easting = tile_to_os($x); my $northing = tile_to_os($y); @@ -253,18 +251,19 @@ sub click_to_tile { # tile they were), convert to OSGB36 and return. sub click_to_os { my ($pin_tile_x, $pin_x, $pin_tile_y, $pin_y) = @_; - my $tile_x = FixMyStreet::Map::click_to_tile($pin_tile_x, $pin_x); - my $tile_y = FixMyStreet::Map::click_to_tile($pin_tile_y, $pin_y, 1); - my $easting = FixMyStreet::Map::tile_to_os($tile_x); - my $northing = FixMyStreet::Map::tile_to_os($tile_y); + my $tile_x = click_to_tile($pin_tile_x, $pin_x); + my $tile_y = click_to_tile($pin_tile_y, $pin_y, 1); + my $easting = tile_to_os($tile_x); + my $northing = tile_to_os($tile_y); return ($easting, $northing); } # Given some click co-ords (the tile they were on, and where in the # tile they were), convert to WGS84 and return. sub click_to_wgs84 { + my $self = shift; my $q = shift; - my ( $easting, $northing ) = FixMyStreet::Map::click_to_os(@_); + my ( $easting, $northing ) = click_to_os(@_); my ( $lat, $lon ) = mySociety::GeoUtil::national_grid_to_wgs84( $easting, $northing, 'G' ); return ( $lat, $lon ); } @@ -275,8 +274,8 @@ sub click_to_wgs84 { sub os_to_px_with_adjust { my ($q, $easting, $northing, $in_x, $in_y) = @_; - my $x = FixMyStreet::Map::os_to_tile($easting); - my $y = FixMyStreet::Map::os_to_tile($northing); + my $x = os_to_tile($easting); + my $y = os_to_tile($northing); my $x_tile = $in_x || int($x); my $y_tile = $in_y || int($y); @@ -288,16 +287,16 @@ sub os_to_px_with_adjust { $y_tile += 1; } - my $px = FixMyStreet::Map::os_to_px($easting, $x_tile); - my $py = FixMyStreet::Map::os_to_px($northing, $y_tile, 1); + my $px = os_to_px($easting, $x_tile); + my $py = os_to_px($northing, $y_tile, 1); if ($q->{site} eq 'barnet') { # Map is 380px, so might need to adjust if (!$in_x && $px > 380) { $x_tile++; - $px = FixMyStreet::Map::os_to_px($easting, $x_tile); + $px = os_to_px($easting, $x_tile); } if (!$in_y && $py > 380) { $y_tile--; - $py = FixMyStreet::Map::os_to_px($northing, $y_tile, 1); + $py = os_to_px($northing, $y_tile, 1); } } diff --git a/perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm b/perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm index f97163c68..722df2a46 100644 --- a/perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm +++ b/perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm @@ -6,23 +6,23 @@ # Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ -package FixMyStreet::Map; +package FixMyStreet::Map::Tilma::Original::1_10k; +use base 'FixMyStreet::Map::Tilma::Original'; use strict; -use constant TILE_WIDTH => 254; -use constant TIF_SIZE_M => 5000; -use constant TIF_SIZE_PX => 7874; -use constant SCALE_FACTOR => TIF_SIZE_M / (TIF_SIZE_PX / TILE_WIDTH); -use constant TILE_TYPE => '10k-full'; +sub tile_width { return 254; } +sub tif_size_m { return 5000; } +sub tif_size_px { return 7874; } +sub scale_factor { return tif_size_m() / (tif_size_px() / tile_width()); } +sub tile_type { return '10k-full'; } -use FixMyStreet::Map::Tilma::Original; +sub copyright { + return _('© Crown copyright. All rights reserved. Ministry of Justice 100037819 2008.'); +} -sub display_map { - my ($q, %params) = @_; - $params{copyright} = _('© Crown copyright. All rights reserved. Ministry of Justice 100037819 2008.'); - $params{watermark} = 1; - return _display_map($q, %params); +sub watermark { + return 1; } 1; diff --git a/perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm b/perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm index 103f4c15c..fe03fdb00 100644 --- a/perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm +++ b/perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm @@ -6,22 +6,23 @@ # Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ -package FixMyStreet::Map; +package FixMyStreet::Map::Tilma::Original::StreetView; +use base 'FixMyStreet::Map::Tilma::Original'; use strict; -use constant TILE_WIDTH => 250; -use constant TIF_SIZE_M => 5000; -use constant TIF_SIZE_PX => 5000; -use constant SCALE_FACTOR => TIF_SIZE_M / (TIF_SIZE_PX / TILE_WIDTH); -use constant TILE_TYPE => 'streetview'; +sub tile_width { return 250; } +sub tif_size_m { return 5000; } +sub tif_size_px { return 5000; } +sub scale_factor { return tif_size_m() / (tif_size_px() / tile_width()); } +sub tile_type { return 'streetview'; } -use FixMyStreet::Map::Tilma::Original; +sub copyright { + return _('Map contains Ordnance Survey data © Crown copyright and database right 2010.'); +} -sub display_map { - my ($q, %params) = @_; - $params{copyright} = _('Map contains Ordnance Survey data © Crown copyright and database right 2010.'); - return _display_map($q, %params); +sub watermark { + return 0; } 1; diff --git a/perllib/Page.pm b/perllib/Page.pm index 130b5b301..6c5af0fc5 100644 --- a/perllib/Page.pm +++ b/perllib/Page.pm @@ -119,6 +119,8 @@ sub microsite { $lang = 'en-gb' if $host =~ /^en\./; Cobrand::set_lang_and_domain(get_cobrand($q), $lang, 1); + FixMyStreet::Map::set_map_class($q->param('map')); + Problems::set_site_restriction($q); Memcached::set_namespace(mySociety::Config::get('BCI_DB_NAME') . ":"); } -- cgit v1.2.3 From 4f7ca296d63482459ae983ff115cc548154fbb99 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 23 Mar 2011 17:01:04 +0000 Subject: Factor out email sending bit of confirmation sending function, and make import.cgi use it. --- perllib/Page.pm | 22 +++++++++++++++++----- web/alert.cgi | 2 +- web/import.cgi | 17 ++++------------- web/index.cgi | 4 ++-- web/tms-signup.cgi | 2 +- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/perllib/Page.pm b/perllib/Page.pm index 130b5b301..85719c14f 100644 --- a/perllib/Page.pm +++ b/perllib/Page.pm @@ -390,12 +390,10 @@ sub error_page ($$) { } # send_email TO (NAME) TEMPLATE-NAME PARAMETERS -# TEMPLATE-NAME is currently one of problem, update, alert, tms +# TEMPLATE-NAME is a full filename here. sub send_email { - my ($q, $recipient_email_address, $name, $thing, %h) = @_; - my $file_thing = $thing; - $file_thing = 'empty property' if $q->{site} eq 'emptyhomes' && $thing eq 'problem'; # Needs to be in English - my $template = "$file_thing-confirm"; + my ($recipient_email_address, $name, $template, %h) = @_; + $template = File::Slurp::read_file("$FindBin::Bin/../templates/emails/$template"); my $to = $name ? [[$recipient_email_address, $name]] : $recipient_email_address; my $cobrand = get_cobrand($q); @@ -443,6 +441,19 @@ sub send_email { ); } +} + +# send_confirmation_email TO (NAME) TEMPLATE-NAME PARAMETERS +# TEMPLATE-NAME is currently one of problem, update, alert, tms +sub send_confirmation_email { + my ($q, $recipient_email_address, $name, $thing, %h) = @_; + + my $file_thing = $thing; + $file_thing = 'empty property' if $q->{site} eq 'emptyhomes' && $thing eq 'problem'; # Needs to be in English + my $template = "$file_thing-confirm"; + + send_email($recipient_email_address, $name, $template, %h); + my ($action, $worry); if ($thing eq 'problem') { $action = _('your problem will not be posted'); @@ -467,6 +478,7 @@ if you do not, %s.

(Don't worry — %s)

EOF + my $cobrand = get_cobrand($q); my %vars = ( action => $action, worry => $worry, diff --git a/web/alert.cgi b/web/alert.cgi index dd4676644..fd30dbf4e 100755 --- a/web/alert.cgi +++ b/web/alert.cgi @@ -605,6 +605,6 @@ sub alert_do_subscribe { $h{url} = Page::base_url_with_lang($q, undef, 1) . '/A/' . mySociety::AuthToken::store('alert', { id => $alert_id, type => 'subscribe', email => $email } ); dbh()->commit(); - return Page::send_email($q, $email, undef, 'alert', %h); + return Page::send_confirmation_email($q, $email, undef, 'alert', %h); } diff --git a/web/import.cgi b/web/import.cgi index ac36b2ee5..9d38dc05e 100755 --- a/web/import.cgi +++ b/web/import.cgi @@ -15,8 +15,6 @@ use Utils; use mySociety::AuthToken; use mySociety::Config; use mySociety::EmailUtil; -use mySociety::EvEl; -use mySociety::Locale; sub main { my $q = shift; @@ -112,23 +110,16 @@ sub main { $id, $latitude, $longitude, $input{subject}, $input{detail}, $input{name}, $input{service}, $input{email}, $input{phone}, $photo); - # Send checking email - my $template = File::Slurp::read_file("$FindBin::Bin/../templates/emails/partial"); my $token = mySociety::AuthToken::store('partial', $id); my %h = ( name => $input{name} ? ' ' . $input{name} : '', - url => mySociety::Config::get('BASE_URL') . '/L/' . $token, + url => Page::base_url_with_lang($q, undef, 1) . '/L/' . $token, service => $input{service}, + title => $input{title}, + detail => $input{detail}, ); - my $sender = mySociety::Config::get('CONTACT_EMAIL'); - $sender =~ s/team/fms-DO-NOT-REPLY/; - mySociety::EvEl::send({ - _template_ => $template, - _parameters_ => \%h, - To => $input{name} ? [ [ $input{email}, $input{name} ] ] : $input{email}, - From => [ $sender, 'FixMyStreet' ], - }, $input{email}); + Page::send_email($input{email}, $input{name}, 'partial', %h); dbh()->commit(); print 'SUCCESS'; diff --git a/web/index.cgi b/web/index.cgi index 595c2f3a7..f741e5f5a 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -259,7 +259,7 @@ sub submit_update { $h{url} = $base . '/C/' . mySociety::AuthToken::store('update', { id => $id, add_alert => $input{add_alert} } ); dbh()->commit(); - my $out = Page::send_email($q, $input{rznvy}, $input{name}, 'update', %h); + my $out = Page::send_confirmation_email($q, $input{rznvy}, $input{name}, 'update', %h); return $out; } @@ -432,7 +432,7 @@ Please let us know what went on and we\'ll look into it.' $h{url} = $base . '/P/' . mySociety::AuthToken::store('problem', $id); dbh()->commit(); - $out = Page::send_email($q, $input{email}, $input{name}, 'problem', %h); + $out = Page::send_confirmation_email($q, $input{email}, $input{name}, 'problem', %h); } return $out; diff --git a/web/tms-signup.cgi b/web/tms-signup.cgi index 44099417f..5975a324f 100755 --- a/web/tms-signup.cgi +++ b/web/tms-signup.cgi @@ -108,7 +108,7 @@ sub tms_do_subscribe { mobile => $input{mobile}, }); dbh()->commit(); - return Page::send_email($q, $input{email}, $input{name}, 'tms', %h); + return Page::send_confirmation_email($q, $input{email}, $input{name}, 'tms', %h); } sub tms_confirm { -- cgit v1.2.3 From 9e3f0cc26dbbd0e1b3d9d4aaf89fffec41557027 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 23 Mar 2011 17:06:56 +0000 Subject: Missing CGI var. --- perllib/Page.pm | 4 ++-- web/import.cgi | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/perllib/Page.pm b/perllib/Page.pm index 0e62fefee..24c52885a 100644 --- a/perllib/Page.pm +++ b/perllib/Page.pm @@ -394,7 +394,7 @@ sub error_page ($$) { # send_email TO (NAME) TEMPLATE-NAME PARAMETERS # TEMPLATE-NAME is a full filename here. sub send_email { - my ($recipient_email_address, $name, $template, %h) = @_; + my ($q, $recipient_email_address, $name, $template, %h) = @_; $template = File::Slurp::read_file("$FindBin::Bin/../templates/emails/$template"); my $to = $name ? [[$recipient_email_address, $name]] : $recipient_email_address; @@ -454,7 +454,7 @@ sub send_confirmation_email { $file_thing = 'empty property' if $q->{site} eq 'emptyhomes' && $thing eq 'problem'; # Needs to be in English my $template = "$file_thing-confirm"; - send_email($recipient_email_address, $name, $template, %h); + send_email($q, $recipient_email_address, $name, $template, %h); my ($action, $worry); if ($thing eq 'problem') { diff --git a/web/import.cgi b/web/import.cgi index 9d38dc05e..371e70f7a 100755 --- a/web/import.cgi +++ b/web/import.cgi @@ -119,7 +119,7 @@ sub main { detail => $input{detail}, ); - Page::send_email($input{email}, $input{name}, 'partial', %h); + Page::send_email($q, $input{email}, $input{name}, 'partial', %h); dbh()->commit(); print 'SUCCESS'; -- cgit v1.2.3 From f10475c5f5a8f7e6a24579c4575c5bb208cc0428 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 23 Mar 2011 17:36:48 +0000 Subject: Bing Maps key. --- conf/general-example | 1 + perllib/FixMyStreet/Map/Bing.pm | 2 ++ web/js/map-bing.js | 1 + 3 files changed, 4 insertions(+) diff --git a/conf/general-example b/conf/general-example index 20872ae28..9da852bb8 100644 --- a/conf/general-example +++ b/conf/general-example @@ -44,6 +44,7 @@ define('OPTION_STAGING_SITE', 1); define('OPTION_UPLOAD_CACHE', '/upload/'); define('OPTION_GEO_CACHE', '/cache/'); define('OPTION_GOOGLE_MAPS_API_KEY', ''); +define('OPTION_BING_MAPS_API_KEY', ''); define('OPTION_MAPIT_URL', 'http://mapit.mysociety.org/'); define('OPTION_MAP_TYPE', 'Tilma::Original::1_10k'); diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm index c29311324..335759b08 100644 --- a/perllib/FixMyStreet/Map/Bing.pm +++ b/perllib/FixMyStreet/Map/Bing.pm @@ -39,11 +39,13 @@ sub display_map { my $out = FixMyStreet::Map::header($q, $params{type}); my $copyright = _('Map contains Ordnance Survey data © Crown copyright and database right 2010.'); + my $key = mySociety::Config::get('BING_MAPS_API_KEY'); $out .= < + + {{ $map_js }} + {{ $robots }} + + {{ $title }}{{ $site_title }} + + + + {{ $rss }} + + + +
+ + + + + + + + + + + + + + + + + + +
+
diff --git a/web/cobrands/southampton/SCClogo.png b/web/cobrands/southampton/SCClogo.png new file mode 100644 index 000000000..74a037a8c Binary files /dev/null and b/web/cobrands/southampton/SCClogo.png differ diff --git a/web/cobrands/southampton/accessInfo.gif b/web/cobrands/southampton/accessInfo.gif new file mode 100644 index 000000000..418698ed5 Binary files /dev/null and b/web/cobrands/southampton/accessInfo.gif differ diff --git a/web/cobrands/southampton/bg-box.gif b/web/cobrands/southampton/bg-box.gif new file mode 100644 index 000000000..559a5ae00 Binary files /dev/null and b/web/cobrands/southampton/bg-box.gif differ diff --git a/web/cobrands/southampton/bg-button.gif b/web/cobrands/southampton/bg-button.gif new file mode 100644 index 000000000..f5f8122dc Binary files /dev/null and b/web/cobrands/southampton/bg-button.gif differ diff --git a/web/cobrands/southampton/bg-footer.gif b/web/cobrands/southampton/bg-footer.gif new file mode 100644 index 000000000..89919c1cd Binary files /dev/null and b/web/cobrands/southampton/bg-footer.gif differ diff --git a/web/cobrands/southampton/bg-header.jpg b/web/cobrands/southampton/bg-header.jpg new file mode 100644 index 000000000..70e0ec46a Binary files /dev/null and b/web/cobrands/southampton/bg-header.jpg differ diff --git a/web/cobrands/southampton/bg-input.gif b/web/cobrands/southampton/bg-input.gif new file mode 100644 index 000000000..267fe9b6b Binary files /dev/null and b/web/cobrands/southampton/bg-input.gif differ diff --git a/web/cobrands/southampton/bg-repeat.gif b/web/cobrands/southampton/bg-repeat.gif new file mode 100644 index 000000000..b68346517 Binary files /dev/null and b/web/cobrands/southampton/bg-repeat.gif differ diff --git a/web/cobrands/southampton/blue-line.gif b/web/cobrands/southampton/blue-line.gif new file mode 100644 index 000000000..c7a587ee5 Binary files /dev/null and b/web/cobrands/southampton/blue-line.gif differ diff --git a/web/cobrands/southampton/bullet.gif b/web/cobrands/southampton/bullet.gif new file mode 100644 index 000000000..a86ef002b Binary files /dev/null and b/web/cobrands/southampton/bullet.gif differ diff --git a/web/cobrands/southampton/bulletActiveSG.gif b/web/cobrands/southampton/bulletActiveSG.gif new file mode 100644 index 000000000..6f4e3e438 Binary files /dev/null and b/web/cobrands/southampton/bulletActiveSG.gif differ diff --git a/web/cobrands/southampton/css.css b/web/cobrands/southampton/css.css new file mode 100644 index 000000000..85f66dcc3 --- /dev/null +++ b/web/cobrands/southampton/css.css @@ -0,0 +1,47 @@ +#mysociety #map_box { + width: 380px; +} +#mysociety #map, #mysociety #drag { + width: 378px; + height: 378px; +} +#mysociety #watermark { + background: url("/i/mojwatermark-378.png"); + height: 84px; + width: 171px; + position: absolute; + bottom: 0; + right: 0; +} +#mysociety p#fixed, #mysociety p#unknown { + margin-right: 400px; + width: auto; +} +#mysociety h1 { + margin: 0; + font-size: 175%; +} +#mysociety h2 { + font-size: 140%; +} +#mysociety select, #mysociety input, #mysociety textarea { + font-size: 99%; +} +#mysociety a.unsuitable-report { + font-size: small; +} +#mysociety blockquote { + border-left: solid 4px #768eb5; +} +#mysociety .a { + color: #000000; + background-color: #e9eef7; +} +#mysociety #postcodeForm { + background-color: #e9eef7; +} +#mysociety #front_stats div { + background-color: #e9eef7; + width: 6em; + padding: 0.5em; +} diff --git a/web/cobrands/southampton/css.scss b/web/cobrands/southampton/css.scss new file mode 100644 index 000000000..57cb95a8f --- /dev/null +++ b/web/cobrands/southampton/css.scss @@ -0,0 +1,67 @@ +$map_width: 378px; +$background: #E9EEF7; +$darker: #768EB5; + +#mysociety { + + // Smaller map + + #map_box { + width: $map_width + 2px; + } + #map, #drag { + width: $map_width; + height: $map_width; + } + #watermark { + background: url("/i/mojwatermark-378.png"); + height: 84px; + width: 171px; + position: absolute; + bottom: 0; + right: 0; + } + + p#fixed, p#unknown { + margin-right: $map_width + 22px; + width: auto; + } + + // Generics + + h1 { + margin: 0; + font-size: 175%; + } + h2 { + font-size: 140%; + } + + select, input, textarea { + font-size: 99%; + } + + a.unsuitable-report { + font-size: small; + } + + blockquote { + border-left: solid 4px $darker; + } + + .a { + color: #000000; + background-color: $background; + } + + #postcodeForm { + background-color: $background; + } + + #front_stats div { + background-color: $background; + width: 6em; + padding: 0.5em; + } + +} diff --git a/web/cobrands/southampton/ff.png b/web/cobrands/southampton/ff.png new file mode 100644 index 000000000..ef7d91148 Binary files /dev/null and b/web/cobrands/southampton/ff.png differ diff --git a/web/cobrands/southampton/forms.png b/web/cobrands/southampton/forms.png new file mode 100644 index 000000000..4f278e9ae Binary files /dev/null and b/web/cobrands/southampton/forms.png differ diff --git a/web/cobrands/southampton/ie6.png b/web/cobrands/southampton/ie6.png new file mode 100644 index 000000000..d6179fa02 Binary files /dev/null and b/web/cobrands/southampton/ie6.png differ diff --git a/web/cobrands/southampton/information.gif b/web/cobrands/southampton/information.gif new file mode 100644 index 000000000..ea2f14bd2 Binary files /dev/null and b/web/cobrands/southampton/information.gif differ diff --git a/web/cobrands/southampton/line.gif b/web/cobrands/southampton/line.gif new file mode 100644 index 000000000..fa6ddca0c Binary files /dev/null and b/web/cobrands/southampton/line.gif differ diff --git a/web/cobrands/southampton/logo.png b/web/cobrands/southampton/logo.png new file mode 100644 index 000000000..71bdc9d97 Binary files /dev/null and b/web/cobrands/southampton/logo.png differ diff --git a/web/cobrands/southampton/mctv.png b/web/cobrands/southampton/mctv.png new file mode 100644 index 000000000..17f3ecec6 Binary files /dev/null and b/web/cobrands/southampton/mctv.png differ diff --git a/web/cobrands/southampton/safari.png b/web/cobrands/southampton/safari.png new file mode 100644 index 000000000..e99547a7f Binary files /dev/null and b/web/cobrands/southampton/safari.png differ diff --git a/web/cobrands/southampton/style.css b/web/cobrands/southampton/style.css new file mode 100644 index 000000000..400859102 --- /dev/null +++ b/web/cobrands/southampton/style.css @@ -0,0 +1,87 @@ +body {font-family:Verdana, Geneva, sans-serif; font-size:62.5%;} + +a {text-decoration:none; color:#1c4384; font-weight:bold;} + +a:hover {text-decoration:underline;} + +p {margin:0 0 10px 0;} + +/* ******* Start of Header ******* */ + +ul#topMenu {width:860px; height:15px; margin:13px auto 3px auto;} +ul#topMenu li {float:left; list-style-type:none;} +ul#topMenu a {padding:0 5px 2px 5px; font-size:0.9em; color:#000; font-weight:400;} + +#wrapper {width:960px; height:auto; margin:0 auto; background:url(bg-repeat.gif) repeat-y;} +#header {width:100%; height:176px; background:url(bg-header.jpg) no-repeat; background-position:1px 0px;} +#header .logo {float:left; width:87px; height:81px; margin:25px 0 17px 46px;} +#header a.siteTitle {height:27px; width:287px; background:url(logo.png) no-repeat; display:block; font-family:verdana; float:left; margin:60px 0 0 15px; text-indent:-9999px;} + +a.mctv {float:right; height:37px; width:104px; margin:15px 7px 0 0;} +a.mctv img {border:none;} + +#searchWrap {width:210px; height:auto; float:right; margin:10px 30px 0 0;} +#searchWrap form {border:none; padding:0; margin:0 0 10px 0;} +#searchWrap fieldset {border:none; padding:0; margin:0;} +#searchWrap label {color:#1b4384; font-weight:700; font-size:1.1em; margin:0; padding:0;} +#searchWrap input {float:left; background:url(bg-input.gif) repeat-x; margin:3px 0 0 0; line-height:16px; padding:3px 5px 3px 4px;} +#searchWrap .button {background:url(bg-button.gif) repeat-x; margin:3px 0 0 5px; float:left; height:26px; padding:0 3px 4px 3px; color:#fff; border:none;} + +.moreInfo {margin:0 0 -2px 2px;} +.text {width:109px; color:#999;} +.text2 {width:137px; color:#999;} + +ul#topNav {width:870px; height:17px; background:#1b4384; clear:both; margin:0 auto; padding:3px 0 1px 0;} +ul#topNav li {float:left; list-style-type:none; background:url(line.gif) no-repeat 0 2px;} +ul#topNav li:first-child {background:none;} +ul#topNav li a {color:#ffffff; font-size:1.2em; padding:0 7px 0 8px; font-size:1.2em; font-weight:400;} + +p.atoz {float:left; margin:8px 0 0 43px; padding:5px 5px 3px 0; font-size:1.2em; border-bottom:1px solid #E0DBEF;} +ul#atoz {width:485px; float:left; margin:13px 0 0 0; border-bottom:1px solid #E0DBEF; padding:0 0 1px 0;} +ul#atoz li {list-style-type:none; display:inline;} +ul#atoz li a {font-size:13px; font-weight:400;} + +ul#contacts {float:right; margin:13px 36px 0 0; padding:0;} +ul#contacts li {float:left; list-style-type:none; background:url(blue-line.gif) no-repeat 0 2px;} +ul#contacts li:first-child {background:none;} +ul#contacts li a {font-size:1.2em; padding:0 8px 0 10px; font-weight:400;} + +/* ******* End of Header ******* */ + + + +/* ******* Start of Left Menu Bar ******* */ + +#menuBar {width:200px; height:auto; float:left; margin:25px 0 0 43px; padding-bottom:25px;} + +ul#leftMenu {height:auto; width:199px; float:left; background:#e9eef7 url(bg-box.gif) no-repeat -1px 100%; padding:0 0 10px 0; margin:5px 0 0 0; overflow:hidden;} +ul#leftMenu li {list-style-type:none; width:199px; padding:0;} +ul#leftMenu li a {display:block; width:100%; line-height:1.5em; padding:3px 10px 3px 32px; font-size:1.2em; font-weight:700;} +ul#leftMenu li.parent {background:url(bulletActiveSG.gif) no-repeat #768eb5; background-position:10px 11px; color:#fff; padding:3px 0 3px 0;} +ul#leftMenu li.parent a {color:#fff} +ul#leftMenu li.selected {background:url(bullet.gif) no-repeat; background-position:10px 8px; color:#fff; padding:0;} + +/* ******* End of Left Menu Bar ******* */ + + + +/* ******* Start of Main Content Area ******* */ + +#contentArea {width:640px; height:auto; float:left; padding-bottom:25px; font-size:1.1em; margin:15px 0 0 0; padding:15px 0 20px 25px;} + +/* ******* End of Main Content Area ******* */ + + + +/* ******* Start of Footer ******* */ + +#footer {width:100%; height:54px; clear:both; background:url(bg-footer.gif) no-repeat;} + +a.accessInfo {float:left; height:32px; width:117px; margin:0 10px 0 43px;} +a.accessInfo img {border:none;} + +ul#bottomMenu {float:left; margin:10px 0 0 10px;} +ul#bottomMenu li {float:left; list-style-type:none;} +ul#bottomMenu a {padding:0 4px 2px 4px; font-size:0.9em; color:#000; font-weight:400;} + +/* ******* End of Footer ******* */ -- cgit v1.2.3 From 13b283e9467ee1d850a2b25e951593a8f2e8411b Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 25 Mar 2011 15:40:02 +0000 Subject: Move .v to right CSS. --- web/cobrands/fiksgatami/css.css | 4 ++++ web/css/_main.scss | 4 ++++ web/css/core.css | 3 --- web/css/core.scss | 4 ---- web/css/main.css | 4 ++++ 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/web/cobrands/fiksgatami/css.css b/web/cobrands/fiksgatami/css.css index 8de8de1fe..54513fb34 100644 --- a/web/cobrands/fiksgatami/css.css +++ b/web/cobrands/fiksgatami/css.css @@ -80,6 +80,10 @@ select, input, textarea { margin: 2em; } +.v { + display: none; +} + #navigation { position: absolute; top: 1em; diff --git a/web/css/_main.scss b/web/css/_main.scss index 1dd678271..44fd82b3b 100644 --- a/web/css/_main.scss +++ b/web/css/_main.scss @@ -82,6 +82,10 @@ select, input, textarea { margin: 2em; } +.v { + display: none; +} + #navigation { position: absolute; top: 1em; diff --git a/web/css/core.css b/web/css/core.css index fb3ea393f..b31e6bc0a 100644 --- a/web/css/core.css +++ b/web/css/core.css @@ -9,9 +9,6 @@ font-weight: bold; margin-top: 0.5em; } -#mysociety .v { - display: none; -} #mysociety .gone { color: #666666; background-color: #cccccc; diff --git a/web/css/core.scss b/web/css/core.scss index ed8667983..8bbebfce1 100644 --- a/web/css/core.scss +++ b/web/css/core.scss @@ -24,10 +24,6 @@ $map_width: 500px; margin-top: 0.5em; } - .v { - display: none; - } - .gone { color: #666666; background-color: #cccccc; diff --git a/web/css/main.css b/web/css/main.css index a7bb81d31..ddea37970 100644 --- a/web/css/main.css +++ b/web/css/main.css @@ -80,6 +80,10 @@ select, input, textarea { margin: 2em; } +.v { + display: none; +} + #navigation { position: absolute; top: 1em; -- cgit v1.2.3 From 6ca18ad47ffeca148b5603b15af5b484ce570ca6 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 25 Mar 2011 23:45:32 +0000 Subject: Update crontab for reportemptyhomes to verbose once a day. --- conf/crontab.ugly | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/crontab.ugly b/conf/crontab.ugly index c446ca602..5e65e1cee 100644 --- a/conf/crontab.ugly +++ b/conf/crontab.ugly @@ -12,7 +12,9 @@ MAILTO=cron-!!(*= $site *)!!@mysociety.org # On only one server !!(* if ($vhost eq 'reportemptyhomes.com') { *)!! -*/5 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-reports || echo "stalled?" +5,10,15,20,25,30,35,40,45,50,55 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-reports || echo "stalled?" +0 0-11,13-23 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-reports || echo "stalled?" +0 12 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-reports --verbose" || echo "stalled?" 2 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-alerts.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-alerts || echo "stalled?" 0,30 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-questionnaires.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-questionnaires-eha || echo "stalled?" -- cgit v1.2.3 From 072f18bff76c213fcc8d40dafe91837fed9a2566 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 25 Mar 2011 23:58:55 +0000 Subject: Variables always defined at this point, compare to empty string. --- web/index.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/index.cgi b/web/index.cgi index c86ac6ad1..eb7ae7f37 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -845,7 +845,7 @@ sub display_location { return front_page( $q, @errors ) unless ( $x && $y ) || $input{pc} - || ( defined $latitude && defined $longitude ); + || ( $latitude ne '' && $longitude ne '' ); if ( $x && $y ) { -- cgit v1.2.3 From 7d77d31a628b2a06ae3600a1463e6d5bf8340778 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Sat, 26 Mar 2011 00:05:15 +0000 Subject: Move midpoint code to Cobrand, as I missed it hidden in map code. --- perllib/Cobrand.pm | 2 ++ perllib/Cobrands/Barnet/Util.pm | 4 ++++ perllib/Cobrands/Southampton/Util.pm | 4 ++++ perllib/FixMyStreet/Map/Tilma/Original.pm | 4 ++-- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/perllib/Cobrand.pm b/perllib/Cobrand.pm index fa2dd9e88..b1ec6ba75 100644 --- a/perllib/Cobrand.pm +++ b/perllib/Cobrand.pm @@ -119,6 +119,8 @@ my %fns = ( # The MaPit types this site handles 'area_types' => { default => '[qw(DIS LBO MTD UTA CTY COI)]' }, 'area_min_generation' => { default => '10' }, + # Some cobrands that use a Tilma map have a smaller mid-point to make pin centred + 'tilma_mid_point' => { default => '""' }, ); foreach (keys %fns) { diff --git a/perllib/Cobrands/Barnet/Util.pm b/perllib/Cobrands/Barnet/Util.pm index 0e5ddcf68..e4115c232 100644 --- a/perllib/Cobrands/Barnet/Util.pm +++ b/perllib/Cobrands/Barnet/Util.pm @@ -109,5 +109,9 @@ sub recent_photos { return Problems::recent_photos($num, $lat, $lon, $dist); } +sub tilma_mid_point { + return 189; +} + 1; diff --git a/perllib/Cobrands/Southampton/Util.pm b/perllib/Cobrands/Southampton/Util.pm index ee7d8e728..d29b53127 100644 --- a/perllib/Cobrands/Southampton/Util.pm +++ b/perllib/Cobrands/Southampton/Util.pm @@ -109,5 +109,9 @@ sub recent_photos { return Problems::recent_photos($num, $lat, $lon, $dist); } +sub tilma_mid_point { + return 189; +} + 1; diff --git a/perllib/FixMyStreet/Map/Tilma/Original.pm b/perllib/FixMyStreet/Map/Tilma/Original.pm index 2a64b5bbb..0af6ed277 100644 --- a/perllib/FixMyStreet/Map/Tilma/Original.pm +++ b/perllib/FixMyStreet/Map/Tilma/Original.pm @@ -45,8 +45,8 @@ sub display_map { $params{pre} ||= ''; $params{post} ||= ''; my $mid_point = TILE_WIDTH; # Map is 2 TILE_WIDTHs in size, square. - if ($q->{site} eq 'barnet') { # Map is c. 380px wide - $mid_point = 189; + if (my $mp = Cobrand::tilma_mid_point(Page::get_cobrand($q))) { + $mid_point = $mp; } # convert map center point to easting, northing -- cgit v1.2.3 From c818efaf43ca7fa25d8a3c44299f21f23ad795fc Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 29 Mar 2011 13:25:35 +0100 Subject: Don't error/show if no result returned. --- bin/send-reports | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/bin/send-reports b/bin/send-reports index 96f259d5c..5bfee00ac 100755 --- a/bin/send-reports +++ b/bin/send-reports @@ -355,15 +355,21 @@ sub find_closest { # Get nearest road-type thing from Bing my $url = "http://dev.virtualearth.net/REST/v1/Locations/$latitude,$longitude?c=en-GB&key=" . mySociety::Config::get('BING_MAPS_API_KEY'); my $j = LWP::Simple::get($url); - $j = JSON->new->utf8->allow_nonref->decode($j); - $str .= "Nearest road to the pin placed on the map (automatically generated by Bing Maps): $j->{resourceSets}[0]{resources}[0]{name}\n\n"; + if ($j) { + $j = JSON->new->utf8->allow_nonref->decode($j); + if ($j->{resourceSets}[0]{resources}[0]{name}) { + $str .= "Nearest road to the pin placed on the map (automatically generated by Bing Maps): $j->{resourceSets}[0]{resources}[0]{name}\n\n"; + } + } # Get nearest postcode from Matthew's random gazetteer (put in MaPit? Or elsewhere?) $url = "http://gazetteer.dracos.vm.bytemark.co.uk/point/$latitude,$longitude.json"; $j = LWP::Simple::get($url); - $j = JSON->new->utf8->allow_nonref->decode($j); - if ($j->{postcode}) { - $str .= "Nearest postcode to the pin placed on the map (automatically generated): $j->{postcode}[0] ($j->{postcode}[1]m away)\n\n"; + if ($j) { + $j = JSON->new->utf8->allow_nonref->decode($j); + if ($j->{postcode}) { + $str .= "Nearest postcode to the pin placed on the map (automatically generated): $j->{postcode}[0] ($j->{postcode}[1]m away)\n\n"; + } } return $str; } -- cgit v1.2.3 From 554ce1c0c506713185377d1d61189e49e1808910 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 29 Mar 2011 14:58:46 +0100 Subject: Remove fuzziness for one mostly unchanged string. --- locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 1 - 1 file changed, 1 deletion(-) diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index 9bebc9f2e..2639b94e8 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po @@ -797,7 +797,6 @@ msgid "Sorry, there has been an error confirming your empty property." msgstr "Sori, bu gwall wrth gadarnhau eich eiddo gwag." #: web/confirm.cgi:139 -#, fuzzy msgid "" "Thank you for reporting an empty property on\n" "ReportEmptyHomes.com. We have emailed the lead officer for empty homes in " -- cgit v1.2.3 From efe4dc0126acceacb75f6c25852860a78e5fe98e Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 29 Mar 2011 15:49:30 +0100 Subject: .po files update. --- locale/FixMyStreet.po | 173 +++++++++++++------------ locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 179 ++++++++++++++------------ locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 178 +++++++++++++------------ 3 files changed, 276 insertions(+), 254 deletions(-) diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index cbef4561c..5f31a14ba 100644 --- a/locale/FixMyStreet.po +++ b/locale/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-03-21 13:15+0000\n" +"POT-Creation-Date: 2011-03-29 15:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -39,41 +39,41 @@ msgstr "" msgid "The text of the error was:" msgstr "" -#: perllib/Page.pm:195 web/contact.cgi:107 +#: perllib/Page.pm:197 web/contact.cgi:107 msgid "FixMyStreet" msgstr "" -#: perllib/Page.pm:198 perllib/Page.pm:322 +#: perllib/Page.pm:200 perllib/Page.pm:324 msgid "Report a problem" msgstr "" -#: perllib/Page.pm:199 perllib/Page.pm:323 +#: perllib/Page.pm:201 perllib/Page.pm:325 msgid "All reports" msgstr "" -#: perllib/Page.pm:200 perllib/Page.pm:324 +#: perllib/Page.pm:202 perllib/Page.pm:326 msgid "Local alerts" msgstr "" -#: perllib/Page.pm:201 perllib/Page.pm:325 +#: perllib/Page.pm:203 perllib/Page.pm:327 msgid "Help" msgstr "" -#: perllib/Page.pm:202 web/about.cgi:19 web/about.cgi:21 +#: perllib/Page.pm:204 web/about.cgi:19 web/about.cgi:21 msgid "About us" msgstr "" -#: perllib/Page.pm:223 +#: perllib/Page.pm:225 msgid "FixMyStreet" msgstr "" -#: perllib/Page.pm:301 +#: perllib/Page.pm:303 msgid "" "This is a developer site; things might break at any time, and the database " "will be periodically deleted." msgstr "" -#: perllib/Page.pm:315 +#: perllib/Page.pm:317 msgid "" "Built by mySociety, using some clever code." msgstr "" -#: perllib/Page.pm:317 +#: perllib/Page.pm:319 msgid "" "Built by mySociety and maintained " "by NUUG, using some code." msgstr "" -#: perllib/Page.pm:321 +#: perllib/Page.pm:323 msgid "Navigation" msgstr "" -#: perllib/Page.pm:326 +#: perllib/Page.pm:328 msgid "Contact" msgstr "" -#: perllib/Page.pm:328 +#: perllib/Page.pm:330 msgid "" "\"View" msgstr "" -#: perllib/Page.pm:386 +#: perllib/Page.pm:388 msgid "Error" msgstr "" -#: perllib/Page.pm:448 +#: perllib/Page.pm:461 msgid "your problem will not be posted" msgstr "" -#: perllib/Page.pm:449 +#: perllib/Page.pm:462 msgid "we'll hang on to your problem report while you're checking your email." msgstr "" -#: perllib/Page.pm:451 +#: perllib/Page.pm:464 msgid "your update will not be posted" msgstr "" -#: perllib/Page.pm:452 +#: perllib/Page.pm:465 msgid "we'll hang on to your update while you're checking your email." msgstr "" -#: perllib/Page.pm:454 +#: perllib/Page.pm:467 msgid "your alert will not be activated" msgstr "" -#: perllib/Page.pm:455 +#: perllib/Page.pm:468 msgid "we'll hang on to your alert while you're checking your email." msgstr "" -#: perllib/Page.pm:462 +#: perllib/Page.pm:475 #, perl-format msgid "" "

Nearly Done! Now check your email...

\n" @@ -146,165 +146,165 @@ msgid "" "

(Don't worry — %s)

\n" msgstr "" -#: perllib/Page.pm:489 +#: perllib/Page.pm:503 msgid "today" msgstr "" -#: perllib/Page.pm:513 +#: perllib/Page.pm:527 msgid "less than a minute" msgstr "" -#: perllib/Page.pm:516 +#: perllib/Page.pm:530 #, perl-format msgid "%d week" msgstr "" -#: perllib/Page.pm:516 +#: perllib/Page.pm:530 #, perl-format msgid "%d weeks" msgstr "" -#: perllib/Page.pm:517 +#: perllib/Page.pm:531 #, perl-format msgid "%d day" msgstr "" -#: perllib/Page.pm:517 +#: perllib/Page.pm:531 #, perl-format msgid "%d days" msgstr "" -#: perllib/Page.pm:518 +#: perllib/Page.pm:532 #, perl-format msgid "%d hour" msgstr "" -#: perllib/Page.pm:518 +#: perllib/Page.pm:532 #, perl-format msgid "%d hours" msgstr "" -#: perllib/Page.pm:519 +#: perllib/Page.pm:533 #, perl-format msgid "%d minute" msgstr "" -#: perllib/Page.pm:519 +#: perllib/Page.pm:533 #, perl-format msgid "%d minutes" msgstr "" -#: perllib/Page.pm:539 +#: perllib/Page.pm:553 #, perl-format msgid "%s, reported anonymously at %s" msgstr "" -#: perllib/Page.pm:541 +#: perllib/Page.pm:555 #, perl-format msgid "%s, reported by %s at %s" msgstr "" -#: perllib/Page.pm:544 perllib/Page.pm:546 perllib/Page.pm:552 -#: perllib/Page.pm:554 web/index.cgi:391 web/index.cgi:562 web/index.cgi:569 -#: bin/send-reports:180 +#: perllib/Page.pm:558 perllib/Page.pm:560 perllib/Page.pm:566 +#: perllib/Page.pm:568 web/index.cgi:391 web/index.cgi:562 web/index.cgi:569 +#: bin/send-reports:181 msgid "Other" msgstr "" -#: perllib/Page.pm:545 +#: perllib/Page.pm:559 #, perl-format msgid "Reported by %s in the %s category anonymously at %s" msgstr "" -#: perllib/Page.pm:547 +#: perllib/Page.pm:561 #, perl-format msgid "Reported by %s in the %s category by %s at %s" msgstr "" -#: perllib/Page.pm:549 +#: perllib/Page.pm:563 #, perl-format msgid "Reported by %s anonymously at %s" msgstr "" -#: perllib/Page.pm:551 +#: perllib/Page.pm:565 #, perl-format msgid "Reported by %s by %s at %s" msgstr "" -#: perllib/Page.pm:553 +#: perllib/Page.pm:567 #, perl-format msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/Page.pm:555 +#: perllib/Page.pm:569 #, perl-format msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/Page.pm:557 web/contact.cgi:212 +#: perllib/Page.pm:571 web/contact.cgi:212 #, perl-format msgid "Reported anonymously at %s" msgstr "" -#: perllib/Page.pm:559 web/contact.cgi:213 +#: perllib/Page.pm:573 web/contact.cgi:213 #, perl-format msgid "Reported by %s at %s" msgstr "" -#: perllib/Page.pm:564 +#: perllib/Page.pm:578 msgid "the map was not used so pin location may be inaccurate" msgstr "" -#: perllib/Page.pm:572 +#: perllib/Page.pm:586 #, perl-format msgid "Sent to %s %s later" msgstr "" -#: perllib/Page.pm:576 +#: perllib/Page.pm:590 msgid "Not reported to council" msgstr "" -#: perllib/Page.pm:627 web-admin/index.cgi:522 web-admin/index.cgi:646 +#: perllib/Page.pm:641 web-admin/index.cgi:522 web-admin/index.cgi:646 msgid "Updates" msgstr "" -#: perllib/Page.pm:631 +#: perllib/Page.pm:645 #, perl-format msgid "Posted by %s at %s" msgstr "" -#: perllib/Page.pm:633 +#: perllib/Page.pm:647 #, perl-format msgid "Posted anonymously at %s" msgstr "" -#: perllib/Page.pm:636 +#: perllib/Page.pm:650 msgid "marked as fixed" msgstr "" -#: perllib/Page.pm:637 +#: perllib/Page.pm:651 msgid "reopened" msgstr "" -#: perllib/Page.pm:645 web/index.cgi:1075 +#: perllib/Page.pm:659 web/index.cgi:1075 msgid "Offensive? Unsuitable? Tell us" msgstr "" -#: perllib/Page.pm:672 +#: perllib/Page.pm:686 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/Page.pm:678 +#: perllib/Page.pm:692 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: perllib/Page.pm:681 perllib/FixMyStreet/Geocode.pm:145 +#: perllib/Page.pm:695 perllib/FixMyStreet/Geocode.pm:145 msgid "" "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include " "any maps for the region." msgstr "" -#: perllib/Page.pm:712 +#: perllib/Page.pm:726 msgid "Please upload a JPEG image only" msgstr "" @@ -352,22 +352,21 @@ msgstr "" #: perllib/FixMyStreet/Map/OSM/StreetView.pm:42 #: perllib/FixMyStreet/Map/Google.pm:41 #: perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm:51 -#: perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm:23 +#: perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm:21 msgid "" "Map contains Ordnance Survey data © Crown copyright and database right " "2010." msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:72 -#: perllib/FixMyStreet/Map/OSM/CycleMap.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:76 msgid "" "Map © OpenStreetMap and contributors, CC-BY-SA" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:117 -#: perllib/FixMyStreet/Map/Tilma/Original.pm:158 +#: perllib/FixMyStreet/Map/OSM.pm:115 +#: perllib/FixMyStreet/Map/Tilma/Original.pm:155 msgid "Problem" msgstr "" @@ -378,13 +377,13 @@ msgid "" msgstr "" #: perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm:51 -#: perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm:23 +#: perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm:21 msgid "" "© Crown copyright. All rights reserved. Ministry of Justice " "100037819 2008." msgstr "" -#: perllib/FixMyStreet/Map/Tilma/Original.pm:82 +#: perllib/FixMyStreet/Map/Tilma/Original.pm:86 msgid "Unable to fetch the map tiles from the tile server." msgstr "" @@ -717,50 +716,56 @@ msgid "" "to resolve the UK’s empty homes crisis." msgstr "" -#: web/confirm.cgi:155 web/confirm.cgi:158 +#: web/confirm.cgi:155 web/confirm.cgi:161 msgid "View your report" msgstr "" #: web/confirm.cgi:157 -msgid "Thank you for reporting an empty property on ReportEmptyHomes.com." +msgid "" +"Thank you for reporting this empty property on ReportEmptyHomes.com.\n" +"At present the report cannot be sent through to the council for this area. " +"We\n" +"are working with councils to link them into the system so that as many " +"areas\n" +"as possible will be covered." msgstr "" -#: web/confirm.cgi:163 +#: web/confirm.cgi:166 msgid "You have successfully confirmed your problem" msgstr "" -#: web/confirm.cgi:164 +#: web/confirm.cgi:167 msgid " and we will now send it to the council" msgstr "" -#: web/confirm.cgi:165 +#: web/confirm.cgi:168 #, perl-format msgid ". You can view the problem on this site." msgstr "" -#: web/confirm.cgi:189 +#: web/confirm.cgi:192 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 "" -#: web/confirm.cgi:190 web/questionnaire.cgi:234 web/questionnaire.cgi:323 +#: web/confirm.cgi:193 web/questionnaire.cgi:234 web/questionnaire.cgi:323 #: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503 #: web-admin/index.cgi:590 web-admin/index.cgi:608 msgid "Yes" msgstr "" -#: web/confirm.cgi:191 web/questionnaire.cgi:235 web/questionnaire.cgi:324 +#: web/confirm.cgi:194 web/questionnaire.cgi:235 web/questionnaire.cgi:324 #: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503 #: web-admin/index.cgi:590 web-admin/index.cgi:608 msgid "No" msgstr "" -#: web/confirm.cgi:192 web/index.cgi:790 +#: web/confirm.cgi:195 web/index.cgi:790 msgid "Submit" msgstr "" -#: web/confirm.cgi:237 +#: web/confirm.cgi:240 #, perl-format msgid "" "Thank you — you can view your updated problem on " @@ -1186,7 +1191,7 @@ msgstr "" msgid "Name:" msgstr "" -#: web/index.cgi:739 bin/send-reports:89 web-admin/index.cgi:631 +#: web/index.cgi:739 bin/send-reports:91 web-admin/index.cgi:631 msgid "Phone:" msgstr "" @@ -1636,35 +1641,35 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: bin/send-reports:91 +#: bin/send-reports:93 msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: bin/send-reports:97 +#: bin/send-reports:99 msgid "To view a map of the precise location of this issue" msgstr "" -#: bin/send-reports:98 +#: bin/send-reports:100 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" msgstr "" -#: bin/send-reports:181 +#: bin/send-reports:182 msgid "this type of local problem" msgstr "" -#: bin/send-reports:185 +#: bin/send-reports:186 #, perl-format msgid "Category: %s" msgstr "" -#: bin/send-reports:188 +#: bin/send-reports:189 msgid " and " msgstr "" -#: bin/send-reports:189 +#: bin/send-reports:190 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 " @@ -1672,7 +1677,7 @@ msgid "" "problem this is so we can add it to our system." msgstr "" -#: bin/send-reports:195 +#: bin/send-reports:196 #, perl-format msgid "" "We realise this problem might be the responsibility of %s; however, we don't " diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index 2639b94e8..f52331851 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-03-21 13:15+0000\n" +"POT-Creation-Date: 2011-03-29 15:40+0100\n" "PO-Revision-Date: 2009-07-10 14:20-0000\n" "Last-Translator: Mark Smith \n" "Language-Team: mySociety\n" @@ -44,42 +44,42 @@ msgstr "Ymddiheuriadau! Mae rhywbeth wedi mynd o'i le." msgid "The text of the error was:" msgstr "Testun y gwall oedd:" -#: perllib/Page.pm:195 web/contact.cgi:107 +#: perllib/Page.pm:197 web/contact.cgi:107 msgid "reportemptyhomes.com" msgstr "reportemptyhomes.com" -#: perllib/Page.pm:198 perllib/Page.pm:322 +#: perllib/Page.pm:200 perllib/Page.pm:324 msgid "Report a property" msgstr "Rhoi gwybod am eiddo" -#: perllib/Page.pm:199 perllib/Page.pm:323 +#: perllib/Page.pm:201 perllib/Page.pm:325 msgid "Reports" msgstr "Adroddiadau" -#: perllib/Page.pm:200 perllib/Page.pm:324 +#: perllib/Page.pm:202 perllib/Page.pm:326 msgid "Get local reports" msgstr "Gweld adroddiadau lleol" -#: perllib/Page.pm:201 perllib/Page.pm:325 +#: perllib/Page.pm:203 perllib/Page.pm:327 msgid "FAQs" msgstr "Cwestiynau Cyffredin" -#: perllib/Page.pm:202 web/about.cgi:19 web/about.cgi:21 +#: perllib/Page.pm:204 web/about.cgi:19 web/about.cgi:21 msgid "About us" msgstr "Amdanom ni" -#: perllib/Page.pm:223 +#: perllib/Page.pm:225 msgid "FixMyStreet" msgstr "TrwsioFyStryd" -#: perllib/Page.pm:301 +#: perllib/Page.pm:303 #, fuzzy msgid "" "This is a developer site; things might break at any time, and the database " "will be periodically deleted." msgstr "Safle datblygwr yw hwn; gallai pethau dorri unrhyw bryd." -#: perllib/Page.pm:315 +#: perllib/Page.pm:317 msgid "" "Built by mySociety, using some clever godclyfar ." -#: perllib/Page.pm:317 +#: perllib/Page.pm:319 #, fuzzy msgid "" "Built by mySociety and maintained " @@ -104,15 +104,15 @@ msgstr "" "d=mysociety/services/TilMa\">godclyfar ." -#: perllib/Page.pm:321 +#: perllib/Page.pm:323 msgid "Navigation" msgstr "Mordwyo " -#: perllib/Page.pm:326 +#: perllib/Page.pm:328 msgid "Contact" msgstr "Cysylltu" -#: perllib/Page.pm:328 +#: perllib/Page.pm:330 msgid "" "\"View" -#: perllib/Page.pm:386 +#: perllib/Page.pm:388 msgid "Error" msgstr "Gwall" -#: perllib/Page.pm:448 +#: perllib/Page.pm:461 msgid "your empty property will not be posted" msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: perllib/Page.pm:449 +#: perllib/Page.pm:462 msgid "" "we'll hang on to your empty property report while you're checking your email." msgstr "" "byddwn yn dal gafael ar eich hysbysiad am eiddo gwag wrth i chi wirio eich e-" "bost." -#: perllib/Page.pm:451 +#: perllib/Page.pm:464 msgid "your update will not be posted" msgstr "ni fydd eich diweddariad yn cael ei bostio" -#: perllib/Page.pm:452 +#: perllib/Page.pm:465 msgid "we'll hang on to your update while you're checking your email." msgstr "byddwn yn dal gafael ar eich diweddariad wrth i chi wirio eich e-bost." -#: perllib/Page.pm:454 +#: perllib/Page.pm:467 msgid "your alert will not be activated" msgstr "ni fydd eich hysbysiad yn cael ei weithredu" -#: perllib/Page.pm:455 +#: perllib/Page.pm:468 msgid "we'll hang on to your alert while you're checking your email." msgstr "byddwn yn dal gafael ar eich hysbysiad wrth i chi wirio eich e-bost." -#: perllib/Page.pm:462 +#: perllib/Page.pm:475 #, perl-format msgid "" "

Nearly Done! Now check your email...

\n" @@ -177,160 +177,160 @@ msgstr "" "os nad ydych, %s.

\n" "

(Peidiwch â phoeni — %s)

\n" -#: perllib/Page.pm:489 +#: perllib/Page.pm:503 msgid "today" msgstr "heddiw" -#: perllib/Page.pm:513 +#: perllib/Page.pm:527 msgid "less than a minute" msgstr "llai na munud" -#: perllib/Page.pm:516 +#: perllib/Page.pm:530 #, fuzzy, perl-format msgid "%d week" msgstr "wythnos" -#: perllib/Page.pm:516 +#: perllib/Page.pm:530 #, fuzzy, perl-format msgid "%d weeks" msgstr "wythnos" -#: perllib/Page.pm:517 +#: perllib/Page.pm:531 #, fuzzy, perl-format msgid "%d day" msgstr "diwrnod" -#: perllib/Page.pm:517 +#: perllib/Page.pm:531 #, fuzzy, perl-format msgid "%d days" msgstr "diwrnod" -#: perllib/Page.pm:518 +#: perllib/Page.pm:532 #, fuzzy, perl-format msgid "%d hour" msgstr "awr" -#: perllib/Page.pm:518 +#: perllib/Page.pm:532 #, fuzzy, perl-format msgid "%d hours" msgstr "awr" -#: perllib/Page.pm:519 +#: perllib/Page.pm:533 #, fuzzy, perl-format msgid "%d minute" msgstr "munud" -#: perllib/Page.pm:519 +#: perllib/Page.pm:533 #, fuzzy, perl-format msgid "%d minutes" msgstr "munud" -#: perllib/Page.pm:539 +#: perllib/Page.pm:553 #, perl-format msgid "%s, reported anonymously at %s" msgstr "Rhoddodd %s wybod yn ddi-enw am %s" -#: perllib/Page.pm:541 +#: perllib/Page.pm:555 #, perl-format msgid "%s, reported by %s at %s" msgstr "Adroddwyd am %s gan %s am %s" -#: perllib/Page.pm:544 perllib/Page.pm:546 perllib/Page.pm:552 -#: perllib/Page.pm:554 web/index.cgi:391 web/index.cgi:562 web/index.cgi:569 -#: bin/send-reports:180 +#: perllib/Page.pm:558 perllib/Page.pm:560 perllib/Page.pm:566 +#: perllib/Page.pm:568 web/index.cgi:391 web/index.cgi:562 web/index.cgi:569 +#: bin/send-reports:181 msgid "Other" msgstr "Arall" -#: perllib/Page.pm:545 +#: perllib/Page.pm:559 #, perl-format msgid "Reported by %s in the %s category anonymously at %s" msgstr "Adroddwyd am hyn gan %s yn y categori %s yn ddi-enw, am %s" -#: perllib/Page.pm:547 +#: perllib/Page.pm:561 #, perl-format msgid "Reported by %s in the %s category by %s at %s" msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" -#: perllib/Page.pm:549 +#: perllib/Page.pm:563 #, perl-format msgid "Reported by %s anonymously at %s" msgstr "Adroddwyd gan %s yn ddi-enw am %s" -#: perllib/Page.pm:551 +#: perllib/Page.pm:565 #, perl-format msgid "Reported by %s by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" -#: perllib/Page.pm:553 +#: perllib/Page.pm:567 #, perl-format msgid "Reported in the %s category anonymously at %s" msgstr "Adroddiwyd yn y categori %s yn ddi-enw am %s" -#: perllib/Page.pm:555 +#: perllib/Page.pm:569 #, perl-format msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s gan %s am %s" -#: perllib/Page.pm:557 web/contact.cgi:212 +#: perllib/Page.pm:571 web/contact.cgi:212 #, perl-format msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddi-enw am %s" -#: perllib/Page.pm:559 web/contact.cgi:213 +#: perllib/Page.pm:573 web/contact.cgi:213 #, perl-format msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/Page.pm:564 +#: perllib/Page.pm:578 msgid "the map was not used so pin location may be inaccurate" msgstr "" "ni ddefnyddiwyd y map felly mae'n bosibl na fydd lleoliad y pin yn gywir" -#: perllib/Page.pm:572 +#: perllib/Page.pm:586 #, perl-format msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" -#: perllib/Page.pm:576 +#: perllib/Page.pm:590 msgid "Not reported to council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: perllib/Page.pm:627 web-admin/index.cgi:522 web-admin/index.cgi:646 +#: perllib/Page.pm:641 web-admin/index.cgi:522 web-admin/index.cgi:646 msgid "Updates" msgstr "Diweddariadau" -#: perllib/Page.pm:631 +#: perllib/Page.pm:645 #, perl-format msgid "Posted by %s at %s" msgstr "Cofnodwyd gan %s am %s" -#: perllib/Page.pm:633 +#: perllib/Page.pm:647 #, perl-format msgid "Posted anonymously at %s" msgstr "Cofnodwyd yn ddi-enw am %s" -#: perllib/Page.pm:636 +#: perllib/Page.pm:650 msgid "marked as returned to use" msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio" -#: perllib/Page.pm:637 +#: perllib/Page.pm:651 msgid "reopened" msgstr "wedi'i ailagor" -#: perllib/Page.pm:645 web/index.cgi:1075 +#: perllib/Page.pm:659 web/index.cgi:1075 msgid "Offensive? Unsuitable? Tell us" msgstr "Sarhaus? Anaddas? Rhowch wybod i ni" -#: perllib/Page.pm:672 +#: perllib/Page.pm:686 msgid "That postcode was not recognised, sorry." msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori." -#: perllib/Page.pm:678 +#: perllib/Page.pm:692 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: perllib/Page.pm:681 perllib/FixMyStreet/Geocode.pm:145 +#: perllib/Page.pm:695 perllib/FixMyStreet/Geocode.pm:145 msgid "" "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include " "any maps for the region." @@ -338,7 +338,7 @@ msgstr "" "Nid ydym yn ymdrin â Gogledd Iwerddon, yn anffodus, gan nad yw ein trwydded " "yn cynnwys unrhyw fapiau ar gyfer y rhanbarth." -#: perllib/Page.pm:712 +#: perllib/Page.pm:726 msgid "Please upload a JPEG image only" msgstr "Dim ond llun JPEG y dylech lwytho i fyny." @@ -395,22 +395,21 @@ msgstr "" #: perllib/FixMyStreet/Map/OSM/StreetView.pm:42 #: perllib/FixMyStreet/Map/Google.pm:41 #: perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm:51 -#: perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm:23 +#: perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm:21 msgid "" "Map contains Ordnance Survey data © Crown copyright and database right " "2010." msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:72 -#: perllib/FixMyStreet/Map/OSM/CycleMap.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:76 msgid "" "Map © OpenStreetMap and contributors, CC-BY-SA" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:117 -#: perllib/FixMyStreet/Map/Tilma/Original.pm:158 +#: perllib/FixMyStreet/Map/OSM.pm:115 +#: perllib/FixMyStreet/Map/Tilma/Original.pm:155 msgid "Empty property" msgstr "Eiddo gwag" @@ -421,14 +420,14 @@ msgid "" msgstr "" #: perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm:51 -#: perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm:23 +#: perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm:21 #, fuzzy msgid "" "© Crown copyright. All rights reserved. Ministry of Justice " "100037819 2008." msgstr "Hawlfraint y Goron. Cedwir pob hawl. Y Weinyddiaeth Amddiffyn" -#: perllib/FixMyStreet/Map/Tilma/Original.pm:82 +#: perllib/FixMyStreet/Map/Tilma/Original.pm:86 msgid "Unable to fetch the map tiles from the tile server." msgstr "" @@ -853,28 +852,35 @@ msgstr "" "helpu i \n" "ddatrys argyfwng tai gwag y DU." -#: web/confirm.cgi:155 web/confirm.cgi:158 +#: web/confirm.cgi:155 web/confirm.cgi:161 msgid "View your report" msgstr "Gweld eich adroddiad" #: web/confirm.cgi:157 -msgid "Thank you for reporting an empty property on ReportEmptyHomes.com." -msgstr "Diolch am roi gwybod am eiddo gwag ar ReportEmptyHomes.com." +msgid "" +"Thank you for reporting this empty property on ReportEmptyHomes.com.\n" +"At present the report cannot be sent through to the council for this area. " +"We\n" +"are working with councils to link them into the system so that as many " +"areas\n" +"as possible will be covered." +msgstr "" +"Diolch am roi gwybod am eiddo gwag ar ReportEmptyHomes.com." -#: web/confirm.cgi:163 +#: web/confirm.cgi:166 msgid "You have successfully confirmed your empty property" msgstr "Rydych wedi cadarnhau eich eiddo gwag yn llwyddiannus" -#: web/confirm.cgi:164 +#: web/confirm.cgi:167 msgid " and we will now send it to the council" msgstr " a byddwn nawr yn ei anfon at y cyngor" -#: web/confirm.cgi:165 +#: web/confirm.cgi:168 #, perl-format msgid ". You can view the empty property on this site." msgstr ". Gallwch weld yr eiddo gwag ar y safle hwn." -#: web/confirm.cgi:189 +#: web/confirm.cgi:192 msgid "" "Thanks, glad to hear it's been returned to use! Could we just ask if you " "have ever reported an empty property to a council before?" @@ -883,23 +889,23 @@ msgstr "" "i ni'ch holi chi, a ydych erioed wedi rhoi gwybod i'r cyngor am eiddo gwag " "cyn hyn?" -#: web/confirm.cgi:190 web/questionnaire.cgi:234 web/questionnaire.cgi:323 +#: web/confirm.cgi:193 web/questionnaire.cgi:234 web/questionnaire.cgi:323 #: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503 #: web-admin/index.cgi:590 web-admin/index.cgi:608 msgid "Yes" msgstr "Ydw" -#: web/confirm.cgi:191 web/questionnaire.cgi:235 web/questionnaire.cgi:324 +#: web/confirm.cgi:194 web/questionnaire.cgi:235 web/questionnaire.cgi:324 #: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503 #: web-admin/index.cgi:590 web-admin/index.cgi:608 msgid "No" msgstr "Nac ydw" -#: web/confirm.cgi:192 web/index.cgi:790 +#: web/confirm.cgi:195 web/index.cgi:790 msgid "Submit" msgstr "Anfon" -#: web/confirm.cgi:237 +#: web/confirm.cgi:240 #, perl-format msgid "" "Thank you — you can view your updated empty property\n" +#~ msgid "Thank you for reporting an empty property on ReportEmptyHomes.com." +#~ msgstr "Diolch am roi gwybod am eiddo gwag ar ReportEmptyHomes.com." + #~ msgid "Enter a nearby GB postcode, or street name and area:" #~ msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 2f5ca16dc..f5f3e5675 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: FixMyStreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-03-21 13:15+0000\n" +"POT-Creation-Date: 2011-03-29 15:40+0100\n" "PO-Revision-Date: 2011-02-27 13:36MET\n" "Last-Translator: Petter Reinholdtsen \n" "Language-Team: Norwegian Bokmål \n" @@ -43,35 +43,35 @@ msgstr "Beklager! Noe har gått galt." msgid "The text of the error was:" msgstr "Teksten i feilmeldingen var:" -#: perllib/Page.pm:195 web/contact.cgi:107 +#: perllib/Page.pm:197 web/contact.cgi:107 msgid "FixMyStreet" msgstr "FiksGataMi" -#: perllib/Page.pm:198 perllib/Page.pm:322 +#: perllib/Page.pm:200 perllib/Page.pm:324 msgid "Report a problem" msgstr "Rapporter et problem" -#: perllib/Page.pm:199 perllib/Page.pm:323 +#: perllib/Page.pm:201 perllib/Page.pm:325 msgid "All reports" msgstr "Alle rapporter" -#: perllib/Page.pm:200 perllib/Page.pm:324 +#: perllib/Page.pm:202 perllib/Page.pm:326 msgid "Local alerts" msgstr "Lokale varsler" -#: perllib/Page.pm:201 perllib/Page.pm:325 +#: perllib/Page.pm:203 perllib/Page.pm:327 msgid "Help" msgstr "Hjelp" -#: perllib/Page.pm:202 web/about.cgi:19 web/about.cgi:21 +#: perllib/Page.pm:204 web/about.cgi:19 web/about.cgi:21 msgid "About us" msgstr "Om oss" -#: perllib/Page.pm:223 +#: perllib/Page.pm:225 msgid "FixMyStreet" msgstr "FiksGataMi" -#: perllib/Page.pm:301 +#: perllib/Page.pm:303 msgid "" "This is a developer site; things might break at any time, and the database " "will be periodically deleted." @@ -79,7 +79,7 @@ msgstr "" "Dette er et utviklernettsted. Ting kan knekke når som helst og databasen vil " "bli periodisk slettet." -#: perllib/Page.pm:315 +#: perllib/Page.pm:317 msgid "" "Built by mySociety, using some clever kode." -#: perllib/Page.pm:317 +#: perllib/Page.pm:319 msgid "" "Built by mySociety and maintained " "by NUUG, using some kode." -#: perllib/Page.pm:321 +#: perllib/Page.pm:323 msgid "Navigation" msgstr "Navigasjon" -#: perllib/Page.pm:326 +#: perllib/Page.pm:328 msgid "Contact" msgstr "Kontakt" -#: perllib/Page.pm:328 +#: perllib/Page.pm:330 msgid "" "\"ViewForeningen " "NUUG
" -#: perllib/Page.pm:386 +#: perllib/Page.pm:388 msgid "Error" msgstr "Feil" -#: perllib/Page.pm:448 +#: perllib/Page.pm:461 msgid "your problem will not be posted" msgstr "vil ditt problem ikke bli publisert" -#: perllib/Page.pm:449 +#: perllib/Page.pm:462 msgid "we'll hang on to your problem report while you're checking your email." msgstr "vi holder på rapporten din mens du sjekker epost." -#: perllib/Page.pm:451 +#: perllib/Page.pm:464 msgid "your update will not be posted" msgstr "din oppdatering vil ikke bli publisert" -#: perllib/Page.pm:452 +#: perllib/Page.pm:465 msgid "we'll hang on to your update while you're checking your email." msgstr "vi holder på din oppdatering mens du sjekker din epost." -#: perllib/Page.pm:454 +#: perllib/Page.pm:467 msgid "your alert will not be activated" msgstr "vil ditt varsel ikke bli aktivisert" -#: perllib/Page.pm:455 +#: perllib/Page.pm:468 msgid "we'll hang on to your alert while you're checking your email." msgstr "vi holder på ditt varsel mens du sjekker din epost." -#: perllib/Page.pm:462 +#: perllib/Page.pm:475 #, perl-format msgid "" "

Nearly Done! Now check your email...

\n" @@ -172,161 +172,161 @@ msgstr "" "hvis du ikke gjør det, %s.

\n" "

(Ingen grunn til bekymring — %s)

\n" -#: perllib/Page.pm:489 +#: perllib/Page.pm:503 msgid "today" msgstr "idag" -#: perllib/Page.pm:513 +#: perllib/Page.pm:527 msgid "less than a minute" msgstr "mindre enn et minutt" -#: perllib/Page.pm:516 +#: perllib/Page.pm:530 #, perl-format msgid "%d week" msgstr "%d uke" -#: perllib/Page.pm:516 +#: perllib/Page.pm:530 #, perl-format msgid "%d weeks" msgstr "%d uker" -#: perllib/Page.pm:517 +#: perllib/Page.pm:531 #, perl-format msgid "%d day" msgstr "%d dag" -#: perllib/Page.pm:517 +#: perllib/Page.pm:531 #, perl-format msgid "%d days" msgstr "%d dager" -#: perllib/Page.pm:518 +#: perllib/Page.pm:532 #, perl-format msgid "%d hour" msgstr "%d time" -#: perllib/Page.pm:518 +#: perllib/Page.pm:532 #, perl-format msgid "%d hours" msgstr "%d timer" -#: perllib/Page.pm:519 +#: perllib/Page.pm:533 #, perl-format msgid "%d minute" msgstr "%d minutt" -#: perllib/Page.pm:519 +#: perllib/Page.pm:533 #, perl-format msgid "%d minutes" msgstr "%d minutter" -#: perllib/Page.pm:539 +#: perllib/Page.pm:553 #, perl-format msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/Page.pm:541 +#: perllib/Page.pm:555 #, perl-format msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" -#: perllib/Page.pm:544 perllib/Page.pm:546 perllib/Page.pm:552 -#: perllib/Page.pm:554 web/index.cgi:391 web/index.cgi:562 web/index.cgi:569 -#: bin/send-reports:180 +#: perllib/Page.pm:558 perllib/Page.pm:560 perllib/Page.pm:566 +#: perllib/Page.pm:568 web/index.cgi:391 web/index.cgi:562 web/index.cgi:569 +#: bin/send-reports:181 msgid "Other" msgstr "Annet" -#: perllib/Page.pm:545 +#: perllib/Page.pm:559 #, perl-format msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonnymt %s" -#: perllib/Page.pm:547 +#: perllib/Page.pm:561 #, perl-format msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" -#: perllib/Page.pm:549 +#: perllib/Page.pm:563 #, perl-format msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/Page.pm:551 +#: perllib/Page.pm:565 #, perl-format msgid "Reported by %s by %s at %s" msgstr "Rapporter av %s av %s %s" -#: perllib/Page.pm:553 +#: perllib/Page.pm:567 #, perl-format msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/Page.pm:555 +#: perllib/Page.pm:569 #, perl-format msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/Page.pm:557 web/contact.cgi:212 +#: perllib/Page.pm:571 web/contact.cgi:212 #, perl-format msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" -#: perllib/Page.pm:559 web/contact.cgi:213 +#: perllib/Page.pm:573 web/contact.cgi:213 #, perl-format msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/Page.pm:564 +#: perllib/Page.pm:578 msgid "the map was not used so pin location may be inaccurate" msgstr "kartet ble ikke brukt, så nåleposisjon kan være unøyaktig" -#: perllib/Page.pm:572 +#: perllib/Page.pm:586 #, perl-format msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" -#: perllib/Page.pm:576 +#: perllib/Page.pm:590 msgid "Not reported to council" msgstr "Ikke rapportert til administrasjonen" -#: perllib/Page.pm:627 web-admin/index.cgi:522 web-admin/index.cgi:646 +#: perllib/Page.pm:641 web-admin/index.cgi:522 web-admin/index.cgi:646 msgid "Updates" msgstr "Oppdateringer" -#: perllib/Page.pm:631 +#: perllib/Page.pm:645 #, perl-format msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" -#: perllib/Page.pm:633 +#: perllib/Page.pm:647 #, perl-format msgid "Posted anonymously at %s" msgstr "Publisert anonymt %s" -#: perllib/Page.pm:636 +#: perllib/Page.pm:650 msgid "marked as fixed" msgstr "markert som fikset" -#: perllib/Page.pm:637 +#: perllib/Page.pm:651 msgid "reopened" msgstr "åpnet på nytt" -#: perllib/Page.pm:645 web/index.cgi:1075 +#: perllib/Page.pm:659 web/index.cgi:1075 msgid "Offensive? Unsuitable? Tell us" msgstr "Støtende? Upassende? Gi oss beskjed" -#: perllib/Page.pm:672 +#: perllib/Page.pm:686 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." -#: perllib/Page.pm:678 +#: perllib/Page.pm:692 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" "Beklager det ser ut til å være et \"Crown dependency\"-postnummer, som vi " "ikke dekker." -#: perllib/Page.pm:681 perllib/FixMyStreet/Geocode.pm:145 +#: perllib/Page.pm:695 perllib/FixMyStreet/Geocode.pm:145 msgid "" "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include " "any maps for the region." @@ -334,7 +334,7 @@ msgstr "" "Vi dekker ikke nordlige Irland, er jeg redd, da vår lisens ikke inkluderer " "noen kart for den regionen." -#: perllib/Page.pm:712 +#: perllib/Page.pm:726 msgid "Please upload a JPEG image only" msgstr "Vennligst last kun opp et JPEG-bilde" @@ -386,7 +386,7 @@ msgstr "Mer enn ett treff" #: perllib/FixMyStreet/Map/OSM/StreetView.pm:42 #: perllib/FixMyStreet/Map/Google.pm:41 #: perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm:51 -#: perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm:23 +#: perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm:21 msgid "" "Map contains Ordnance Survey data © Crown copyright and database right " "2010." @@ -394,8 +394,7 @@ msgstr "" "Kartet inneholder data fra Ordnance Survey © Crown copyright og " "databaserettigheter 2010." -#: perllib/FixMyStreet/Map/OSM.pm:72 -#: perllib/FixMyStreet/Map/OSM/CycleMap.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:76 msgid "" "Map © OpenStreetMap and contributors, OpenStreetMap og bidragsytere, CC-BY-SA" -#: perllib/FixMyStreet/Map/OSM.pm:117 -#: perllib/FixMyStreet/Map/Tilma/Original.pm:158 +#: perllib/FixMyStreet/Map/OSM.pm:115 +#: perllib/FixMyStreet/Map/Tilma/Original.pm:155 msgid "Problem" msgstr "Problem" @@ -419,7 +418,7 @@ msgstr "" "databaserettigheter 2010. Microsoft" #: perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm:51 -#: perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm:23 +#: perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm:21 msgid "" "© Crown copyright. All rights reserved. Ministry of Justice " "100037819 2008." @@ -427,7 +426,7 @@ msgstr "" "© Crown copyright. Alle rettigheter reservert. Justisdepartementet " "100037819 2008." -#: perllib/FixMyStreet/Map/Tilma/Original.pm:82 +#: perllib/FixMyStreet/Map/Tilma/Original.pm:86 msgid "Unable to fetch the map tiles from the tile server." msgstr "Klarte ikke hente kartfliser fra filtjeneren." @@ -787,28 +786,34 @@ msgid "" "to resolve the UK’s empty homes crisis." msgstr "" -#: web/confirm.cgi:155 web/confirm.cgi:158 +#: web/confirm.cgi:155 web/confirm.cgi:161 msgid "View your report" msgstr "Vis din rapport" #: web/confirm.cgi:157 -msgid "Thank you for reporting an empty property on ReportEmptyHomes.com." -msgstr "Takk for at du rapporterer en tom eiendom på ReportEmptyHomes.com." +msgid "" +"Thank you for reporting this empty property on ReportEmptyHomes.com.\n" +"At present the report cannot be sent through to the council for this area. " +"We\n" +"are working with councils to link them into the system so that as many " +"areas\n" +"as possible will be covered." +msgstr "" -#: web/confirm.cgi:163 +#: web/confirm.cgi:166 msgid "You have successfully confirmed your problem" msgstr "Du har nå oppdatert din sak" -#: web/confirm.cgi:164 +#: web/confirm.cgi:167 msgid " and we will now send it to the council" msgstr " og vi sender det nå til administrasjonen" -#: web/confirm.cgi:165 +#: web/confirm.cgi:168 #, perl-format msgid ". You can view the problem on this site." msgstr ". Du kan lese saken på portalen ." -#: web/confirm.cgi:189 +#: web/confirm.cgi:192 msgid "" "Thanks, glad to hear it's been fixed! Could we just ask if you have ever " "reported a problem to a council before?" @@ -816,23 +821,23 @@ msgstr "" "Takk, glad for å høre at problemet er fikset! Vi vil gjerne spørre deg om " "du har rapportert et problem til en administrasjon tidligere?" -#: web/confirm.cgi:190 web/questionnaire.cgi:234 web/questionnaire.cgi:323 +#: web/confirm.cgi:193 web/questionnaire.cgi:234 web/questionnaire.cgi:323 #: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503 #: web-admin/index.cgi:590 web-admin/index.cgi:608 msgid "Yes" msgstr "Ja" -#: web/confirm.cgi:191 web/questionnaire.cgi:235 web/questionnaire.cgi:324 +#: web/confirm.cgi:194 web/questionnaire.cgi:235 web/questionnaire.cgi:324 #: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503 #: web-admin/index.cgi:590 web-admin/index.cgi:608 msgid "No" msgstr "Nei" -#: web/confirm.cgi:192 web/index.cgi:790 +#: web/confirm.cgi:195 web/index.cgi:790 msgid "Submit" msgstr "Send inn" -#: web/confirm.cgi:237 +#: web/confirm.cgi:240 #, perl-format msgid "" "Thank you — you can view your updated problem on " @@ -1325,7 +1330,7 @@ msgstr "Bilde:" msgid "Name:" msgstr "Navn:" -#: web/index.cgi:739 bin/send-reports:89 web-admin/index.cgi:631 +#: web/index.cgi:739 bin/send-reports:91 web-admin/index.cgi:631 msgid "Phone:" msgstr "Telefon:" @@ -1833,17 +1838,17 @@ msgstr "(ikke rapportert til administrasjonen)" msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" -#: bin/send-reports:91 +#: bin/send-reports:93 msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." -#: bin/send-reports:97 +#: bin/send-reports:99 msgid "To view a map of the precise location of this issue" msgstr "For å se en kart med den presise plasseringen for denne saken." -#: bin/send-reports:98 +#: bin/send-reports:100 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" @@ -1851,20 +1856,20 @@ msgstr "" "Brukeren kunne ikke plassere problemet på et kart, men sjekk området rundt " "stedet de skrev inn" -#: bin/send-reports:181 +#: bin/send-reports:182 msgid "this type of local problem" msgstr "denne type lokalt problem" -#: bin/send-reports:185 +#: bin/send-reports:186 #, perl-format msgid "Category: %s" msgstr "Kategori: %s" -#: bin/send-reports:188 +#: bin/send-reports:189 msgid " and " msgstr " og " -#: bin/send-reports:189 +#: bin/send-reports:190 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 " @@ -1877,7 +1882,7 @@ msgstr "" "eller gi oss beskjed om hvilken kategori av problemer dette er så vi kan " "legge det til i vårt system." -#: bin/send-reports:195 +#: bin/send-reports:196 #, perl-format msgid "" "We realise this problem might be the responsibility of %s; however, we don't " @@ -3409,3 +3414,6 @@ msgid "" "To stop receiving emails when there are new updates on this property,\n" "please follow this link: \n" msgstr "" + +#~ msgid "Thank you for reporting an empty property on ReportEmptyHomes.com." +#~ msgstr "Takk for at du rapporterer en tom eiendom på ReportEmptyHomes.com." -- cgit v1.2.3 From 862835b362268f468f919f13ff3453a560e3d2a6 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 1 Apr 2011 09:51:54 +0100 Subject: Add clear to fix Southampton FF issue. --- web/alert.cgi | 2 +- web/cobrands/southampton/style.css | 2 +- web/index.cgi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/alert.cgi b/web/alert.cgi index fd30dbf4e..208dc756b 100755 --- a/web/alert.cgi +++ b/web/alert.cgi @@ -364,7 +364,7 @@ sub alert_list_options { my $rss_url = Cobrand::url($cobrand, $url, $q); $out .= 'value="' . $id . '"> ' . _('RSS feed') . ''; +title="' . sprintf(_('RSS feed of %s'), $text) . '" alt="' . _('RSS feed') . '" border="0">'; } return $out; } diff --git a/web/cobrands/southampton/style.css b/web/cobrands/southampton/style.css index 400859102..cd4c0f490 100644 --- a/web/cobrands/southampton/style.css +++ b/web/cobrands/southampton/style.css @@ -52,7 +52,7 @@ ul#contacts li a {font-size:1.2em; padding:0 8px 0 10px; font-weight:400;} /* ******* Start of Left Menu Bar ******* */ -#menuBar {width:200px; height:auto; float:left; margin:25px 0 0 43px; padding-bottom:25px;} +#menuBar {width:200px; height:auto; float:left; margin:25px 0 0 43px; padding-bottom:25px; clear:both; } ul#leftMenu {height:auto; width:199px; float:left; background:#e9eef7 url(bg-box.gif) no-repeat -1px 100%; padding:0 0 10px 0; margin:5px 0 0 0; overflow:hidden;} ul#leftMenu li {list-style-type:none; width:199px; padding:0;} diff --git a/web/index.cgi b/web/index.cgi index eb7ae7f37..50a097ea8 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -197,7 +197,7 @@ EOF $out .= $q->h2(_('Recently reported problems')) . ' ' if @$probs; $out .= '
'; -- cgit v1.2.3 From 85856508a2920c518a67015fa0c95506d88299ee Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 1 Apr 2011 13:37:37 +0100 Subject: Missing translated string, .po update. --- bin/send-reports | 2 +- locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 10 +++------- web/index.cgi | 6 +++--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/bin/send-reports b/bin/send-reports index 5bfee00ac..8e6d2d178 100755 --- a/bin/send-reports +++ b/bin/send-reports @@ -142,7 +142,7 @@ foreach my $row (@$unsent) { # XXX Needs locks! my @all_councils = split /,|\|/, $row->{council}; my ($councils, $missing) = $row->{council} =~ /^([\d,]+)(?:\|([\d,]+))?/; - my @councils = split /,/, $councils; + my @councils = split(/,/, $councils); $areas_info = mySociety::MaPit::call('areas', \@all_councils); my (@dear, %recips); my $all_confirmed = 1; diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index f5f3e5675..5bc5d06ea 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: FixMyStreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" "POT-Creation-Date: 2011-03-29 15:40+0100\n" -"PO-Revision-Date: 2011-02-27 13:36MET\n" +"PO-Revision-Date: 2011-03-31 09:12MET\n" "Last-Translator: Petter Reinholdtsen \n" "Language-Team: Norwegian Bokmål \n" "MIME-Version: 1.0\n" @@ -1488,7 +1488,7 @@ msgstr "Denne saken er gammel og med ukjent status." #: web/index.cgi:1051 web/index.cgi:1092 msgid "This problem has been fixed" -msgstr "Denne saken er løst." +msgstr "Denne saken er løst" #: web/index.cgi:1076 msgid "More problems nearby" @@ -1830,9 +1830,8 @@ msgid "Problems within %s, FixMyStreet" msgstr "Problemer innenfor %s, Fiksgatami" #: web/reports.cgi:333 -#, fuzzy msgid "(sent to both)" -msgstr "(ikke rapportert til administrasjonen)" +msgstr "(sent til begge)" #: web/reports.cgi:334 msgid "(not sent to council)" @@ -3414,6 +3413,3 @@ msgid "" "To stop receiving emails when there are new updates on this property,\n" "please follow this link: \n" msgstr "" - -#~ msgid "Thank you for reporting an empty property on ReportEmptyHomes.com." -#~ msgstr "Takk for at du rapporterer en tom eiendom på ReportEmptyHomes.com." diff --git a/web/index.cgi b/web/index.cgi index 50a097ea8..186393f96 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -633,9 +633,9 @@ EOF if (my $token = $input{partial}) { $partial_id = mySociety::AuthToken::retrieve('partial', $token); if ($partial_id) { - $vars{form_start} .= $q->p({id=>'unknown'}, 'Please note your report has - not yet been sent. Choose a category - and add further information below, then submit.'); + $vars{form_start} .= + $q->p({ id => 'unknown' }, + _('Please note your report has not yet been sent. Choose a category and add further information below, then submit.')); } } $vars{text_located} = $q->p(_('You have located the problem at the point marked with a purple pin on the map. -- cgit v1.2.3 From e591ef105c5996e95f2e7738b324c25b3708f0be Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 1 Apr 2011 13:38:43 +0100 Subject: Put new string in .po file. --- locale/FixMyStreet.po | 8 +++++++- locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 11 ++++++++--- locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 8 +++++++- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 5f31a14ba..53d5981f9 100644 --- a/locale/FixMyStreet.po +++ b/locale/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-03-29 15:40+0100\n" +"POT-Creation-Date: 2011-04-01 13:38+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1067,6 +1067,12 @@ msgstr "" msgid "Property type:" msgstr "" +#: web/index.cgi:638 +msgid "" +"Please note your report has not yet been sent. Choose a " +"category and add further information below, then submit." +msgstr "" + #: web/index.cgi:641 msgid "" "You have located the problem at the point marked with a purple pin on the " diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index f52331851..c7abcc58e 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-03-29 15:40+0100\n" +"POT-Creation-Date: 2011-04-01 13:38+0100\n" "PO-Revision-Date: 2009-07-10 14:20-0000\n" "Last-Translator: Mark Smith \n" "Language-Team: mySociety\n" @@ -864,8 +864,7 @@ msgid "" "are working with councils to link them into the system so that as many " "areas\n" "as possible will be covered." -msgstr "" -"Diolch am roi gwybod am eiddo gwag ar ReportEmptyHomes.com." +msgstr "Diolch am roi gwybod am eiddo gwag ar ReportEmptyHomes.com." #: web/confirm.cgi:166 msgid "You have successfully confirmed your empty property" @@ -1249,6 +1248,12 @@ msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." msgid "Property type:" msgstr "Math o eiddo:" +#: web/index.cgi:638 +msgid "" +"Please note your report has not yet been sent. Choose a " +"category and add further information below, then submit." +msgstr "" + #: web/index.cgi:641 msgid "" "You have located the empty property at the point marked with a purple pin on " diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 5bc5d06ea..e8eb2c89c 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: FixMyStreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-03-29 15:40+0100\n" +"POT-Creation-Date: 2011-04-01 13:38+0100\n" "PO-Revision-Date: 2011-03-31 09:12MET\n" "Last-Translator: Petter Reinholdtsen \n" "Language-Team: Norwegian Bokmål \n" @@ -1171,6 +1171,12 @@ msgstr "Tom offentlig bygning - skole, sykehos, etc." msgid "Property type:" msgstr "Type egenskap:" +#: web/index.cgi:638 +msgid "" +"Please note your report has not yet been sent. Choose a " +"category and add further information below, then submit." +msgstr "" + #: web/index.cgi:641 msgid "" "You have located the problem at the point marked with a purple pin on the " -- cgit v1.2.3