From 221cfa8c22b724228ed24618569cabcae582d331 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 23 Mar 2017 21:39:03 +0100 Subject: [PATCH] added curly braces #3254 Signed-off-by: Roland Haeder --- util/po2php.php | 98 +++++++++++++++++++++++++++++-------------------- 1 file changed, 59 insertions(+), 39 deletions(-) diff --git a/util/po2php.php b/util/po2php.php index 5d3429796e..4b801a6de4 100644 --- a/util/po2php.php +++ b/util/po2php.php @@ -12,12 +12,11 @@ function po2php_run(&$argv, &$argc) { $pofile = $argv[1]; $outfile = dirname($pofile)."/strings.php"; - if (strstr($outfile,'util')) + if (strstr($outfile, 'util')) { $lang = 'en'; - else + } else { $lang = str_replace('-','_',basename(dirname($pofile))); - - + } if (!file_exists($pofile)){ print "Unable to find '$pofile'\n"; @@ -26,14 +25,14 @@ function po2php_run(&$argv, &$argc) { print "Out to '$outfile'\n"; - $out="strings["' . $k . '"] = '; + } + if ($inv) { + $inv = false; + $out .= '"' . $v . '"'; + } - - - if ($k!="" && substr($l,0,7)=="msgstr "){ - if ($ink) { $ink = False; $out .= '$a->strings["'.$k.'"] = '; } - if ($inv) { $inv = False; $out .= '"'.$v.'"'; } - - $v = substr($l,8,$len-10); - $v = preg_replace_callback($escape_s_exp,'escape_s',$v); - $inv = True; + $v = substr($l, 8, $len - 10); + $v = preg_replace_callback($escape_s_exp, 'escape_s', $v); + $inv = true; //$out .= $v; } - if ($k!="" && substr($l,0,7)=="msgstr["){ - if ($ink) { $ink = False; $out .= '$a->strings["'.$k.'"] = '; } - if ($inv) { $inv = False; $out .= '"'.$v.'"'; } + if ($k != "" && substr($l, 0, 7) == "msgstr[") { + if ($ink) { + $ink = false; + $out .= '$a->strings["' . $k . '"] = '; + } + if ($inv) { + $inv = false; + $out .= '"' . $v . '"'; + } if (!$arr) { $arr=True; $out .= "array(\n"; } - $match=Array(); + $match = array(); preg_match("|\[([0-9]*)\] (.*)|", $l, $match); $out .= "\t". preg_replace_callback($escape_s_exp,'escape_s',$match[1]) @@ -91,10 +101,15 @@ function po2php_run(&$argv, &$argc) { //$out .= '$a->strings['.$k.'] = '; } - if (substr($l,0,6)=="msgid "){ - if ($inv) { $inv = False; $out .= '"'.$v.'"'; } - if ($k!="") $out .= $arr?");\n":";\n"; - $arr=False; + if (substr($l, 0, 6) == "msgid ") { + if ($inv) { + $inv = false; + $out .= '"'.$v.'"'; + } + if ($k != "") { + $out .= $arr?");\n":";\n"; + } + $arr = false; $k = str_replace("msgid ","",$l); if ($k != '""' ) { $k = trim($k,"\"\r\n"); @@ -102,27 +117,32 @@ function po2php_run(&$argv, &$argc) { $k = ""; } - $k = preg_replace_callback($escape_s_exp,'escape_s',$k); - $ink = True; + $k = preg_replace_callback($escape_s_exp, 'escape_s', $k); + $ink = true; } - if ($inv && substr($l,0,6)!="msgstr") { - $v .= trim($l,"\"\r\n"); - $v = preg_replace_callback($escape_s_exp,'escape_s',$v); + if ($inv && substr($l, 0, 6) != "msgstr") { + $v .= trim($l, "\"\r\n"); + $v = preg_replace_callback($escape_s_exp, 'escape_s', $v); //$out .= '$a->strings['.$k.'] = '; } } - if ($inv) { $inv = False; $out .= '"'.$v.'"'; } - if ($k!="") $out .= $arr?");\n":";\n"; + if ($inv) { + $inv = false; + $out .= '"' . $v . '"'; + } + if ($k != "") { + $out .= ($arr ? ");\n" : ";\n"); + } $out = str_replace(DQ_ESCAPE, '\"', $out); file_put_contents($outfile, $out); } -if (array_search(__file__,get_included_files())===0){ - po2php_run($_SERVER["argv"],$_SERVER["argc"]); +if (array_search(__FILE__, get_included_files()) === 0) { + po2php_run($_SERVER["argv"],$_SERVER["argc"]); }