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/php2po.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/php2po.php')
| -rw-r--r-- | util/php2po.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util/php2po.php b/util/php2po.php index f071c60bf..ff41e6d1e 100644 --- a/util/php2po.php +++ b/util/php2po.php @@ -34,10 +34,10 @@ $ink = False; $v = '""'; //echo "DBG: k:'$k'\n"; - if (isset($a->strings[$k])) { - $v= '"'.$a->strings[$k].'"'; + if (isset(App::$strings[$k])) { + $v= '"'.App::$strings[$k].'"'; //echo "DBG\n"; - //var_dump($k, $v, $a->strings[$k], $v); + //var_dump($k, $v, App::$strings[$k], $v); //echo "/DBG\n"; } |