aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/App
diff options
context:
space:
mode:
Diffstat (limited to 'perllib/FixMyStreet/App')
-rw-r--r--perllib/FixMyStreet/App/Controller/Root.pm18
-rw-r--r--perllib/FixMyStreet/App/View/Web.pm7
2 files changed, 8 insertions, 17 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Root.pm b/perllib/FixMyStreet/App/Controller/Root.pm
index b61650f79..debddef38 100644
--- a/perllib/FixMyStreet/App/Controller/Root.pm
+++ b/perllib/FixMyStreet/App/Controller/Root.pm
@@ -22,23 +22,13 @@ Set up general things for this instance
=cut
-sub auto {
+sub auto : Private {
my ( $self, $c ) = @_;
- return;
-}
-
-=head2 index
-
-The root page (/)
-
-=cut
-
-sub index : Path : Args(0) {
- my ( $self, $c ) = @_;
+ # decide which cobrand this request should use
+ $c->setup_cobrand();
- # Hello World
- $c->response->body( $c->welcome_message );
+ return 1;
}
=head2 default
diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm
index dcda54db9..306e4c5a7 100644
--- a/perllib/FixMyStreet/App/View/Web.pm
+++ b/perllib/FixMyStreet/App/View/Web.pm
@@ -4,12 +4,13 @@ use base 'Catalyst::View::TT';
use strict;
use warnings;
-use FixMyStreet::App;
+use mySociety::Locale;
+use FixMyStreet;
__PACKAGE__->config(
TEMPLATE_EXTENSION => '.html',
INCLUDE_PATH => [ #
- FixMyStreet::App->path_to( 'templates', 'web', 'default' ),
+ FixMyStreet->path_to( 'templates', 'web', 'default' ),
],
render_die => 1,
expose_methods => ['loc'],
@@ -37,7 +38,7 @@ FIXME - currently just passes through.
sub loc {
my ( $self, $c, @args ) = @_;
- return join ' ', @args;
+ return _(@args);
}
1;