Missing placeholders; always call make_emptyhomes_po when extracting new strings;

missing "check your email" text from translation.

4 files changed, 8 insertions, 9 deletions

diff --git a/bin/gettext-extract b/bin/gettext-extract
index 60f4d640b..3615fb246 100755
--- a/bin/gettext-extract
+++ b/bin/gettext-extract
@@ -7,7 +7,7 @@
 # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: gettext-extract,v 1.7 2009-05-27 15:48:38 matthew Exp $
+# $Id: gettext-extract,v 1.8 2009-07-10 16:10:21 matthew Exp $
 
 if [ -e ../../locale ]
 then
@@ -76,4 +76,5 @@ do
     fi
 done
 
+bci/bin/make_emptyhomes_po
 
diff --git a/perllib/Page.pm b/perllib/Page.pm
index c874786a2..040cb59f8 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.148 2009-07-10 15:17:59 matthew Exp $
+# $Id: Page.pm,v 1.149 2009-07-10 16:10:21 matthew Exp $
 #
 
 package Page;
@@ -552,13 +552,13 @@ sub send_email {
     }
     $thing .= ' report' if $thing eq _('problem');
     $thing = 'expression of interest' if $thing eq 'tms';
-    my $out = <<EOF;
+    my $out = sprintf(_(<<EOF), $thing, $action, $thing);
 <h1>Nearly Done! Now check your email...</h1>
 <p>The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient.</p>
 <p>If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.</p>
 <p>You must now click the link in the email we've just sent you &mdash;
-if you do not, your $thing will not be $action.</p>
-<p>(Don't worry &mdash; we'll hang on to your $thing while you're checking your email.)</p>
+if you do not, your %s will not be %s.</p>
+<p>(Don't worry &mdash; we'll hang on to your %s while you're checking your email.)</p>
 EOF
     return $out;
 }
diff --git a/web/faq.cgi b/web/faq.cgi
index cf46b3e65..2046f6955 100755
--- a/web/faq.cgi
+++ b/web/faq.cgi
@@ -6,14 +6,13 @@
 # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org. WWW: http://www.mysociety.org
 #
-# $Id: faq.cgi,v 1.41 2009-07-10 15:00:34 matthew Exp $
+# $Id: faq.cgi,v 1.42 2009-07-10 16:10:22 matthew Exp $
 
 use strict;
 use Standard -db;
 use mySociety::Locale;
 
 my $lastmodified = (stat $0)[9];
-
 sub main {
     my $q = shift;
     print Page::header($q, title=>_('Frequently Asked Questions'));
diff --git a/web/questionnaire.cgi b/web/questionnaire.cgi
index 68a2f2310..be411168d 100755
--- a/web/questionnaire.cgi
+++ b/web/questionnaire.cgi
@@ -6,7 +6,7 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: matthew@mysociety.org. WWW: http://www.mysociety.org
 #
-# $Id: questionnaire.cgi,v 1.39 2009-07-10 15:17:29 matthew Exp $
+# $Id: questionnaire.cgi,v 1.40 2009-07-10 16:10:22 matthew Exp $
 
 use strict;
 use Standard;
@@ -17,7 +17,6 @@ use mySociety::Locale;
 use mySociety::MaPit;
 use mySociety::Web qw(ent);
 
-
 sub main {
     my $q = shift;
     my $out = '';