From bd809574dc06a68d5e1060fb8b9f0484e6a4f1f5 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Fri, 31 Aug 2012 00:43:50 +0200 Subject: [PATCH] fix translations within subfolder /lib --- lib/l10n.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/l10n.php b/lib/l10n.php index cfa0e26486..4560cb7dbb 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)){