Changeset 3897:61304e9616a6 for plugins

Timestamp:

10/01/18 11:24:07 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Set correct lang attribute (useful for browser/editor spelling) for content (post/page) depending on entry setting, and CK editor UI in user language

Location:

plugins

Files:

• dcCKEditor/_post_config.php (modified) (4 diffs)
• dcCKEditor/inc/dc.ckeditor.behaviors.php (modified) (1 diff)
• dcLegacyEditor/js/jsToolBar/jsToolBar.wysiwyg.js (modified) (1 diff)
• pages/page.php (modified) (2 diffs)

plugins/dcCKEditor/_post_config.php

@@ -108 +108 @@
 <?php endif;?>
 
+    CKEDITOR.config.defaultLanguage = dotclear.user_language;
+    CKEDITOR.config.language = dotclear.user_language;
+    CKEDITOR.config.contentsLanguage = dotclear.user_language;
+
 <?php
 if (!empty($extraPlugins) && count($extraPlugins) > 0) {
@@ -237 +241 @@
 
     CKEDITOR.on('instanceLoaded',function(e) {
-
         // Retrieve textarea element of the instance, then its line-height (in px) and rows values,
         // then apply line-height * rows (min = 6) to the inner height of the instance.
@@ -250 +253 @@
             }
         }
-
     });
 
@@ -268 +270 @@
         });
 
+        const ta = document.getElementById(e.editor.name);
+        if (ta !== undefined) {
+            if (ta.lang && e.editor.config.contentsLanguage !== ta.lang) {
+                let config = e.editor.config;
+                config.contentsLanguage = ta.lang;
+                e.editor.destroy();
+                CKEDITOR.replace(e.editor.name, config);
+            }
+        }
     });
 

plugins/dcCKEditor/inc/dc.ckeditor.behaviors.php

@@ -40 +40 @@
         dcPage::jsVar('dotclear.base_url', $GLOBALS['core']->blog->host) .
         dcPage::jsVar('dotclear.dcckeditor_plugin_url', DC_ADMIN_URL . self::$p_url) .
+        dcPage::jsVar('dotclear.user_language', $GLOBALS['core']->auth->getInfo('user_lang')) .
         'CKEDITOR_GETURL = function(resource) {
                 // If this is not a full or absolute path.

plugins/dcLegacyEditor/js/jsToolBar/jsToolBar.wysiwyg.js

@@ -188 +188 @@
     }
 
+    // Set lang if set for the textarea
+    if (This.textarea.lang) {
+      doc.documentElement.setAttribute('lang', This.textarea.lang);
+    }
+
     This.iwin = This.iframe.contentWindow;
 

plugins/pages/page.php

@@ -487 +487 @@
         '<p class="area" id="excerpt-area"><label for="post_excerpt" class="bold">' . __('Excerpt:') . ' <span class="form-note">' .
         __('Introduction to the page.') . '</span></label> ' .
-        form::textarea('post_excerpt', 50, 5, html::escapeHTML($post_excerpt)) .
+        form::textarea('post_excerpt', 50, 5,
+            [
+                'default'    => html::escapeHTML($post_excerpt),
+                'extra_html' => 'lang="' . $post_lang . '"'
+            ]) .
         '</p>',
 
@@ -496 +500 @@
             [
                 'default'    => html::escapeHTML($post_content),
-                'extra_html' => 'required placeholder="' . __('Content') . '"'
+                'extra_html' => 'required placeholder="' . __('Content') . '" lang="' . $post_lang . '"'
             ]) .
         '</p>',