Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.284.2.67 -r1.284.2.68
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	14 Jan 2020 12:42:31 -0000	1.284.2.67
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	19 Jan 2020 21:07:06 -0000	1.284.2.68
@@ -2663,7 +2663,7 @@
       set options [subst {
         toolbar : '[:toolbar]',
         uiColor: '[:uiColor]',
-        language: '[${:object} lang]',
+        language: '[::xo::cc lang]',
         skin: '[:skin]',
         startupMode: '${:mode}',
         parent_id: '[${:object} item_id]',
@@ -2915,18 +2915,12 @@
         set dimensions [join $dimensions ,],
       }
 
-      if {[ns_conn isconnected]} {
-        set ckeditor_lang [lang::conn::language]
-      } else {
-        set ckeditor_lang [${:object} lang]
-      }
-
       set options [subst {
         $dimensions
         ${:additionalConfigOptions}
         toolbar : '${:toolbar}',
         uiColor: '${:uiColor}',
-        language: '$ckeditor_lang',
+        language: '[::xo::cc lang]',
         skin: '${:skin}',
         startupMode: '${:mode}',
         disableNativeSpellChecker: false,