diff options
| author | AndreasErgenzinger <andreas.ergenzinger@gmx.de> | 2013-04-17 12:34:29 +0400 |
|---|---|---|
| committer | AndreasErgenzinger <andreas.ergenzinger@gmx.de> | 2013-04-17 12:34:29 +0400 |
| commit | 7611d218dfd4a8c1e8a36e9032c68a586c55b5df (patch) | |
| tree | bf71ed56a0bad8eb66cde66a5b86534e62690e53 /lib/l10n.php | |
| parent | 6a5f5ce1579ed27649c8537bfdeb67e97f531289 (diff) | |
merge translations with those from theme
Diffstat (limited to 'lib/l10n.php')
| -rw-r--r-- | lib/l10n.php | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/l10n.php b/lib/l10n.php index 7aef653ef79..7b81d51b5e2 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -122,18 +122,19 @@ class OC_L10N{ ) && file_exists($i18ndir.$lang.'.php')) { // Include the file, save the data from $CONFIG - include strip_tags($i18ndir).strip_tags($lang).'.php'; + $transFile = strip_tags($i18ndir).strip_tags($lang).'.php'; + include $transFile; if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) { $this->translations = $TRANSLATIONS; //merge with translations from theme - $theme = OC_Config::getValue( "theme" ); - if (!is_null($theme)) { - $transFile = OC::$SERVERROOT.'/themes/'.$theme.substr($transFile, strlen(OC::$SERVERROOT)); - if (file_exists($transFile)) { - include $transFile; - $this->translations = array_merge($this->translations, $TRANSLATIONS); - } - } + $theme = OC_Config::getValue( "theme" ); + if (!is_null($theme)) { + $transFile = OC::$SERVERROOT.'/themes/'.$theme.substr($transFile, strlen(OC::$SERVERROOT)); + if (file_exists($transFile)) { + include $transFile; + $this->translations = array_merge($this->translations, $TRANSLATIONS); + } + } } } |