diff options
| -rw-r--r-- | util/po2php.php | 22 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 16 insertions, 8 deletions
diff --git a/util/po2php.php b/util/po2php.php index cf295d8cb..34aedf030 100644 --- a/util/po2php.php +++ b/util/po2php.php @@ -35,10 +35,13 @@ function po2php_run($argv, $argc) { $ink = False; $inv = False; $escape_s_exp = '|[^\\\\]\$[a-z]|'; + function escape_s($match){ return str_replace('$','\$',$match[0]); } + foreach ($infile as $l) { + $l = str_replace(array('$projectname','$Projectname'),array('\$projectname','\$Projectname'),$l); $len = strlen($l); if ($l[0]=="#") $l=""; if (substr($l,0,15)=='"Plural-Forms: '){ @@ -51,9 +54,6 @@ function po2php_run($argv, $argc) { $out .= '}}'."\n"; } - - - if ($k!="" && substr($l,0,7)=="msgstr "){ if ($ink) { $ink = False; $out .= '$a->strings["'.$k.'"] = '; } if ($inv) { $inv = False; $out .= '"'.$v.'"'; } @@ -64,9 +64,14 @@ function po2php_run($argv, $argc) { //$out .= $v; } if ($k!="" && substr($l,0,7)=="msgstr["){ - if ($ink) { $ink = False; $out .= '$a->strings["'.$k.'"] = '; } - if ($inv) { $inv = False; $out .= '"'.$v.'"'; } - + if ($ink) { + $ink = False; + $out .= '$a->strings["'.$k.'"] = '; + } + if ($inv) { + $inv = False; + $out .= '"'.$v.'"'; + } if (!$arr) { $arr=True; $out .= "array(\n"; @@ -79,7 +84,10 @@ function po2php_run($argv, $argc) { .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.'"] = '; + } if ($ink) { diff --git a/version.inc b/version.inc index 75841c2b0..36c8ec9e8 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-05-17.1035 +2015-05-18.1036 |