diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2015-09-24 15:35:39 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2015-09-28 12:34:18 +0100 |
| commit | b39b1034cdf7036f62be25dbf1cd829e800ea018 (patch) | |
| tree | 3c988a6392e62771c512ab0eecdf9fbb91558d9b /perllib/FixMyStreet | |
| parent | 99610f11646c3b8530dfdb19e08b11650569b9f6 (diff) | |
Remove remaining hardcoded site name from strings.
Add a site_name template parameter available to all templates.
Diffstat (limited to 'perllib/FixMyStreet')
| -rw-r--r-- | perllib/FixMyStreet/App.pm | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report.pm | 3 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/View/Web.pm | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 8883bb91f..5e0bbaf93 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -191,6 +191,8 @@ sub setup_request { $c->log->debug( sprintf "Set lang to '%s' and cobrand to '%s'", $set_lang, $cobrand->moniker ); + $c->stash->{site_name} = Utils::trim_text($c->render_fragment('site-name.html')); + $c->model('DB::Problem')->set_restriction( $cobrand->site_key() ); Memcached::set_namespace( FixMyStreet->config('FMS_DB_NAME') . ":" ); diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index 315a5436c..279994e47 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -112,10 +112,9 @@ sub load_problem_or_display_error : Private { ); } elsif ( $problem->non_public ) { if ( !$c->user || $c->user->id != $problem->user->id ) { - my $site_name = Utils::trim_text($c->render_fragment('site-name.html')); $c->detach( '/page_error_403_access_denied', - [ sprintf(_('That report cannot be viewed on %s.'), $site_name) ] # + [ sprintf(_('That report cannot be viewed on %s.'), $c->stash->{site_name}) ] ); } } diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm index da549ece8..9cc571efc 100644 --- a/perllib/FixMyStreet/App/View/Web.pm +++ b/perllib/FixMyStreet/App/View/Web.pm @@ -40,15 +40,15 @@ TT View for FixMyStreet::App. =head2 loc - [% loc('Some text to localize') %] + [% loc('Some text to localize', 'Optional comment for translator') %] Passes the text to the localisation engine for translations. =cut sub loc { - my ( $self, $c, @args ) = @_; - return _(@args); + my ( $self, $c, $msgid ) = @_; + return _($msgid); } =head2 nget |