--- /dev/null
+--- /home/mathieu/public_html/tinymce/jscripts/tiny_mce/tiny_mce_popup.js 2008-09-09 16:05:32.000000000 +0800
++++ tiny_mce_popup.js 2008-09-23 11:20:13.000000000 +0800
+@@ -99,10 +99,12 @@
+ },\r
+ \r
+ requireLangPack : function() {\r
+- var u = this.getWindowArg('plugin_url') || this.getWindowArg('theme_url');\r
++ var u = tinyMCE.settings['document_base_url'];\r
++ var p = this.getWindowArg('plugin_url') || this.getWindowArg('theme_url');\r
+ \r
+ if (u && this.editor.settings.language) {\r
+- u += '/langs/' + this.editor.settings.language + '_dlg.js';\r
++ l = tinyMCE.settings['language'];\r
++ u += '/lib/editor/tinymce/strings.php?lang='+l+'&dlg=1&context=' + p;\r
+ \r
+ if (!tinymce.ScriptLoader.isDone(u)) {\r
+ document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"></script>');\r
+--- /home/mathieu/public_html/tinymce/jscripts/tiny_mce/tiny_mce_src.js 2008-09-17 13:56:56.000000000 +0800
++++ tiny_mce_src.js 2008-09-23 11:23:24.000000000 +0800
+@@ -6241,7 +6241,8 @@
+ var u, s = tinymce.EditorManager.settings;\r
+ \r
+ if (s && s.language) {\r
+- u = this.urls[n] + '/langs/' + s.language + '.js';\r
++ l = tinyMCE.settings['language'];\r
++ u = tinyMCE.settings['document_base_url'] + '/lib/editor/tinymce/strings.php?lang='+l+'&dlg=0&context=' + this.urls[n];\r
+ \r
+ if (!tinymce.dom.Event.domLoaded && !s.strict_mode)\r
+ tinymce.ScriptLoader.load(u);\r
+@@ -6347,8 +6348,10 @@
+ // If page not loaded and strict mode isn't enabled then load them\r
+ if (!Event.domLoaded && !s.strict_loading_mode) {\r
+ // Load language\r
+- if (s.language)\r
+- sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');\r
++ if (s.language) {\r
++ l = tinyMCE.settings['language'];\r
++ sl.add(tinyMCE.settings['document_base_url'] + '/lib/editor/tinymce/strings.php?lang='+l+'&dlg=0');\r
++ }\r
+ \r
+ // Load theme\r
+ if (s.theme && s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])\r
+@@ -6864,8 +6867,10 @@
+ \r
+ // Load scripts\r
+ function loadScripts() {\r
+- if (s.language)\r
+- sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');\r
++ if (s.language) {\r
++ l = tinyMCE.settings['language'];\r
++ sl.add(tinyMCE.settings['document_base_url'] + '/lib/editor/tinymce/strings.php?lang='+l+'&dlg=0');\r
++ }\r
+ \r
+ if (s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])\r
+ ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');\r