diff options
| -rwxr-xr-x | bin/gettext-extract | 6 | ||||
| -rwxr-xr-x | bin/merge_cobrand_po | 2 | ||||
| -rw-r--r-- | t/app/controller/about.t | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/bin/gettext-extract b/bin/gettext-extract index 9d22529d4..b645f57dc 100755 --- a/bin/gettext-extract +++ b/bin/gettext-extract @@ -15,7 +15,7 @@ rm -f $PO # we don't want to extract strings from all the cobrand templates so list # the ones we care about -find templates/web/base templates/web/fixmystreet templates/web/zurich templates/web/fiksgatami templates/web/emptyhomes templates/web/fixmybarangay -name '*.html' > template_list +find templates/web/base templates/web/fixmystreet templates/web/zurich templates/web/fiksgatami -name '*.html' > template_list # Extract from Perl xgettext.pl --gnu-gettext --verbose --output $PO --plugin perl=* --plugin tt2 --directory perllib -f template_list --directory db --directory bin @@ -29,6 +29,6 @@ bin/update_po_header.bash $PO echo "$( bin/gettext-nget-patch )" >> $PO -bin/make_po FixMyStreet-EmptyHomes -bin/make_po FixMyBarangay +#bin/make_po FixMyStreet-EmptyHomes +#bin/make_po FixMyBarangay diff --git a/bin/merge_cobrand_po b/bin/merge_cobrand_po index 2785162cf..9e9c1c075 100755 --- a/bin/merge_cobrand_po +++ b/bin/merge_cobrand_po @@ -24,6 +24,6 @@ for (glob( 'locale/*/LC_MESSAGES' ) ) { my $out = "$_/auto$cobrand.po"; if ( -e $cobrand_po and -e $fms ) { print "$_\n"; - system("msgcat --no-wrap -o $out $fms $cobrand_po"); + system("msgcat --use-first --no-wrap -o $out $fms $cobrand_po"); } } diff --git a/t/app/controller/about.t b/t/app/controller/about.t index b3562ea04..fb0744d6a 100644 --- a/t/app/controller/about.t +++ b/t/app/controller/about.t @@ -17,13 +17,13 @@ FixMyStreet::override_config { # check that geting the page as EHA produces a different page ok $mech->host("reportemptyhomes.co.uk"), 'change host to reportemptyhomes'; $mech->get_ok('/about'); - $mech->content_like(qr{About us ::\s+Report Empty Homes}); + $mech->content_like(qr{About us ::}); $mech->content_contains('html lang="en-gb"'); # check that geting the page as EHA in welsh produces a different page ok $mech->host("cy.reportemptyhomes.co.uk"), 'host to cy.reportemptyhomes'; $mech->get_ok('/about'); - $mech->content_like(qr{Amdanom ni ::\s+Rhoi gwybod am eiddo gwag}); + $mech->content_like(qr{Amdanom ni ::}); $mech->content_contains('html lang="cy"'); }; |