diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /util/po2php.php | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'util/po2php.php')
| -rw-r--r-- | util/po2php.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/util/po2php.php b/util/po2php.php index e8f6c2c39..66807083b 100644 --- a/util/po2php.php +++ b/util/po2php.php @@ -55,7 +55,7 @@ function po2php_run($argv, $argc) { } if ($k!="" && substr($l,0,7)=="msgstr "){ - if ($ink) { $ink = False; $out .= '$a->strings["'.$k.'"] = '; } + if ($ink) { $ink = False; $out .= 'App::$strings["'.$k.'"] = '; } if ($inv) { $inv = False; $out .= '"'.$v.'"'; } $v = substr($l,8,$len-10); @@ -66,7 +66,7 @@ function po2php_run($argv, $argc) { if ($k!="" && substr($l,0,7)=="msgstr["){ if ($ink) { $ink = False; - $out .= '$a->strings["'.$k.'"] = '; + $out .= 'App::$strings["'.$k.'"] = '; } if ($inv) { $inv = False; @@ -86,14 +86,14 @@ function po2php_run($argv, $argc) { if (substr($l,0,6)=="msgid_") { $ink = False; - $out .= '$a->strings["'.$k.'"] = '; + $out .= 'App::$strings["'.$k.'"] = '; } if ($ink) { $k .= trim_message($l); $k = preg_replace_callback($escape_s_exp,'escape_s',$k); - //$out .= '$a->strings['.$k.'] = '; + //$out .= 'App::$strings['.$k.'] = '; } if (substr($l,0,6)=="msgid "){ @@ -112,7 +112,7 @@ function po2php_run($argv, $argc) { if ($inv && substr($l,0,6)!="msgstr" && substr($l,0,7)!="msgctxt") { $v .= trim_message($l); $v = preg_replace_callback($escape_s_exp,'escape_s',$v); - //$out .= '$a->strings['.$k.'] = '; + //$out .= 'App::$strings['.$k.'] = '; } if (substr($l,0,7)=="msgctxt") { |