Changeset 4817 in subversion

Timestamp:

May 30, 2011 1:08:47 PM (2 years ago)

Author:

alec

Message:

• Fix setting language for spellchecker on spellcheck_before_send

Location:

trunk/roundcubemail/program

Files:

• include/rcube_spellchecker.php (modified) (2 diffs)
• js/app.js (modified) (3 diffs)
• js/googiespell.js (modified) (2 diffs)
• steps/mail/sendmail.inc (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_spellchecker.php

@@ -53 +53 @@
         $this->rc = rcmail::get_instance();
         $this->engine = $this->rc->config->get('spellcheck_engine', 'googie');
-        $this->lang = $lang;
+        $this->lang = $lang ? $lang : 'en';
 
         if ($this->engine == 'pspell' && !extension_loaded('pspell')) {
@@ -156 +156 @@
 
         $out .= '</spellresult>';
+
+        return $out;
+    }
+
+
+    /**
+     * Returns checking result (mispelled words with suggestions)
+     *
+     * @return array Spellchecking result. An array indexed by word.
+     */
+    function get()
+    {
+        $result = array();
+
+        foreach ($this->matches as $item) {
+            if ($this->engine == 'pspell') {
+                $word = $item[0];
+            }
+            else {
+                $word = mb_substr($this->content, $item[1], $item[2], RCMAIL_CHARSET);
+            }
+            $result[$word] = is_array($item[4]) ? implode("\t", $item[4]) : $item[4];
+        }
 
         return $out;

trunk/roundcubemail/program/js/app.js

@@ -891 +891 @@
 
         // all checks passed, send message
-        var form = this.gui_objects.messageform,
+        var lang = this.spellcheck_lang(),
+          form = this.gui_objects.messageform,
           msgid = this.set_busy(true, 'sendingmessage');
 
@@ -897 +898 @@
         form._draft.value = '';
         form.action = this.add_url(form.action, '_unlock', msgid);
+        form.action = this.add_url(form.action, '_lang', lang);
         form.submit();
 
@@ -3003 +3005 @@
     this.spellcheck_ready = (s == 'ready' || s == 'no_error_found');
     this.enable_command('spellcheck', this.spellcheck_ready);
+  };
+
+  // get selected language
+  this.spellcheck_lang = function()
+  {
+    var ed;
+    if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)) && ed.plugins.spellchecker) {
+      return ed.plugins.spellchecker.selectedLang;
+    }
+    else if (this.env.spellcheck) {
+      return GOOGIE_CUR_LANG;
+    }
   };
 

trunk/roundcubemail/program/js/googiespell.js

@@ -11 +11 @@
 */
 
-var SPELL_CUR_LANG = null;
-var GOOGIE_DEFAULT_LANG = 'en';
+var GOOGIE_CUR_LANG,
+    GOOGIE_DEFAULT_LANG = 'en';
 
 function GoogieSpell(img_dir, server_url) {
@@ -261 +261 @@
             } else {
                     if (!ref.custom_no_spelling_error)
-                        ref.flashNoSpellingErrorState();
-                else
-                ref.custom_no_spelling_error(ref);
+                        ref.flashNoSpellingErrorState();
+                else
+                        ref.custom_no_spelling_error(ref);
             }
             ref.removeIndicator();

trunk/roundcubemail/program/steps/mail/sendmail.inc

@@ -414 +414 @@
     && empty($_SESSION['compose']['spell_checked'])
   ) {
-    $spellchecker = new rcube_spellchecker();
+    $spellchecker = new rcube_spellchecker(get_input_value('_lang', RCUBE_INPUT_GPC));
     $spell_result = $spellchecker->check($message_body, $isHtml);