From 81e593ea75c8676af2a0b792e20c6c874143c352 Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Tue, 10 Feb 2009 05:53:27 +0100 Subject: [PATCH] [svn r18398] FS#2867 - FCKEditor: Enabling the advanced file manager to use all available translations. Some corrections were done. --- .../ajaxfilemanager/inc/config.base.php | 25 ++++++++----------- .../plugins/ajaxfilemanager/inc/config.php | 9 ++++++- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/config.base.php b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/config.base.php index 9e4a49ce8e..8c983840b6 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/config.base.php +++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/config.base.php @@ -222,39 +222,36 @@ } */ - @ $editor_lang = Database :: get_language_isocode($language_interface); + @ $langajaxfilemanager = Database :: get_language_isocode($language_interface); // Some code translations are needed. - $editor_lang = strtolower(str_replace('_', '-', $editor_lang)); - if (empty ($editor_lang)) + $langajaxfilemanager = strtolower(str_replace('_', '-', $langajaxfilemanager)); + if (empty ($langajaxfilemanager)) { - $editor_lang = 'en'; + $langajaxfilemanager = 'en'; } - switch ($editor_lang) + switch ($langajaxfilemanager) { case 'uk': - $editor_lang = 'ukr'; + $langajaxfilemanager = 'ukr'; break; case 'pt': - $editor_lang = 'pt_pt'; + $langajaxfilemanager = 'pt_pt'; break; case 'pt-br': - $editor_lang = 'pt_br'; + $langajaxfilemanager = 'pt_br'; break; // Code here other noticed exceptions. } - // Checking for availability of a corresponding language file. - $language_file = api_get_path(SYS_PATH).'main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/langs/'.$editor_lang.'.php'; - if (!file_exists($language_file)) + // Checking for availability of a corresponding language file. + if (!file_exists(api_get_path(SYS_PATH).'main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/langs/'.$langajaxfilemanager.'.php')) { // If there was no language file, use the english one. - $editor_lang = 'en'; + $langajaxfilemanager = 'en'; } - $langajaxfilemanager = $editor_lang; - define('CONFIG_LANG_INDEX', 'language'); //the index in the session define('CONFIG_LANG_DEFAULT', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['language']) && file_exists(DIR_LANG . secureFileName($_GET['language']) . '.php')?secureFileName($_GET['language']):$langajaxfilemanager)); //change it to be your language file base name, such en ?> diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/config.php b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/config.php index 0678b725a7..f9572e4c63 100644 --- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/config.php +++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/config.php @@ -67,8 +67,15 @@ } require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . $configBaseFileName); - + // Loading the selected language file. require_once(DIR_AJAX_LANGS . CONFIG_LANG_DEFAULT . ".php"); + // In order the manager not to look ugly in cases of incompleted translations, + // we will initialize undefined language constants with English strings. + if (CONFIG_LANG_DEFAULT != "en") + { + require_once(DIR_AJAX_LANGS . "en.php"); + } + require_once(DIR_AJAX_INC . "function.base.php"); require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "class.session.php");