aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xbin/make_css22
-rw-r--r--perllib/FixMyStreet/DB/ResultSet/Problem.pm3
-rw-r--r--perllib/FixMyStreet/Map/OSM/MapQuest.pm2
-rw-r--r--perllib/Open311/PopulateServiceList.pm3
-rw-r--r--t/cobrand/zurich.t4
-rwxr-xr-xtemplates/web/fixmystreet/around/_updates.html2
-rw-r--r--templates/web/fixmystreet/auth/general.html2
-rw-r--r--web/js/map-OpenStreetMap.js8
8 files changed, 20 insertions, 26 deletions
diff --git a/bin/make_css b/bin/make_css
index 80fcb462f..c48dda4d6 100755
--- a/bin/make_css
+++ b/bin/make_css
@@ -13,20 +13,12 @@
DIRECTORY=$(cd `dirname $0`/../web && pwd)
-# FixMyStreet uses compass
-NEWSTYLE=${1:-`find $DIRECTORY -name "config.rb" -exec dirname {} \;`}
-NEWSTYLE_REGEX=$(sed 's/ /\\|/g' <<< $NEWSTYLE)
-for site in $NEWSTYLE; do
- compass compile --output-style compressed $site
-done
-
-# If given a command line argument, assume was a compass directory and exit
-if [ -n "$1" ]; then
- exit 0
-fi
+DIRS=${1:-`find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq`}
-# The rest are plain sass
-for scss in `find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq | grep -v "\($NEWSTYLE_REGEX\)"`
-do
- sass --scss --update --style compressed $scss
+for dir in $DIRS; do
+ if [ -e "$dir/config.rb" ]; then
+ compass compile --output-style compressed $dir
+ else
+ sass --scss --update --style compressed $dir
+ fi
done
diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index 07848d782..97d457297 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -464,7 +464,8 @@ sub send_reports {
send_fail_count => { '>', 0 }
} );
while (my $row = $unsent->next) {
- $sending_errors .= "* http://www.fixmystreet.com/report/" . $row->id . ", failed "
+ my $base_url = mySociety::Config::get('BASE_URL');
+ $sending_errors .= "* " . $base_url . "/report/" . $row->id . ", failed "
. $row->send_fail_count . " times, last at " . $row->send_fail_timestamp
. ", reason " . $row->send_fail_reason . "\n";
}
diff --git a/perllib/FixMyStreet/Map/OSM/MapQuest.pm b/perllib/FixMyStreet/Map/OSM/MapQuest.pm
index 4751679f5..ff314a4da 100644
--- a/perllib/FixMyStreet/Map/OSM/MapQuest.pm
+++ b/perllib/FixMyStreet/Map/OSM/MapQuest.pm
@@ -28,7 +28,7 @@ sub map_tiles {
}
sub base_tile_url {
- return 'mqcdn.com/tiles/1.0.0/osm/';
+ return 'mqcdn.com/tiles/1.0.0/map/';
}
1;
diff --git a/perllib/Open311/PopulateServiceList.pm b/perllib/Open311/PopulateServiceList.pm
index 7990abfbf..c5fc4a506 100644
--- a/perllib/Open311/PopulateServiceList.pm
+++ b/perllib/Open311/PopulateServiceList.pm
@@ -42,8 +42,9 @@ sub process_body {
my $list = $open311->get_service_list;
unless ( $list ) {
my $id = $self->_current_body->id;
+ my $mapit_url = mySociety::Config::get('MAPIT_URL');
my $areas = join( ",", keys %{$self->_current_body->areas} );
- warn "Body $id for areas $areas - http://mapit.mysociety.org/areas/$areas.html - did not return a service list\n"
+ warn "Body $id for areas $areas - $mapit_url/areas/$areas.html - did not return a service list\n"
if $self->verbose >= 1;
return;
}
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index 5d7ff8672..d61ec2ae0 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -210,7 +210,7 @@ $mech->submit_form_ok( { with_fields => { body_external => 4 } } );
$mech->get_ok( '/report/' . $report->id );
$mech->content_contains('Beantwortet');
$mech->content_contains('Third Test');
-$mech->content_contains('Weitergeleitet an: External Body');
+$mech->content_contains('Wir haben Ihr Anliegen an External Body weitergeleitet');
FixMyStreet::App->model('DB::Problem')->send_reports('zurich');
$email = $mech->get_email;
like $email->header('Subject'), qr/Weitergeleitete Meldung/, 'subject looks okay';
@@ -229,7 +229,7 @@ $mech->submit_form_ok( { with_fields => { body_external => 4, third_personal =>
$mech->get_ok( '/report/' . $report->id );
$mech->content_contains('Beantwortet');
$mech->content_contains('Third Test');
-$mech->content_contains('Weitergeleitet an: External Body');
+$mech->content_contains('Wir haben Ihr Anliegen an External Body weitergeleitet');
FixMyStreet::App->model('DB::Problem')->send_reports('zurich');
$email = $mech->get_email;
like $email->header('Subject'), qr/Weitergeleitete Meldung/, 'subject looks okay';
diff --git a/templates/web/fixmystreet/around/_updates.html b/templates/web/fixmystreet/around/_updates.html
index 75327c935..458983e8f 100755
--- a/templates/web/fixmystreet/around/_updates.html
+++ b/templates/web/fixmystreet/around/_updates.html
@@ -1,5 +1,5 @@
<div class="shadow-wrap">
<ul id="key-tools" class="singleton">
- <li><a class="feed" id="key-tool-around-updates" href="[% email_url | html %]">Get updates</a></li>
+ <li><a class="feed" id="key-tool-around-updates" href="[% email_url | html %]">[% loc("Get updates") %]</a></li>
</ul>
</div>
diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html
index 7fa2b57fe..b9d02c18b 100644
--- a/templates/web/fixmystreet/auth/general.html
+++ b/templates/web/fixmystreet/auth/general.html
@@ -50,7 +50,7 @@
<h5>[% loc('<strong>No</strong> let me sign in by email') %]</h5>
<div class="general-sidebar-notes">
- <p>Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.</p>
+ <p>[% loc('Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p>
</div>
<label for="name">[% loc('Name') %]</label>
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index 9b8916946..79c646f7b 100644
--- a/web/js/map-OpenStreetMap.js
+++ b/web/js/map-OpenStreetMap.js
@@ -94,10 +94,10 @@ OpenLayers.Layer.OSM.MapQuestOpen = OpenLayers.Class(OpenLayers.Layer.OSM, {
*/
initialize: function(name, options) {
var url = [
- "http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
- "http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
- "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
- "http://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png"
+ "http://otile1.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
+ "http://otile2.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
+ "http://otile3.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
+ "http://otile4.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png"
];
options = OpenLayers.Util.extend({
/* Below line added to OSM's file in order to allow minimum zoom level */
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 06:42:35 +0000