keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4677 from MrPetovan/bug/4670-fix-po2php-command

Browse source 
Revert po2php command "fix"
This commit is contained in:
Michael Vogel 2018-03-24 22:43:55 +01:00 committed by GitHub
commit b8ffa1dec7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Core/Console/PoToPhp.php
View file

@ -98,7 +98,7 @@ HELP;
$out .= '}}' . "\n"; $out .= '}}' . "\n";
} }
if ($k != "" && substr($l, 0, 7) == 'msgstr ') { if ($k != '' && substr($l, 0, 7) == 'msgstr ') {
if ($ink) { if ($ink) {
$ink = false; $ink = false;
$out .= '$a->strings["' . $k . '"] = '; $out .= '$a->strings["' . $k . '"] = ';
@ -109,11 +109,12 @@ HELP;
$out .= '"' . $v . '"'; $out .= '"' . $v . '"';
} }
$v = substr($l, 8, $len - 11); $v = substr($l, 8, $len - 10);
$v = preg_replace_callback($escape_s_exp, [$this, 'escapeDollar'], $v); $v = preg_replace_callback($escape_s_exp, [$this, 'escapeDollar'], $v);
$inv = true; $inv = true;
} }
if ($k != "" && substr($l, 0, 7) == 'msgstr[') { if ($k != "" && substr($l, 0, 7) == 'msgstr[') {
if ($ink) { if ($ink) {
$ink = false; $ink = false;
@ -125,9 +126,10 @@ HELP;
} }
if (!$arr) { if (!$arr) {
$arr = True; $arr = true;
$out .= "[\n"; $out .= "[\n";
} }
$match = []; $match = [];
preg_match("|\[([0-9]*)\] (.*)|", $l, $match); preg_match("|\[([0-9]*)\] (.*)|", $l, $match);
$out .= "\t" $out .= "\t"
@ -152,9 +154,11 @@ HELP;
$inv = false; $inv = false;
$out .= '"' . $v . '"'; $out .= '"' . $v . '"';
} }
if ($k != "") { if ($k != "") {
$out .= ($arr) ? "];\n" : ";\n"; $out .= ($arr) ? "];\n" : ";\n";
} }
$arr = false; $arr = false;
$k = str_replace("msgid ", "", $l); $k = str_replace("msgid ", "", $l);
if ($k != '""') { if ($k != '""') {