extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 19:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove spellchecker lang from preferences

Browse Source
This commit is contained in:
Hadi Nategh 2016-10-06 18:30:37 +02:00
parent 5d41a6957f
commit 7d189b9f46
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Html/CkEditorConfig.php
View File

@ -89,7 +89,7 @@ class CkEditorConfig
} }
} }
uasort($skins, 'strcasecmp'); uasort($skins, 'strcasecmp');
// flat skin is reserved for mobile template, although we are not // flat skin is reserved for mobile template, although we are not
// supporting it on desktop (becuase FF has problem with action icons) // supporting it on desktop (becuase FF has problem with action icons)
if (!\EGroupware\Api\Header\UserAgent::mobile()) unset($skins['flat']); if (!\EGroupware\Api\Header\UserAgent::mobile()) unset($skins['flat']);
@ -127,9 +127,7 @@ class CkEditorConfig
private static function read_lang_country() private static function read_lang_country()
{ {
//use the lang and country information to construct a possible lang info for CKEditor UI and scayt_slang //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'] ? self::$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
$GLOBALS['egw_info']['user']['preferences']['common']['spellchecker_lang']:
$GLOBALS['egw_info']['user']['preferences']['common']['lang']);
self::$country = $GLOBALS['egw_info']['user']['preferences']['common']['country']; self::$country = $GLOBALS['egw_info']['user']['preferences']['common']['country'];

12
preferences/inc/class.preferences_hooks.inc.php
View File

@ -98,7 +98,7 @@ class preferences_hooks
list(,$country) = explode('-',$lang); list(,$country) = explode('-',$lang);
if (empty($country) && class_exists('Locale')) $country = Locale::getRegion(Locale::getDefault()); if (empty($country) && class_exists('Locale')) $country = Locale::getRegion(Locale::getDefault());
if (empty($country)) $country = 'de'; if (empty($country)) $country = 'de';
// check for old rte_font_size pref including px and split it in size and unit // check for old rte_font_size pref including px and split it in size and unit
if (!isset($GLOBALS['egw_setup']) && if (!isset($GLOBALS['egw_setup']) &&
substr($GLOBALS['egw_info']['user']['preferences']['common']['rte_font_size'], -2) == 'px') substr($GLOBALS['egw_info']['user']['preferences']['common']['rte_font_size'], -2) == 'px')
@ -375,16 +375,6 @@ class preferences_hooks
'admin' => false, 'admin' => false,
'default' => '10' '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( 'rte_enter_mode' => array(
'type' => 'select', 'type' => 'select',
'label' => 'Rich text editor enter mode', 'label' => 'Rich text editor enter mode',