summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2012-08-31 00:43:50 +0200
committerThomas Mueller <thomas.mueller@tmit.eu>2012-08-31 00:43:50 +0200
commitbd809574dc06a68d5e1060fb8b9f0484e6a4f1f5 (patch)
tree1ed4302d92afea117b71b2c50fdfbbebf8de6cae
parent26ef01241887d74d7afc1854580eae659601da14 (diff)
downloadnextcloud-server-bd809574dc06a68d5e1060fb8b9f0484e6a4f1f5.tar.gz
nextcloud-server-bd809574dc06a68d5e1060fb8b9f0484e6a4f1f5.zip
fix translations within subfolder /lib
-rw-r--r--lib/l10n.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/l10n.php b/lib/l10n.php
index cfa0e26486b..4560cb7dbb0 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -113,7 +113,10 @@ class OC_L10N{
$i18ndir = self::findI18nDir($app);
// Localization is in /l10n, Texts are in $i18ndir
// (Just no need to define date/time format etc. twice)
- if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) {
+ if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') ||
+ OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') ||
+ OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/') ||
+ OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) {
// Include the file, save the data from $CONFIG
include(strip_tags($i18ndir).strip_tags($lang).'.php');
if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){