Some changes for Welsh stuff.

8 files changed, 93 insertions, 73 deletions

diff --git a/bin/make_emptyhomes_po b/bin/make_emptyhomes_po
index bcb674a23..5d227a25f 100755
--- a/bin/make_emptyhomes_po
+++ b/bin/make_emptyhomes_po
@@ -6,6 +6,8 @@ use strict;
 
 use POSIX;
 use FindBin;
+use lib "$FindBin::Bin/../perllib";
+use PoChange;
 
 chdir("$FindBin::Bin/../../locale");
 mkdir("en_GB.UTF-8");
@@ -54,24 +56,7 @@ while(<MAINPO>) {
     } elsif ($start && (m/^msgstr ""/ || m/^msgstr\[0\] ""/)) {
         # start of translated text - translate English into Empty Homes language
 
-        $buffer =~ s/FixMyStreet/Empty Homes Agency/g;
-        $buffer =~ s/\bproblem\b/empty property/g;
-        $buffer =~ s/\bProblem\b/Empty property/g;
-        $buffer =~ s/\bproblems\b/empty properties/g;
-        $buffer =~ s/\bProblems\b/Empty properties/g;
-        $buffer =~ s/a empty/an empty/g;
-        $buffer =~ s/fixed/returned to use/g;
-
-        $buffer =~ s/Recently put back into use empty properties/Recent empty properties put back into use/;
-        $buffer =~ s/New empty properties/New empty property reports/;
-        $buffer =~ s/Older empty properties/Older empty property reports/;
-        $buffer =~ s/Report, view, or discuss local empty properties/Report and view empty properties/;
-
-        $buffer =~ s/\(like graffiti.*\)/ /;
-        $buffer =~ s/(Please enter your full name).*? -/$1 -/;
-
-        $buffer =~ s/We send it to the council on your behalf/The details will be sent directly to the right person in the local council for them to take action/;
-        $buffer =~ s/To find out what local alerts we have for you/To find out what local alerts we have in your area, council or ward/;
+        $buffer = PoChange::fixmystreet_to_reportemptyhomes($buffer);
 
         print EHAPO $buffer;
 
diff --git a/bin/make_emptyhomes_welsh_po b/bin/make_emptyhomes_welsh_po
index e02d9b009..9f353f759 100755
--- a/bin/make_emptyhomes_welsh_po
+++ b/bin/make_emptyhomes_welsh_po
@@ -6,15 +6,11 @@ use strict;
 
 use POSIX;
 use FindBin;
-
-chdir("$FindBin::Bin/../../locale");
-mkdir("en_GB.UTF-8");
-mkdir("en_GB.UTF-8/LC_MESSAGES");
-mkdir("cy_GB.UTF-8");
-mkdir("cy_GB.UTF-8/LC_MESSAGES");
+use lib "$FindBin::Bin/../perllib";
+use PoChange;
 
 # First read in translation and match up.
-open(INPO, "$FindBin::Bin/" . shift) or die $!;
+open(INPO, shift) or die $!;
 
 my $state = 'start';
 my $msgid = '';
@@ -39,6 +35,13 @@ while (<INPO>) {
     }
 }
 $lookup{$msgid} = $msgstr;
+close INPO;
+
+chdir("$FindBin::Bin/../../locale");
+mkdir("en_GB.UTF-8");
+mkdir("en_GB.UTF-8/LC_MESSAGES");
+mkdir("cy_GB.UTF-8");
+mkdir("cy_GB.UTF-8/LC_MESSAGES");
 
 open(MAINPO, 'FixMyStreet.po') or die;
 open(OUTPO, ">cy_GB.UTF-8/LC_MESSAGES/FixMyStreet-EmptyHomes.po") or die;
@@ -78,25 +81,7 @@ while(<MAINPO>) {
 
         print OUTPO $buffer;
 
-        $buffer =~ s/FixMyStreet/Empty Homes Agency/g;
-        $buffer =~ s/\bproblem\b/empty property/g;
-        $buffer =~ s/\bProblem\b/Empty property/g;
-        $buffer =~ s/\bproblems\b/empty properties/g;
-        $buffer =~ s/\bProblems\b/Empty properties/g;
-        $buffer =~ s/a empty/an empty/g;
-        $buffer =~ s/fixed/returned to use/g;
-
-        $buffer =~ s/Recently put back into use empty properties/Recent empty properties put back into use/;
-        $buffer =~ s/New empty properties/New empty property reports/;
-        $buffer =~ s/Older empty properties/Older empty property reports/;
-        $buffer =~ s/Report, view, or discuss local empty properties/Report and view empty properties/;
-
-        $buffer =~ s/\(like graffiti.*\)/ /;
-        $buffer =~ s/(Please enter your full name).*? -/$1 -/;
-
-        $buffer =~ s/We send it to the council on your behalf/The details will be sent directly to the right person in the local council for them to take action/;
-        $buffer =~ s/To find out what local alerts we have for you/To find out what local alerts we have in your area, council or ward/;
-
+        $buffer = PoChange::fixmystreet_to_reportemptyhomes($buffer);
 	$buffer =~ s/"\n"//g;
 	if ($lookup{$buffer}) {
 	    print OUTPO $lookup{$buffer};
diff --git a/perllib/Page.pm b/perllib/Page.pm
index 843edcb64..32a7a5973 100644
--- a/perllib/Page.pm
+++ b/perllib/Page.pm
@@ -6,7 +6,7 @@
 # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: Page.pm,v 1.144 2009-05-27 13:53:52 matthew Exp $
+# $Id: Page.pm,v 1.145 2009-07-07 11:49:06 matthew Exp $
 #
 
 package Page;
@@ -103,7 +103,9 @@ sub microsite {
     $q->{site} = 'guardian' if $host =~ /guardian/;
 
     if ($q->{site} eq 'emptyhomes') {
-        mySociety::Locale::negotiate_language('en-gb,English,en_GB|cy,Cymraeg,cy_GB');
+        my $lang;
+        $lang = 'cy' if $host =~ /cy/;
+        mySociety::Locale::negotiate_language('en-gb,English,en_GB|cy,Cymraeg,cy_GB', $lang);
         mySociety::Locale::gettext_domain('FixMyStreet-EmptyHomes');
         mySociety::Locale::change();
     } else {
@@ -150,10 +152,19 @@ sub header ($%) {
         open FP, $file . '/../templates/website/' . $q->{site} . '-header';
         $html = join('', <FP>);
         close FP;
-        $html =~ s#<!-- TITLE -->#$title#;
+        my %vars = (
+            'report' => _('Report a problem'),
+            'reports' => _('All reports'),
+            'alert' => _('Local alerts'),
+            'faq' => _('Help'),
+            'about' => _('About us'),
+            'title' => $title,
+            'site_title' => _('Report Empty Homes'),
+        );
+        $html =~ s#{{ ([a-z_]+) }}#$vars{$1}#g;
     } else {
         my $fixmystreet = _('FixMyStreet');
-	my $lang = $mySociety::Locale::lang;
+        my $lang = $mySociety::Locale::lang;
         $html = <<EOF;
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html lang="$lang">
@@ -595,27 +606,27 @@ sub display_problem_text {
     if ($q->{site} eq 'emptyhomes') {
         if ($problem->{anonymous}) {
             $out .= sprintf(_('%s, reported anonymously at %s'), ent($problem->{category}), prettify_epoch($problem->{time}));
-	} else {
+        } else {
             $out .= sprintf(_('%s, reported by %s at %s'), ent($problem->{category}), ent($problem->{name}), prettify_epoch($problem->{time}));
-	}
+        }
     } else {
         if ($problem->{service} && $problem->{category} && $problem->{category} ne 'Other' && $problem->{anonymous}) {
-	    $out .= sprintf(_('Reported by %s in the %s category anonymously at %s'), ent($problem->{service}), ent($problem->{category}), prettify_epoch($problem->{time}));
+            $out .= sprintf(_('Reported by %s in the %s category anonymously at %s'), ent($problem->{service}), ent($problem->{category}), prettify_epoch($problem->{time}));
         } elsif ($problem->{service} && $problem->{category} && $problem->{category} ne 'Other') {
-	    $out .= sprintf(_('Reported by %s in the %s category by %s at %s'), ent($problem->{service}), ent($problem->{category}), ent($problem->{name}), prettify_epoch($problem->{time}));
-	} elsif ($problem->{service} && $problem->{anonymous}) {
-	    $out .= sprintf(_('Reported by %s anonymously at %s'), ent($problem->{service}), prettify_epoch($problem->{time}));
-	} elsif ($problem->{service}) {
-	    $out .= sprintf(_('Reported by %s by %s at %s'), ent($problem->{service}), ent($problem->{name}), prettify_epoch($problem->{time}));
-	} elsif ($problem->{category} && $problem->{category} ne 'Other' && $problem->{anonymous}) {
-	    $out .= sprintf(_('Reported in the %s category anonymously at %s'), ent($problem->{category}), prettify_epoch($problem->{time}));
-	} elsif ($problem->{category} && $problem->{category} ne 'Other') {
-	    $out .= sprintf(_('Reported in the %s category by %s at %s'), ent($problem->{category}), ent($problem->{name}), prettify_epoch($problem->{time}));
-	} elsif ($problem->{anonymous}) {
-	    $out .= sprintf(_('Reported anonymously at %s'), prettify_epoch($problem->{time}));
-	} else {
-	    $out .= sprintf(_('Reported by %s at %s'), ent($problem->{name}), prettify_epoch($problem->{time}));
-	}
+            $out .= sprintf(_('Reported by %s in the %s category by %s at %s'), ent($problem->{service}), ent($problem->{category}), ent($problem->{name}), prettify_epoch($problem->{time}));
+        } elsif ($problem->{service} && $problem->{anonymous}) {
+            $out .= sprintf(_('Reported by %s anonymously at %s'), ent($problem->{service}), prettify_epoch($problem->{time}));
+        } elsif ($problem->{service}) {
+            $out .= sprintf(_('Reported by %s by %s at %s'), ent($problem->{service}), ent($problem->{name}), prettify_epoch($problem->{time}));
+        } elsif ($problem->{category} && $problem->{category} ne 'Other' && $problem->{anonymous}) {
+            $out .= sprintf(_('Reported in the %s category anonymously at %s'), ent($problem->{category}), prettify_epoch($problem->{time}));
+        } elsif ($problem->{category} && $problem->{category} ne 'Other') {
+            $out .= sprintf(_('Reported in the %s category by %s at %s'), ent($problem->{category}), ent($problem->{name}), prettify_epoch($problem->{time}));
+        } elsif ($problem->{anonymous}) {
+            $out .= sprintf(_('Reported anonymously at %s'), prettify_epoch($problem->{time}));
+        } else {
+            $out .= sprintf(_('Reported by %s at %s'), ent($problem->{name}), prettify_epoch($problem->{time}));
+        }
     }
     $out .= '; ' . _('the map was not used so pin location may be inaccurate') unless ($problem->{used_map});
     if ($problem->{council}) {
diff --git a/perllib/PoChange.pm b/perllib/PoChange.pm
new file mode 100644
index 000000000..8142b3caa
--- /dev/null
+++ b/perllib/PoChange.pm
@@ -0,0 +1,37 @@
+#!/usr/bin/perl -w
+use strict;
+
+package PoChange;
+
+# Takes a msgid from the main FixMyStreet .po file and
+# converts it to a msgid for the ReportEmptyHomes .po file
+sub fixmystreet_to_reportemptyhomes($) {
+    my $s = shift;
+
+    $s =~ s/FixMyStreet/reportemptyhomes.com/g;
+    $s =~ s/\bproblem\b/empty property/g;
+    $s =~ s/\bProblem\b/Empty property/g;
+    $s =~ s/\bproblems\b/empty properties/g;
+    $s =~ s/\bProblems\b/Empty properties/g;
+    $s =~ s/a empty/an empty/g;
+    $s =~ s/fixed/returned to use/g;
+
+    $s =~ s/Recently put back into use empty properties/Recent empty properties put back into use/;
+    $s =~ s/New empty properties/New empty property reports/;
+    $s =~ s/Older empty properties/Older empty property reports/;
+    $s =~ s/Report, view, or discuss local empty properties/Report and view empty properties/;
+
+    $s =~ s/\(like graffiti.*\)/ /;
+    $s =~ s/(Please enter your full name).*? -/$1 -/;
+
+    $s =~ s/We send it to the council on your behalf/The details will be sent directly to the right person in the local council for them to take action/;
+    $s =~ s/To find out what local alerts we have for you/To find out what local alerts we have in your area, council or ward/;
+    $s =~ s/Local alerts/Get local reports/;
+    $s =~ s/All reports/Reports/;
+    $s =~ s/Report an empty property/Report a property/;
+    $s =~ s/Help/FAQs/;
+
+    return $s;
+}
+
+1;
diff --git a/templates/website/emptyhomes-header b/templates/website/emptyhomes-header
index ecaa3fb45..b499e3fd8 100644
--- a/templates/website/emptyhomes-header
+++ b/templates/website/emptyhomes-header
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html lang="en-gb">
 <head>
-<title><!-- TITLE -->Report Empty Homes - Empty Homes Agency</title>
+<title>{{ title }}{{ site_title }}</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <script type="text/javascript" src="/yui/utilities.js"></script>
 <script type="text/javascript" src="/js.js"></script>
@@ -17,16 +17,18 @@
 <body>
 
 <div id="header">
-<a href="http://www.emptyhomes.com/"><img border="0" src="/i/eha.png" alt="Empty Homes Agency" width="272" height="71"></a>
+<a href="http://www.emptyhomes.com/"><img border="0" src="/i/eha-logo.png" alt="Empty Homes Agency" width="115" height="71" align="middle" style="margin-right:0.5em"></a>
+<a href="http://www.sheltercymru.org.uk/"><img border="0" src="/i/Sheltercymru47.gif" alt="Shelter Cymru" width="114" height="47" align="middle"></a>
 </div>
 
 <div id="navigation">
       <ul>
-      <li><a href="/">Report a property</a>
-      <li><a href="/reports">Reports</a></li>
-      <li><a href="/alert">Get local reports</a></li>
-      <li><a href="/faq">FAQs</a></li>
-      <li><a href="/about">About us</a></li>
+      <li><a href="/">{{ report }}</a>
+      <li><a href="/reports">{{ reports }}</a></li>
+      <li><a href="/alert">{{ alert }}</a></li>
+      <li><a href="/faq">{{ faq }}</a></li>
+      <li><a href="/about">{{ about }}</a></li>
+      {{ lang }}
       </ul>
 </div>
 
diff --git a/templates/website/scambs-header b/templates/website/scambs-header
index bc17d2535..91a4f299e 100644
--- a/templates/website/scambs-header
+++ b/templates/website/scambs-header
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html lang="en-gb">
 <head>
-<title><!-- TITLE -->Envirocrime - South Cambridgeshire District Council</title>
+<title>{{ title }}Envirocrime - South Cambridgeshire District Council</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <script type="text/javascript" src="/yui/utilities.js"></script>
 <script type="text/javascript" src="/js.js"></script>
diff --git a/web/i/Sheltercymru47.gif b/web/i/Sheltercymru47.gif
new file mode 100644
index 000000000..b7eb2c4ff
--- /dev/null
+++ b/web/i/Sheltercymru47.gif
diff --git a/web/i/eha-logo.png b/web/i/eha-logo.png
new file mode 100644
index 000000000..5cc912521
--- /dev/null
+++ b/web/i/eha-logo.png