Merge remote branch 'origin/master' into oxfordshire-header

1 files changed, 9 insertions, 0 deletions

diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 9c7aba9e5..b76f4d3ba 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -3,6 +3,7 @@ use Moose;
 use namespace::autoclean;
 
 use Catalyst::Runtime 5.80;
+use DateTime;
 use FixMyStreet;
 use FixMyStreet::Cobrand;
 use Memcached;
@@ -188,6 +189,14 @@ sub setup_request {
         mySociety::MaPit::configure( "http://$host/fakemapit/" );
     }
 
+    # XXX Put in cobrand / do properly
+    if ($c->cobrand->moniker eq 'zurich') {
+        FixMyStreet::DB::Result::Problem->visible_states_add_unconfirmed();
+        DateTime->DefaultLocale( 'de_CH' );
+    } else {
+        DateTime->DefaultLocale( 'en_US' );
+    }
+
     return $c;
 }