Index: openacs-4/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v
diff -u -r1.47 -r1.47.2.1
--- openacs-4/www/blank-master.tcl	9 May 2009 22:27:53 -0000	1.47
+++ openacs-4/www/blank-master.tcl	26 May 2009 14:52:39 -0000	1.47.2.1
@@ -170,11 +170,25 @@
     foreach htmlarea_id [lsort -unique $::acs_blank_master__htmlareas] {
         lappend tinymce_elements $htmlarea_id
     }			
-  set tinymce_config $::acs_blank_master(tinymce.config)    
+    set tinymce_config $::acs_blank_master(tinymce.config)    
 
+    # Figure out the language to use
+    # 1st is the user language, if not available then the system one,
+    # fallback to english which is provided by default
+
+    set tinymce_relpath "packages/acs-templating/www/resources/tinymce/jscripts/tiny_mce"
+    set lang_list [list [lang::user::language] [lang::system::language]]
+    set tinymce_lang "en"
+    foreach elm $lang_list {
+        if { [file exists [acs_root_dir]/${tinymce_relpath}/langs/${elm}.js] } {
+            set tinymce_lang $elm
+            break
+        }
+    }
+
     # TODO : each element should have it's own init
     template::head::add_javascript -script "
-	    tinyMCE.init(\{$tinymce_config\});
+        tinyMCE.init(\{language: \"$tinymce_lang\", $tinymce_config\});
 	" -order tinymceZ
 }