aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/Cobrand/Default.pm
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2011-06-10 12:16:03 +0100
committerStruan Donald <struan@exo.org.uk>2011-06-10 12:16:03 +0100
commit01bb031474e30ea7514fdf0a76f804a2fa18b7aa (patch)
tree0f2018ff828a3490731ad197017bf2f1abf5ab6e /perllib/FixMyStreet/Cobrand/Default.pm
parent5e15e7a7e06117e2c4c3b8edf10c866af71bc5aa (diff)
parent3a81cb62a106adf77d226f3ab9a6c8d4381cb39c (diff)
Merge branch 'migrate_to_catalyst' of ssh://git.mysociety.org/data/git/public/fixmystreet into migrate_to_catalyst
Diffstat (limited to 'perllib/FixMyStreet/Cobrand/Default.pm')
-rw-r--r--perllib/FixMyStreet/Cobrand/Default.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index f3ef136a8..332a0052d 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -194,7 +194,8 @@ Set the language and domain of the site based on the cobrand and host.
sub set_lang_and_domain {
my ( $self, $lang, $unicode, $dir ) = @_;
my $set_lang = mySociety::Locale::negotiate_language(
- 'en-gb,English,en_GB|nb,Norwegian,nb_NO', $lang ); # XXX Testing
+ 'en-gb,English,en_GB', $lang
+ );
mySociety::Locale::gettext_domain( 'FixMyStreet', $unicode, $dir );
mySociety::Locale::change();
return $set_lang;