summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-02-28 12:00:12 +0000
committeralecpl <alec@alec.pl>2012-02-28 12:00:12 +0000
commit2b4855b1aaaef854fd22cbc260788a5c05794abb (patch)
treefed9e8dac2dd419dfe008062d764af26c15d359a
parente4f822a34aa05f059ad53a4bae8734a14f6f37ef (diff)
- Add Russian to the spellchecker languages list (#1488135)
-rw-r--r--CHANGELOG1
-rw-r--r--program/js/googiespell.js6
-rw-r--r--program/steps/mail/compose.inc5
3 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c96c3b565..b4c1c8ae8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Add Russian to the spellchecker languages list (#1488135)
- Remember custom skin selection after logout (#1488355)
- Make sure About tab is always the last tab (#1488257)
- Fix issue with folder creation under INBOX. namespace (#1488349)
diff --git a/program/js/googiespell.js b/program/js/googiespell.js
index c074ec1ad..06aef855a 100644
--- a/program/js/googiespell.js
+++ b/program/js/googiespell.js
@@ -42,9 +42,9 @@ function GoogieSpell(img_dir, server_url, has_dict)
this.org_lang_to_word = {
"da": "Dansk", "de": "Deutsch", "en": "English",
- "es": "Espa&#241;ol", "fr": "Fran&#231;ais", "it": "Italiano",
- "nl": "Nederlands", "pl": "Polski", "pt": "Portugu&#234;s",
- "fi": "Suomi", "sv": "Svenska"
+ "es": "Español", "fr": "Français", "it": "Italiano",
+ "nl": "Nederlands", "pl": "Polski", "pt": "Português",
+ "ru": "Русский", "fi": "Suomi", "sv": "Svenska"
};
this.lang_to_word = this.org_lang_to_word;
this.langlist_codes = this.array_keys(this.lang_to_word);
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 47342276e..d5356e0cf 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -784,14 +784,14 @@ function rcmail_compose_body($attrib)
// include HTML editor
rcube_html_editor();
- // include GoogieSpell
+ // Set language list
if (!empty($CONFIG['enable_spellcheck'])) {
$engine = $RCMAIL->config->get('spellcheck_engine','googie');
$dictionary = (bool) $RCMAIL->config->get('spellcheck_dictionary');
$spellcheck_langs = (array) $RCMAIL->config->get('spellcheck_languages',
array('da'=>'Dansk', 'de'=>'Deutsch', 'en' => 'English', 'es'=>'Español',
'fr'=>'Français', 'it'=>'Italiano', 'nl'=>'Nederlands', 'pl'=>'Polski',
- 'pt'=>'Português', 'fi'=>'Suomi', 'sv'=>'Svenska'));
+ 'pt'=>'Português', 'ru'=>'Русский', 'fi'=>'Suomi', 'sv'=>'Svenska'));
// googie works only with two-letter codes
if ($engine == 'googie') {
@@ -818,6 +818,7 @@ function rcmail_compose_body($attrib)
$editor_lang_set[] = ($key == $lang ? '+' : '') . JQ($name).'='.JQ($key);
}
+ // include GoogieSpell
$OUTPUT->include_script('googiespell.js');
$OUTPUT->add_script(sprintf(
"var googie = new GoogieSpell('%s/images/googiespell/','%s&lang=', %s);\n".