extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-04 04:19:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

* admin: allow to choose which kind of spellchecking you would like to employ when using the CK Editor (Options now: Yes, No, Without SpellCheckAsYouType, WebSpellChecker)

Browse Source
This commit is contained in:
Klaus Leithoff 2011-08-02 11:39:59 +00:00
parent b7a221a6ac
commit 11475a41cd
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/lang/egw_de.lang
View File

@ -605,6 +605,8 @@ would you like to show each application's upgrade status ? admin de Soll der Upg
wrong account type: %1 is no %2 !!! admin de Falscher Konten Typ: %1 ist kein(e) %2 !!! wrong account type: %1 is no %2 !!! admin de Falscher Konten Typ: %1 ist kein(e) %2 !!!
wrong admin-account or -password !!! admin de Falscher Admin-Account oder Passwort !!! wrong admin-account or -password !!! admin de Falscher Admin-Account oder Passwort !!!
xml-rpc admin de XML-RPC xml-rpc admin de XML-RPC
yes, but no scayt admin de Ja, aber keine automatische Rechtschreibüberprüfung
yes, use webspellchecker admin de Ja, benutze nur den WebSpellChecker (online)
you can only change the hash, if you set a random password or currently use plaintext passwords! admin de Sie können die Passwort-Verschlüsselung nur ändern, wenn sie ein zufälliges Passwort setzen oder bisher Passworte im Klartext gespeichert haben! you can only change the hash, if you set a random password or currently use plaintext passwords! admin de Sie können die Passwort-Verschlüsselung nur ändern, wenn sie ein zufälliges Passwort setzen oder bisher Passworte im Klartext gespeichert haben!
you have entered an invalid expiration date admin de Sie haben ein ungültiges Ablaufdatum angegeben you have entered an invalid expiration date admin de Sie haben ein ungültiges Ablaufdatum angegeben
you have no email address for your user set !!! admin de Sie haben noch keine E-Mail für den Benutzer vergeben. you have no email address for your user set !!! admin de Sie haben noch keine E-Mail für den Benutzer vergeben.

2
admin/lang/egw_en.lang
View File

@ -614,6 +614,8 @@ would you like to show each application's upgrade status ? admin en Show each ap
wrong account type: %1 is no %2 !!! admin en Wrong account type: %1 is NO %2 ! wrong account type: %1 is no %2 !!! admin en Wrong account type: %1 is NO %2 !
wrong admin-account or -password !!! admin en Wrong admin account or password! wrong admin-account or -password !!! admin en Wrong admin account or password!
xml-rpc admin en XML-RPC xml-rpc admin en XML-RPC
yes, but no scayt admin en Yes, but no Spell Check As You Type (online)
yes, use webspellchecker admin en Yes, use online WebSpellChecker
you can only change the hash, if you set a random password or currently use plaintext passwords! admin en You can change the hash only, if you set a random password or currently use plaintext passwords! you can only change the hash, if you set a random password or currently use plaintext passwords! admin en You can change the hash only, if you set a random password or currently use plaintext passwords!
you have entered an invalid expiration date admin en You have entered an invalid expiration date! you have entered an invalid expiration date admin en You have entered an invalid expiration date!
you have no email address for your user set !!! admin en You have no email address set for your user! you have no email address for your user set !!! admin en You have no email address set for your user!

2
admin/templates/default/config.tpl
View File

@ -132,6 +132,8 @@
<select name="newsettings[enabled_spellcheck]"> <select name="newsettings[enabled_spellcheck]">
<option value="">{lang_No}</option> <option value="">{lang_No}</option>
<option value="True"{selected_enabled_spellcheck_True}>{lang_Yes}</option> <option value="True"{selected_enabled_spellcheck_True}>{lang_Yes}</option>
<option value="YesNoSCAYT"{selected_enabled_spellcheck_YesNoSCAYT}>{lang_Yes,_but_no_SCAYT}</option>
<option value="YesUseWebSpellCheck"{selected_enabled_spellcheck_YesUseWebSpellCheck}>{lang_Yes,_use_WebSpellChecker}</option>
</select> </select>
</td> </td>
</tr> </tr>

12
phpgwapi/inc/class.egw_ckeditor_config.inc.php
View File

@ -173,17 +173,23 @@ class egw_ckeditor_config
*/ */
private static function add_spellchecker_options(&$config, &$spellchecker_button) private static function add_spellchecker_options(&$config, &$spellchecker_button)
{ {
//error_log(__METHOD__.__LINE__.' Spellcheck:'.$GLOBALS['egw_info']['server']['enabled_spellcheck']);
if (isset($GLOBALS['egw_info']['server']['enabled_spellcheck'])) if (isset($GLOBALS['egw_info']['server']['enabled_spellcheck']))
{ {
$spellchecker_button = 'SpellChecker'; $spellchecker_button = 'SpellChecker';
if (!empty($GLOBALS['egw_info']['server']['aspell_path']) && if (!empty($GLOBALS['egw_info']['server']['aspell_path']) &&
is_executable($GLOBALS['egw_info']['server']['aspell_path'])) is_executable($GLOBALS['egw_info']['server']['aspell_path']) &&
!($GLOBALS['egw_info']['server']['enabled_spellcheck']=='YesUseWebSpellCheck')
)
{ {
$spellchecker_button = 'SpellCheck'; $spellchecker_button = 'SpellCheck';
$config['extraPlugins'] = "aspell"; $config['extraPlugins'] = "aspell";
} }
$config['scayt_autoStartup'] = true; if (!($GLOBALS['egw_info']['server']['enabled_spellcheck']=='YesNoSCAYT'))
$config['scayt_sLang'] = self::get_lang().'_'.self::get_country(); {
$config['scayt_autoStartup'] = true;
$config['scayt_sLang'] = self::get_lang().'_'.self::get_country();
}
} }
else else