2 files changed, 14 insertions, 44 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};