Tidy up a couple of FIXMEs.

2 files changed, 3 insertions, 12 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm
index 4c048b56d..0edded1e3 100755
--- a/perllib/FixMyStreet/App/Controller/Rss.pm
+++ b/perllib/FixMyStreet/App/Controller/Rss.pm
@@ -30,17 +30,7 @@ sub updates : LocalRegex('^(\d+)$') {
     my ( $self, $c ) = @_;
 
     my $id = $c->req->captures->[0];
-    my $problem = $c->cobrand->problems->find( { id => $id } );
-
-    # FIXME Put these 404/410 checks in central place - Report.pm does it too.
-    if ( !$problem || $problem->state eq 'unconfirmed' ) {
-        $c->detach( '/page_error_404_not_found', [ _('Unknown problem ID') ] );
-    } elsif ( $problem->state eq 'hidden' ) {
-        $c->detach(
-            '/page_error_410_gone',
-            [ _('That report has been removed from FixMyStreet.') ]
-        );
-    }
+    $c->forward( '/report/load_problem_or_display_error', [ $id ] );
 
     $c->stash->{type}      = 'new_updates';
     $c->stash->{qs}        = 'report/' . $id;
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;