Merge remote-tracking branch 'origin/master' into bromley

2 files changed, 5 insertions, 2 deletions

diff --git a/bin/make_css b/bin/make_css
index 70625b2f4..27cbec1b5 100755
--- a/bin/make_css
+++ b/bin/make_css
@@ -15,9 +15,10 @@ DIRECTORY=$(cd `dirname $0`/../web && pwd)
 
 # FixMyStreet uses compass
 compass compile --output-style compressed $DIRECTORY/cobrands/fixmystreet
+compass compile --output-style compressed $DIRECTORY/cobrands/bromley
 
 # The rest are plain sass
-for scss in `find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq | grep -v cobrands/fixmystreet`
+for scss in `find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq | grep -v "cobrands/\(fixmystreet\|bromley\)"`
 do
     sass --scss --update --style compressed $scss
 done
diff --git a/bin/populate_bing_cache b/bin/populate_bing_cache
index a3bef6759..17c8911d0 100755
--- a/bin/populate_bing_cache
+++ b/bin/populate_bing_cache
@@ -9,6 +9,8 @@ use Data::Dumper;
 use FixMyStreet::App;
 use FixMyStreet::Geocode::Bing;
 
+my $bing_culture = 'en-GB';
+
 my $reports = FixMyStreet::App->model('DB::Problem')->search(
     {
         geocode   => undef,
@@ -46,7 +48,7 @@ while ( my $report = $reports->next ) {
     next if $report->geocode;
 
     my $j = FixMyStreet::Geocode::Bing::reverse( $report->latitude,
-        $report->longitude );
+        $report->longitude, $bing_culture );
 
     $report->geocode($j);
     $report->update;