|
|
|
|
@ -120,7 +120,7 @@ class OC_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'); |
|
|
|
|
include strip_tags($i18ndir).strip_tags($lang).'.php'; |
|
|
|
|
if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) { |
|
|
|
|
$this->translations = $TRANSLATIONS; |
|
|
|
|
} |
|
|
|
|
@ -128,7 +128,7 @@ class OC_L10N{ |
|
|
|
|
|
|
|
|
|
if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')) { |
|
|
|
|
// Include the file, save the data from $CONFIG |
|
|
|
|
include(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php'); |
|
|
|
|
include OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php'; |
|
|
|
|
if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)) { |
|
|
|
|
$this->localizations = array_merge($this->localizations, $LOCALIZATIONS); |
|
|
|
|
} |
|
|
|
|
|