Restoring stable4...
This commit is contained in:
parent
e29681e233
commit
47bad20132
|
@ -92,7 +92,7 @@ class OC_L10N{
|
||||||
$i18ndir = self::findI18nDir($app);
|
$i18ndir = self::findI18nDir($app);
|
||||||
// Localization is in /l10n, Texts are in $i18ndir
|
// Localization is in /l10n, Texts are in $i18ndir
|
||||||
// (Just no need to define date/time format etc. twice)
|
// (Just no need to define date/time format etc. twice)
|
||||||
if(file_exists($i18ndir.$lang.'.php')){
|
if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$APPSROOT."/apps") || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) {
|
||||||
// Include the file, save the data from $CONFIG
|
// Include the file, save the data from $CONFIG
|
||||||
include($i18ndir.$lang.'.php');
|
include($i18ndir.$lang.'.php');
|
||||||
if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){
|
if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){
|
||||||
|
@ -100,7 +100,7 @@ class OC_L10N{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')){
|
||||||
// Include the file, save the data from $CONFIG
|
// 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)){
|
if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)){
|
||||||
|
|
Loading…
Reference in New Issue