From 57349e63866b872de6cd692817e32770a2e83f8e Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 6 Oct 2016 18:30:37 +0200 Subject: [PATCH] Remove spellchecker lang from preferences --- api/src/Html/CkEditorConfig.php | 6 ++---- preferences/inc/class.preferences_hooks.inc.php | 12 +----------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/api/src/Html/CkEditorConfig.php b/api/src/Html/CkEditorConfig.php index c7faa51945..679049f8bd 100644 --- a/api/src/Html/CkEditorConfig.php +++ b/api/src/Html/CkEditorConfig.php @@ -89,7 +89,7 @@ class CkEditorConfig } } uasort($skins, 'strcasecmp'); - + // flat skin is reserved for mobile template, although we are not // supporting it on desktop (becuase FF has problem with action icons) if (!\EGroupware\Api\Header\UserAgent::mobile()) unset($skins['flat']); @@ -127,9 +127,7 @@ class CkEditorConfig private static function read_lang_country() { //use the lang and country information to construct a possible lang info for CKEditor UI and scayt_slang - self::$lang = ($GLOBALS['egw_info']['user']['preferences']['common']['spellchecker_lang'] ? - $GLOBALS['egw_info']['user']['preferences']['common']['spellchecker_lang']: - $GLOBALS['egw_info']['user']['preferences']['common']['lang']); + self::$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang']; self::$country = $GLOBALS['egw_info']['user']['preferences']['common']['country']; diff --git a/preferences/inc/class.preferences_hooks.inc.php b/preferences/inc/class.preferences_hooks.inc.php index 6ccc3e2b34..4289066f5a 100644 --- a/preferences/inc/class.preferences_hooks.inc.php +++ b/preferences/inc/class.preferences_hooks.inc.php @@ -98,7 +98,7 @@ class preferences_hooks list(,$country) = explode('-',$lang); if (empty($country) && class_exists('Locale')) $country = Locale::getRegion(Locale::getDefault()); if (empty($country)) $country = 'de'; - + // check for old rte_font_size pref including px and split it in size and unit if (!isset($GLOBALS['egw_setup']) && substr($GLOBALS['egw_info']['user']['preferences']['common']['rte_font_size'], -2) == 'px') @@ -375,16 +375,6 @@ class preferences_hooks 'admin' => false, 'default' => '10' ), - 'spellchecker_lang' => array( - 'type' => 'select', - 'label' => 'Spellchecker language', - 'name' => 'spellchecker_lang', - 'values' => $langs, - 'help' => 'Select the language of the spellchecker integrated into the rich text editor.', - 'xmlrpc' => True, - 'admin' => False, - 'default'=> $lang, - ), 'rte_enter_mode' => array( 'type' => 'select', 'label' => 'Rich text editor enter mode',