From 7611d218dfd4a8c1e8a36e9032c68a586c55b5df Mon Sep 17 00:00:00 2001
From: AndreasErgenzinger <andreas.ergenzinger@gmx.de>
Date: Wed, 17 Apr 2013 10:34:29 +0200
Subject: [PATCH] merge translations with those from theme
---
lib/l10n.php | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/lib/l10n.php b/lib/l10n.php
index 7aef653ef7..7b81d51b5e 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);
+ }
+ }
}
}
--
GitLab