17 files changed, 35 insertions, 49 deletions
diff --git a/db/alert_types.pl b/db/alert_types.pl
index fd1243982..7280ae3b8 100644
--- a/db/alert_types.pl
+++ b/db/alert_types.pl
@@ -27,7 +27,7 @@
     _('The latest local problems reported by users'),
 
 # New problems around a postcode with a particular state
-    _('New problems NEAR {{POSTCODE}} on FixMyStreet'),
+    _('New problems near {{POSTCODE}} on FixMyStreet'),
     _('The latest local problems reported by users'),
 
 # New problems sent to a particular council
diff --git a/db/alert_types.sql b/db/alert_types.sql
index fb1aac1d0..eca83bb6f 100644
--- a/db/alert_types.sql
+++ b/db/alert_types.sql
@@ -71,7 +71,7 @@ insert into alert_type
     item_table, item_where, item_order,
     item_title, item_link, item_description, template)
 values ('postcode_local_problems_state', '', '',
-    'New problems NEAR {{POSTCODE}} on FixMyStreet', '/', 'The latest local problems reported by users',
+    'New problems near {{POSTCODE}} on FixMyStreet', '/', 'The latest local problems reported by users',
     'problem_find_nearby(?, ?, ?) as nearby,problem', 'nearby.problem_id = problem.id and problem.state in (?)', 'created desc',
     '{{title}}, {{confirmed}}', '/report/{{id}}', '{{detail}}', 'alert-problem-nearby');
 
diff --git a/perl-external/files.txt b/perl-external/files.txt
index 762bd9f1d..dba014f2f 100644
--- a/perl-external/files.txt
+++ b/perl-external/files.txt
@@ -98,6 +98,7 @@
 /authors/id/D/DR/DROLSKY/MooseX-SemiAffordanceAccessor-0.09.tar.gz
 /authors/id/D/DR/DROLSKY/MooseX-Types-0.25.tar.gz
 /authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.10.tar.gz
+/authors/id/D/DR/DRTECH/Locale-Maketext-Lexicon-0.86.tar.gz
 /authors/id/F/FD/FDALY/Test-Tester-0.107.tar.gz
 /authors/id/F/FE/FERREIRA/Devel-Hide-0.0008.tar.gz
 /authors/id/F/FE/FERREIRA/Exporter-5.63.tar.gz
@@ -237,6 +238,7 @@
 /authors/id/T/TJ/TJENNESS/File-Temp-0.22.tar.gz
 /authors/id/T/TL/TLINDEN/Config-General-2.50.tar.gz
 /authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz
+/authors/id/T/TO/TODDR/Locale-Maketext-1.19.tar.gz
 /authors/id/T/TO/TOKUHIROM/Test-Requires-0.06.tar.gz
 /authors/id/T/TU/TURNSTEP/DBD-Pg-2.17.2.tar.gz
 /authors/id/T/TU/TURNSTEP/DBD-Pg-2.18.1.tar.gz
diff --git a/perl-external/minicpan/modules/02packages.details.txt.gz b/perl-external/minicpan/modules/02packages.details.txt.gz
index 50bc1f707..a166b7223 100644
--- a/perl-external/minicpan/modules/02packages.details.txt.gz
+++ b/perl-external/minicpan/modules/02packages.details.txt.gz
diff --git a/perl-external/modules.txt b/perl-external/modules.txt
index 4c9f79e11..25c957fb7 100644
--- a/perl-external/modules.txt
+++ b/perl-external/modules.txt
@@ -34,6 +34,7 @@ HTTP::Server::Simple
 HTTP::Server::Simple::CGI
 IO::String
 JSON
+Locale::Maketext::Lexicon
 Moose
 Net::Domain::TLD
 Path::Class
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 1f1086c21..c20dbf6a3 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -763,7 +763,7 @@ sub council_rss_alert_options {
           {
             type      => 'council',
             id        => sprintf( 'district:%s:%s', $district->{id}, $district->{id_name} ),
-            text      => sprintf( _('%s'), $district->{name}),
+            text      => $district->{name},
             rss_text  => sprintf( _('RSS feed of %s'), $district->{name}),
             uri       => $self->uri( '/rss/reports/' . $district->{short_name} ),
           },
@@ -777,7 +777,7 @@ sub council_rss_alert_options {
           {
             type      => 'council',
             id        => sprintf( 'county:%s:%s', $county->{id}, $county->{id_name} ),
-            text      => sprintf( _('%s'), $county->{name}),
+            text      => $county->{name},
             rss_text  => sprintf( _('RSS feed of %s'), $county->{name}),
             uri       => $self->uri( '/rss/reports/' . $county->{short_name} ),
           },
diff --git a/t/app/controller/about.t b/t/app/controller/about.t
index e1a1641fd..84eab005a 100644
--- a/t/app/controller/about.t
+++ b/t/app/controller/about.t
@@ -8,7 +8,7 @@ ok( my $mech = Test::WWW::Mechanize::Catalyst->new, 'Created mech object' );
 
 # check that we can get the page
 $mech->get_ok('/about');
-$mech->content_like(qr{About Us ::\s+FixMyStreet.com});
+$mech->content_like(qr{About us ::\s+FixMyStreet.com});
 $mech->content_contains('html lang="en-gb"');
 
 SKIP: {
diff --git a/t/app/controller/alert.t b/t/app/controller/alert.t
index f32d0d6e9..45257b31b 100644
--- a/t/app/controller/alert.t
+++ b/t/app/controller/alert.t
@@ -22,7 +22,7 @@ $mech->content_contains('html lang="en-gb"');
 
 $mech->get_ok('/alert/list?pc=EH99 1SP');
 $mech->title_like(qr/^Local RSS feeds and email alerts/);
-$mech->content_contains('Local RSS feeds and email alerts for EH99&nbsp;1SP');
+$mech->content_contains('Local RSS feeds and email alerts for &lsquo;EH99&nbsp;1SP&rsquo;');
 $mech->content_contains('html lang="en-gb"');
 $mech->content_contains('Problems within 8.5km');
 $mech->content_contains('rss/pc/EH991SP/2');
diff --git a/templates/email/emptyhomes/en-gb/problem-confirm.txt b/templates/email/emptyhomes/en-gb/problem-confirm.txt
index 25d2a0afd..f8ff3e7ca 100644
--- a/templates/email/emptyhomes/en-gb/problem-confirm.txt
+++ b/templates/email/emptyhomes/en-gb/problem-confirm.txt
@@ -1,20 +1,20 @@
-Subject: Confirm your empty property on reportemptyhomes.com
+Subject: Confirm your empty property report
 
 Hi [% report.user.name %],
 
-Please click on the link below to confirm the empty property you just
-added to reportemptyhomes.com:
+Please click on the link below to confirm the empty property
+report you just added to the site:
 
 [% token_url %]
 
 If your email program does not let you click on this link,
 copy and paste it into your web browser and press return.
 
-Your empty property had the title:
+Your report had the subject:
 [% report.title %]
 
 And details:
 [% report.detail %]
 
 Yours,  
-The reportemptyhomes.com team
+reportemptyhomes.com
diff --git a/templates/emails/empty property-confirm b/templates/emails/empty property-confirm
deleted file mode 100644
index b7381eec8..000000000
--- a/templates/emails/empty property-confirm
+++ /dev/null
@@ -1,20 +0,0 @@
-Subject: Confirm your empty property report
-
-Hi <?=$values['name']?>,
-
-Please click on the link below to confirm the empty property
-report you just added to the site:
-
-<?=$values['url']?>
-
-If your email program does not let you click on this link,
-copy and paste it into your web browser and press return.
-
-Your report had the subject:
-<?=$values['title']?>
-
-And details:
-<?=$values['detail']?>
-
-Yours,  
-reportemptyhomes.com
diff --git a/templates/web/default/alert/list.html b/templates/web/default/alert/list.html
index 5b1677e8b..931636f06 100644
--- a/templates/web/default/alert/list.html
+++ b/templates/web/default/alert/list.html
@@ -3,7 +3,7 @@
 [% INCLUDE 'header.html', title => title %]
 
 [% IF pretty_pc %]
-[% title = tprintf( loc('Local RSS feeds and email alerts for %s'), pretty_pc ) %]
+[% title = tprintf( loc('Local RSS feeds and email alerts for &lsquo;%s&rsquo;'), pretty_pc ) %]
 [% END %]
 
 
@@ -24,7 +24,7 @@
 
   <p>
   [% IF pretty_pc %]
-    [% tprintf( loc('Here are the types of local problem alerts for %s.'), pretty_pc ) | html %]
+    [% tprintf( loc('Here are the types of local problem alerts for &lsquo;%s&rsquo;.'), pretty_pc ) | html %]
   [% END %]
   [% loc('Select which type of alert you\'d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert') %]
   </p>
@@ -38,7 +38,7 @@
   <p id="rss_local">
     <input type="radio" name="feed" id="[% rss_feed_id %]" value="[% rss_feed_id %]"[% IF rss_feed_id == selected_feed || selected_feed == '' %] checked[% END %]>
     <label for="[% rss_feed_id %]">[% tprintf( loc('Problems within %.1fkm of this location'), population_radius ) %]</label>
-    ([% loc('a default distance which covers roughly 200,000 people') %]) <a href='[% rss_feed_uri %]'>
+    [% loc('(a default distance which covers roughly 200,000 people)') %] <a href='[% rss_feed_uri %]'>
       <img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a>
   </p>
 
diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html
index de970e98a..4c728806b 100755
--- a/templates/web/default/around/display_location.html
+++ b/templates/web/default/around/display_location.html
@@ -74,8 +74,8 @@
 
 <p id="alert_links_area">
     <a id="email_alert" rel="nofollow" href="[% email_url | html %]">
-        [% loc('Email me new local problems') %]
-    </a> |
+        [%- loc('Email me new local problems') -%]
+</a> |
     <a href="[% rss_url | html %]" id="rss_alert">
         <span>[% rss_alt %]</span>
         <img src="/i/feed.png" width="16" height="16" title="[% rss_title %]" alt="[% rss_alt %]" border="0" style="vertical-align: top">
diff --git a/templates/web/default/auth/token.html b/templates/web/default/auth/token.html
index 16dfbb11c..b3a3d5cc8 100644
--- a/templates/web/default/auth/token.html
+++ b/templates/web/default/auth/token.html
@@ -14,7 +14,7 @@
 
 [% ELSE %]
 
-<h1>[% loc('Please check you email') %]</h1>
+<h1>[% loc('Please check your email') %]</h1>
 
 <p>We have sent you an email containing a link to confirm your account.</p>
 
@@ -22,4 +22,4 @@
 
 [% END %]
 
-[% INCLUDE 'footer.html' %]
-\ No newline at end of file
+[% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/contact/index.html b/templates/web/default/contact/index.html
index 35c7f7e36..8fd280ab8 100644
--- a/templates/web/default/contact/index.html
+++ b/templates/web/default/contact/index.html
@@ -69,7 +69,7 @@
    <div class="form-error">[% field_errors.name %]</div>
 [% END %]
 <div class="form-field">
-<label for="form_name">Your name:</label>
+<label for="form_name">[% loc('Your name:') %]</label>
 <input type="text" name="name" id="form_name" value="[% form_name %]" size="30"></div>
 
 
@@ -77,24 +77,24 @@
    <div class="form-error">[% field_errors.em %]</div>
 [% END %]
 <div class="form-field">
-<label for="form_email">Your&nbsp;email:</label>
+<label for="form_email">[% loc('Your&nbsp;email:') %]</label>
 <input type="text" name="em" id="form_email" value="[% em %]" size="30"></div>
 
 [% IF field_errors.subject %]
    <div class="form-error">[% field_errors.subject %]</div>
 [% END %]
 <div class="form-field">
-<label for="form_subject">Subject:</label>
+<label for="form_subject">[% loc('Subject:') %]</label>
 <input type="text" name="subject" id="form_subject" value="[% subject %]" size="30"></div>
 
 [% IF field_errors.message %]
    <div class="form-error">[% field_errors.message %]</div>
 [% END %]
 <div class="form-field">
-<label for="form_message">Message:</label>
+<label for="form_message">[% loc('Message:') %]</label>
 
 <textarea name="message" id="form_message" rows="7" cols="50">[% message %]</textarea></div>
-<div class="checkbox"><input type="submit" value="Post"></div>
+<div class="checkbox"><input type="submit" value="[% loc('Post') %]"></div>
 
 </form>
 
diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html
index 2225934a5..fdef6c775 100644
--- a/templates/web/default/report/display.html
+++ b/templates/web/default/report/display.html
@@ -1,7 +1,7 @@
 [% 
     PROCESS "maps/${map.type}.html";
 
-    problem_title = problem.title | html;
+    problem_title = problem.title _ ' - ' _ loc('Viewing a problem') | html;
     INCLUDE 'header.html'
         title = problem_title
         rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ]
@@ -42,7 +42,7 @@
     <a rel="nofollow" id="email_alert" href="[% c.uri_for( '/alert', { type => 'updates', id => problem.id } ) %]">[% loc('Email me updates' ) %]</a>
 
     <form action="[% c.uri_for( '/alert/subscribe' ) %]" method="post" id="email_alert_box">
-        <p>[% loc('Receive email when updates are left on this problem' ) %]</p>
+        <p>[% loc('Receive email when updates are left on this problem.' ) %]</p>
         <label class="n" for="alert_rznvy">[% loc('Email') %]</label>
         <input type="text" name="rznvy" id="alert_rznvy" value="[% email %]" size="30">
         <input type="hidden" name="id" value="[% problem.id %]">
@@ -52,7 +52,7 @@
     </form>
     &nbsp;
     <a href="[% c.uri_for( '/rss', problem.id ) %]">
-        <img src="/i/feed.png" width="16" height="16" title="[% loc('Rss feed') %]" alt="[% loc('Rss feed of updates to the problem' ) %]" border="0" style="vertical-align: middle">
+        <img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% loc('RSS feed of updates to this problem' ) %]" border="0" style="vertical-align: middle">
     </a>
 </div>
 
diff --git a/templates/web/default/static/about.html b/templates/web/default/static/about.html
index 7219f6320..9c319f051 100644
--- a/templates/web/default/static/about.html
+++ b/templates/web/default/static/about.html
@@ -1,4 +1,4 @@
-[% INCLUDE 'header.html', title => loc('About Us') %]
+[% INCLUDE 'header.html', title => loc('About us') %]
 
 <h1>[% loc('About us') %]</h1>
 
@@ -6,4 +6,4 @@
 
 [%# FIXME - put in blurb here %]
 
-[% INCLUDE 'footer.html' %]
-\ No newline at end of file
+[% INCLUDE 'footer.html' %]
diff --git a/templates/web/emptyhomes/tokens/confirm_problem.html b/templates/web/emptyhomes/tokens/confirm_problem.html
index c4d246430..7bcf8acdf 100644
--- a/templates/web/emptyhomes/tokens/confirm_problem.html
+++ b/templates/web/emptyhomes/tokens/confirm_problem.html
@@ -28,7 +28,10 @@
     %]</p>
 [% ELSE %]
     <p>[%
-        loc( 'Thank you for reporting an empty property on ReportEmptyHomes.com.' )
+        loc( 'Thank you for reporting this empty property on ReportEmptyHomes.com.
+At present the report cannot be sent through to the council for this area. We
+are working with councils to link them into the system so that as many areas
+as possible will be covered.')
     %]</p>
 [% END %]