Workaround on possible error

This commit is contained in:
Max Kostikov 2018-07-29 16:26:33 +02:00
parent e078caffd8
commit cb4afd39bd

View File

@ -35,7 +35,7 @@
if (!preg_match("/^msgstr\[[1-9]/",$l)) { if (!preg_match("/^msgstr\[[1-9]/",$l)) {
if ($k!="" && (substr($l,0,7)=="msgstr " || substr($l,0,8)=="msgstr[0")){ if ($k!="" && (substr($l,0,7)=="msgstr " || substr($l,0,8)=="msgstr[0")){
$ink = False; $ink = False;
$k = str_replace('\"','"',$k); $k = stripslashes($k);
$v = ""; $v = "";
if (isset(App::$strings[$k])) { if (isset(App::$strings[$k])) {
$v = App::$strings[$k]; $v = App::$strings[$k];
@ -44,18 +44,18 @@
if (isset(App::$strings[$k])) { if (isset(App::$strings[$k])) {
$v = App::$strings[$k]; $v = App::$strings[$k];
$c = ""; $c = "";
} };
} }
if (!empty($v)) { if (!empty($v)) {
if (is_array($v)) { if (is_array($v)) {
$l = ""; $l = "";
$n = 0; $n = 0;
foreach ($v as &$value) { foreach ($v as &$value) {
$l .= "msgstr[".$n."] \"".str_replace('"','\"',$value)."\"\n"; $l .= "msgstr[".$n."] \"".addcslashes($value,"\"\n")."\"\n";
$n++; $n++;
} }
} else { } else {
$l = "msgstr \"".str_replace('"','\"',$v)."\"\n"; $l = "msgstr \"".addcslashes($v,"\"\n")."\"\n";
} }
} }
} }
@ -63,7 +63,8 @@
if (substr($l,0,6)=="msgid_" || substr($l,0,7)=="msgstr[") $ink = False; if (substr($l,0,6)=="msgid_" || substr($l,0,7)=="msgstr[") $ink = False;
if ($ink) { if ($ink) {
$k .= trim($l,"\"\r\n"); preg_match('/^"(.*)"$/',$l,$m);
$k .= $m[1];
} }
if (substr($l,0,6)=="msgid ") { if (substr($l,0,6)=="msgid ") {