diff options
| -rw-r--r-- | locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 2 | ||||
| -rw-r--r-- | perllib/Page.pm | 14 | ||||
| -rw-r--r-- | templates/website/cobrands/fiksgatami/footer | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 5612155af..357b1973d 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -93,7 +93,7 @@ msgid "" "\"logoie\"></span></a>" msgstr "" "<div id=\"logo\" align=\"center\"><a href=\"http://www.nuug.no/\">NUUG</a> " -"and<br><a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" " +"and<br><a href=\"http://www.mysociety.org/\"><img width=\"133\" " "height=\"26\" border=0 src=\"/i/mysociety-dark.png\" alt=\"mySociety\"><span " "id=\"logoie\"></span></a></div>" diff --git a/perllib/Page.pm b/perllib/Page.pm index 4626e7a8e..07e163b56 100644 --- a/perllib/Page.pm +++ b/perllib/Page.pm @@ -304,6 +304,11 @@ sub footer { my $pc = $q->param('pc') || ''; $pc = "?pc=" . ent($pc) if $pc; + my $creditline = _('Built by <a href="http://www.mysociety.org/">mySociety</a>, using some <a href="http://github.com/mysociety/fixmystreet">clever</a> <a href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.'); + if (mySociety::Config::get('COUNTRY') eq 'NO') { + $creditline = _('Built by <a href="http://www.mysociety.org/">mySociety</a> and maintained by NUUG, using some <a href="http://github.com/mysociety/fixmystreet">clever</a> <a href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.'); + } + %params = (%params, navigation => _('Navigation'), report => _("Report a problem"), @@ -312,6 +317,8 @@ sub footer { help => _("Help"), contact => _("Contact"), pc => $pc, + orglogo => _('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>'), + creditline => $creditline, ); my $html = template_include('footer', $q, template_root($q), %params); @@ -341,9 +348,6 @@ piwikTracker.enableLinkTracking(); EOF } - my $orglogo = _('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>'); - my $creditline = _('Built by <a href="http://www.mysociety.org/">mySociety</a>, using some <a href="http://github.com/mysociety/fixmystreet">clever</a> <a href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.'); - return <<EOF; </div></div> <h2 class="v">$params{navigation}</h2> @@ -355,9 +359,9 @@ EOF <li><a href="/contact">$params{contact}</a></li> </ul> -$orglogo +$params{orglogo} -<p id="footer">$creditline</p> +<p id="footer">$params{creditline}</p> $piwik diff --git a/templates/website/cobrands/fiksgatami/footer b/templates/website/cobrands/fiksgatami/footer index 692eb9031..2221d99a8 100644 --- a/templates/website/cobrands/fiksgatami/footer +++ b/templates/website/cobrands/fiksgatami/footer @@ -8,9 +8,9 @@ <li><a href="/contact">{{ $contact }}</a></li> </ul> -<a id="logo" href="http://www.nuug.no/">NUUG</a> +{{ $orglogo }} -<p id="footer">Built by <a href="http://www.mysociety.org/">mySociety</a> and maintained by NUUG, using some <a href="http://github.com/mysociety/fixmystreet">clever</a> <a href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.</p> +<p id="footer">{{ $creditline }}</p> </body> </html> |