diff options
| -rwxr-xr-x | bin/gettext-extract | 17 | ||||
| -rwxr-xr-x | web/confirm.cgi | 4 |
2 files changed, 12 insertions, 9 deletions
diff --git a/bin/gettext-extract b/bin/gettext-extract index a44ef6667..5924d7200 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.11 2009-11-03 16:42:53 matthew Exp $ +# $Id: gettext-extract,v 1.12 2009-11-19 10:23:40 louise Exp $ if [ -e ../../locale ] then @@ -66,13 +66,16 @@ for X in bci/templates/emails/* bci/templates/emails/emptyhomes/* do # TODO: Should check for "*~" type filenames too, and do the *-livesimply case # with wildcards rather than checking per template - if [ "$X" != "bci/templates/emails/emptyhomes" -a "$X" != "bci/templates/emails/CVS" -a "$X" != "bci/templates/emails/emptyhomes/CVS" ] + if [ ! -d "$X" ] then - echo >> $PO - echo "#: $X" >> $PO - echo msgid \"\" >> $PO - cat "$X" | plain_gettext_escape >> $PO - echo msgstr \"\" >> $PO + if [ "$X" != "bci/templates/emails/emptyhomes" -a "$X" != "bci/templates/emails/CVS" -a "$X" != "bci/templates/emails/emptyhomes/CVS" ] + then + echo >> $PO + echo "#: $X" >> $PO + echo msgid \"\" >> $PO + cat "$X" | plain_gettext_escape >> $PO + echo msgstr \"\" >> $PO + fi fi done diff --git a/web/confirm.cgi b/web/confirm.cgi index f853efa0e..e8d048c9c 100755 --- a/web/confirm.cgi +++ b/web/confirm.cgi @@ -6,7 +6,7 @@ # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org # -# $Id: confirm.cgi,v 1.61 2009-11-11 14:10:27 louise Exp $ +# $Id: confirm.cgi,v 1.62 2009-11-19 10:23:41 louise Exp $ use strict; use Standard; @@ -225,7 +225,7 @@ sub add_questionnaire { unless $already; my $report_url = Cobrand::url($cobrand, "/report/$problem_id", $q); my $out = $q->p({class => 'confirmed'}, sprintf(_('Thank you — you can <a href="%s">view your updated problem</a> on the site.'), $report_url)); - my $display_advert = Cobrand::allow_crosssell_advert($cobrand); + my $display_advert = Cobrand::allow_crosssell_adverts($cobrand); if ($display_advert) { $out .= CrossSell::display_advert($q, $email, $name); } |