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/extract.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/extract.php')
| -rw-r--r-- | util/extract.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util/extract.php b/util/extract.php index 90127f3c1..bc838c712 100644 --- a/util/extract.php +++ b/util/extract.php @@ -45,19 +45,19 @@ function string_plural_select($n){ if (is_array($a)){ if(substr($a[1],0,1) == '$') continue; - $s .= '$a->strings[' . $a[0] . "] = array(\n"; + $s .= 'App::$strings[' . $a[0] . "] = array(\n"; $s .= "\t0 => ". $a[0]. ",\n"; $s .= "\t1 => ". $a[1]. ",\n"; $s .= ");\n"; } else { if(substr($a,0,1) == '$') continue; - $s .= '$a->strings[' . $a . '] = '. $a . ';' . "\n"; + $s .= 'App::$strings[' . $a . '] = '. $a . ';' . "\n"; } } $zones = timezone_identifiers_list(); foreach($zones as $zone) - $s .= '$a->strings[\'' . $zone . '\'] = \'' . $zone . '\';' . "\n"; + $s .= 'App::$strings[\'' . $zone . '\'] = \'' . $zone . '\';' . "\n"; echo $s;
\ No newline at end of file |