mirror of
https://github.com/friendica/friendica
synced 2024-12-23 16:00:16 +00:00
Fix to po2php with '$' in strings
This commit is contained in:
parent
9838245c6c
commit
54e16d753d
1 changed files with 13 additions and 1 deletions
|
@ -26,6 +26,10 @@ function po2php_run($argv, $argc) {
|
||||||
$arr = False;
|
$arr = False;
|
||||||
$ink = False;
|
$ink = False;
|
||||||
$inv = False;
|
$inv = False;
|
||||||
|
$escape_s_exp = '|[^\\\\]\$[a-z]|';
|
||||||
|
function escape_s($match){
|
||||||
|
return str_replace('$','\$',$match[0]);
|
||||||
|
}
|
||||||
foreach ($infile as $l) {
|
foreach ($infile as $l) {
|
||||||
$len = strlen($l);
|
$len = strlen($l);
|
||||||
if ($l[0]=="#") $l="";
|
if ($l[0]=="#") $l="";
|
||||||
|
@ -46,6 +50,7 @@ function po2php_run($argv, $argc) {
|
||||||
if ($inv) { $inv = False; $out .= '"'.$v.'"'; }
|
if ($inv) { $inv = False; $out .= '"'.$v.'"'; }
|
||||||
|
|
||||||
$v = substr($l,8,$len-10);
|
$v = substr($l,8,$len-10);
|
||||||
|
$v = preg_replace_callback($escape_s_exp,'escape_s',$v);
|
||||||
$inv = True;
|
$inv = True;
|
||||||
//$out .= $v;
|
//$out .= $v;
|
||||||
}
|
}
|
||||||
|
@ -59,7 +64,10 @@ function po2php_run($argv, $argc) {
|
||||||
}
|
}
|
||||||
$match=Array();
|
$match=Array();
|
||||||
preg_match("|\[([0-9]*)\] (.*)|", $l, $match);
|
preg_match("|\[([0-9]*)\] (.*)|", $l, $match);
|
||||||
$out .= "\t". $match[1]." => ". $match[2] .",\n";
|
$out .= "\t".
|
||||||
|
preg_replace_callback($escape_s_exp,'escape_s',$match[1])
|
||||||
|
." => "
|
||||||
|
.preg_replace_callback($escape_s_exp,'escape_s',$match[2]) .",\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (substr($l,0,6)=="msgid_") { $ink = False; $out .= '$a->strings["'.$k.'"] = '; };
|
if (substr($l,0,6)=="msgid_") { $ink = False; $out .= '$a->strings["'.$k.'"] = '; };
|
||||||
|
@ -67,6 +75,7 @@ function po2php_run($argv, $argc) {
|
||||||
|
|
||||||
if ($ink) {
|
if ($ink) {
|
||||||
$k .= trim($l,"\"\r\n");
|
$k .= trim($l,"\"\r\n");
|
||||||
|
$k = preg_replace_callback($escape_s_exp,'escape_s',$k);
|
||||||
//$out .= '$a->strings['.$k.'] = ';
|
//$out .= '$a->strings['.$k.'] = ';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,11 +89,14 @@ function po2php_run($argv, $argc) {
|
||||||
} else {
|
} else {
|
||||||
$k = "";
|
$k = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$k = preg_replace_callback($escape_s_exp,'escape_s',$k);
|
||||||
$ink = True;
|
$ink = True;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($inv && substr($l,0,6)!="msgstr") {
|
if ($inv && substr($l,0,6)!="msgstr") {
|
||||||
$v .= trim($l,"\"\r\n");
|
$v .= trim($l,"\"\r\n");
|
||||||
|
$v = preg_replace_callback($escape_s_exp,'escape_s',$v);
|
||||||
//$out .= '$a->strings['.$k.'] = ';
|
//$out .= '$a->strings['.$k.'] = ';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue