added curly braces #3254

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder 2017-03-23 21:39:03 +01:00
parent f5227c016d
commit 221cfa8c22
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78

View file

@ -12,12 +12,11 @@ function po2php_run(&$argv, &$argc) {
$pofile = $argv[1]; $pofile = $argv[1];
$outfile = dirname($pofile)."/strings.php"; $outfile = dirname($pofile)."/strings.php";
if (strstr($outfile,'util')) if (strstr($outfile, 'util')) {
$lang = 'en'; $lang = 'en';
else } else {
$lang = str_replace('-','_',basename(dirname($pofile))); $lang = str_replace('-','_',basename(dirname($pofile)));
}
if (!file_exists($pofile)){ if (!file_exists($pofile)){
print "Unable to find '$pofile'\n"; print "Unable to find '$pofile'\n";
@ -31,9 +30,9 @@ function po2php_run(&$argv, &$argc) {
$infile = file($pofile); $infile = file($pofile);
$k = ""; $k = "";
$v = ""; $v = "";
$arr = False; $arr = false;
$ink = False; $ink = false;
$inv = False; $inv = false;
$escape_s_exp = '|[^\\\\]\$[a-z]|'; $escape_s_exp = '|[^\\\\]\$[a-z]|';
function escape_s($match){ function escape_s($match){
return str_replace('$','\$',$match[0]); return str_replace('$','\$',$match[0]);
@ -41,9 +40,11 @@ function po2php_run(&$argv, &$argc) {
foreach ($infile as $l) { foreach ($infile as $l) {
$l = str_replace('\"', DQ_ESCAPE, $l); $l = str_replace('\"', DQ_ESCAPE, $l);
$len = strlen($l); $len = strlen($l);
if ($l[0]=="#") $l=""; if ($l[0] == "#") {
$l = "";
}
if (substr($l,0,15) == '"Plural-Forms: ') { if (substr($l,0,15) == '"Plural-Forms: ') {
$match=Array(); $match = array();
preg_match("|nplurals=([0-9]*); *plural=(.*)[;\\\\]|", $l, $match); preg_match("|nplurals=([0-9]*); *plural=(.*)[;\\\\]|", $l, $match);
$cond = str_replace('n','$n',$match[2]); $cond = str_replace('n','$n',$match[2]);
// define plural select function if not already defined // define plural select function if not already defined
@ -54,27 +55,36 @@ function po2php_run(&$argv, &$argc) {
$out .= '}}'."\n"; $out .= '}}'."\n";
} }
if ($k != "" && substr($l,0,7) == "msgstr ") { if ($k != "" && substr($l,0,7) == "msgstr ") {
if ($ink) { $ink = False; $out .= '$a->strings["'.$k.'"] = '; } if ($ink) {
if ($inv) { $inv = False; $out .= '"'.$v.'"'; } $ink = false;
$out .= '$a->strings["' . $k . '"] = ';
}
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); $v = preg_replace_callback($escape_s_exp, 'escape_s', $v);
$inv = True; $inv = true;
//$out .= $v; //$out .= $v;
} }
if ($k != "" && substr($l, 0, 7) == "msgstr[") { if ($k != "" && substr($l, 0, 7) == "msgstr[") {
if ($ink) { $ink = False; $out .= '$a->strings["'.$k.'"] = '; } if ($ink) {
if ($inv) { $inv = False; $out .= '"'.$v.'"'; } $ink = false;
$out .= '$a->strings["' . $k . '"] = ';
}
if ($inv) {
$inv = false;
$out .= '"' . $v . '"';
}
if (!$arr) { if (!$arr) {
$arr=True; $arr=True;
$out .= "array(\n"; $out .= "array(\n";
} }
$match=Array(); $match = array();
preg_match("|\[([0-9]*)\] (.*)|", $l, $match); preg_match("|\[([0-9]*)\] (.*)|", $l, $match);
$out .= "\t". $out .= "\t".
preg_replace_callback($escape_s_exp,'escape_s',$match[1]) preg_replace_callback($escape_s_exp,'escape_s',$match[1])
@ -92,9 +102,14 @@ function po2php_run(&$argv, &$argc) {
} }
if (substr($l, 0, 6) == "msgid ") { if (substr($l, 0, 6) == "msgid ") {
if ($inv) { $inv = False; $out .= '"'.$v.'"'; } if ($inv) {
if ($k!="") $out .= $arr?");\n":";\n"; $inv = false;
$arr=False; $out .= '"'.$v.'"';
}
if ($k != "") {
$out .= $arr?");\n":";\n";
}
$arr = false;
$k = str_replace("msgid ","",$l); $k = str_replace("msgid ","",$l);
if ($k != '""' ) { if ($k != '""' ) {
$k = trim($k,"\"\r\n"); $k = trim($k,"\"\r\n");
@ -103,7 +118,7 @@ function po2php_run(&$argv, &$argc) {
} }
$k = preg_replace_callback($escape_s_exp, 'escape_s', $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") {
@ -115,14 +130,19 @@ function po2php_run(&$argv, &$argc) {
} }
if ($inv) { $inv = False; $out .= '"'.$v.'"'; } if ($inv) {
if ($k!="") $out .= $arr?");\n":";\n"; $inv = false;
$out .= '"' . $v . '"';
}
if ($k != "") {
$out .= ($arr ? ");\n" : ";\n");
}
$out = str_replace(DQ_ESCAPE, '\"', $out); $out = str_replace(DQ_ESCAPE, '\"', $out);
file_put_contents($outfile, $out); file_put_contents($outfile, $out);
} }
if (array_search(__file__,get_included_files())===0){ if (array_search(__FILE__, get_included_files()) === 0) {
po2php_run($_SERVER["argv"],$_SERVER["argc"]); po2php_run($_SERVER["argv"],$_SERVER["argc"]);
} }