Changeset 6765

Timestamp:

02/09/2008 06:43:15 AM (18 years ago)

Author:

ryan

Message:

gettext for tinymce strings. Props azaozz. see #5769

Location:

trunk/wp-includes

Files:

• js/tinymce/langs/en.js (modified) (1 diff)
• js/tinymce/langs/wp-langs.php (added)
• js/tinymce/plugins/media/langs/en_dlg.js (modified) (1 diff)
• js/tinymce/plugins/paste/langs/en_dlg.js (modified) (1 diff)
• js/tinymce/plugins/wordpress/langs/en.js (modified) (1 diff)
• js/tinymce/themes/advanced/langs/en.js (modified) (1 diff)
• js/tinymce/themes/advanced/langs/en_dlg.js (modified) (1 diff)
• js/tinymce/tiny_mce_config.php (modified) (4 diffs)
• js/tinymce/tiny_mce_gzip.php (modified) (14 diffs)
• js/tinymce/tiny_mce_popup.js (modified) (1 diff)
• script-loader.php (modified) (1 diff)

trunk/wp-includes/js/tinymce/langs/en.js

@@ -1 @@
-tinyMCE.addI18n({en:{
-common:{
-edit_confirm:"Do you want to use the WYSIWYG mode for this textarea?",
-apply:"Apply",
-insert:"Insert",
-update:"Update",
-cancel:"Cancel",
-close:"Close",
-browse:"Browse",
-class_name:"Class",
-not_set:"-- Not set --",
-clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?",
-clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.",
-popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.",
-invalid_data:"Error: Invalid values entered, these are marked in red.",
-more_colors:"More colors"
-},
-contextmenu:{
-align:"Alignment",
-left:"Left",
-center:"Center",
-right:"Right",
-full:"Full"
-},
-insertdatetime:{
-date_fmt:"%Y-%m-%d",
-time_fmt:"%H:%M:%S",
-insertdate_desc:"Insert date",
-inserttime_desc:"Insert time",
-months_long:"January,February,March,April,May,June,July,August,September,October,November,December",
-months_short:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec",
-day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday",
-day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"
-},
-print:{
-print_desc:"Print"
-},
-preview:{
-preview_desc:"Preview"
-},
-directionality:{
-ltr_desc:"Direction left to right",
-rtl_desc:"Direction right to left"
-},
-layer:{
-insertlayer_desc:"Insert new layer",
-forward_desc:"Move forward",
-backward_desc:"Move backward",
-absolute_desc:"Toggle absolute positioning",
-content:"New layer..."
-},
-save:{
-save_desc:"Save",
-cancel_desc:"Cancel all changes"
-},
-nonbreaking:{
-nonbreaking_desc:"Insert non-breaking space character"
-},
-iespell:{
-iespell_desc:"Run spell checking",
-download:"ieSpell not detected. Do you want to install it now?"
-},
-advhr:{
-advhr_desc:"Horizontale rule"
-},
-emotions:{
-emotions_desc:"Emotions"
-},
-searchreplace:{
-search_desc:"Find",
-replace_desc:"Find/Replace"
-},
-advimage:{
-image_desc:"Insert/edit image"
-},
-advlink:{
-link_desc:"Insert/edit link"
-},
-xhtmlxtras:{
-cite_desc:"Citation",
-abbr_desc:"Abbreviation",
-acronym_desc:"Acronym",
-del_desc:"Deletion",
-ins_desc:"Insertion",
-attribs_desc:"Insert/Edit Attributes"
-},
-style:{
-desc:"Edit CSS Style"
-},
-paste:{
-paste_text_desc:"Paste as Plain Text",
-paste_word_desc:"Paste from Word",
-selectall_desc:"Select All"
-},
-paste_dlg:{
-text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
-text_linebreaks:"Keep linebreaks",
-word_title:"Use CTRL+V on your keyboard to paste the text into the window."
-},
-table:{
-desc:"Inserts a new table",
-row_before_desc:"Insert row before",
-row_after_desc:"Insert row after",
-delete_row_desc:"Delete row",
-col_before_desc:"Insert column before",
-col_after_desc:"Insert column after",
-delete_col_desc:"Remove column",
-split_cells_desc:"Split merged table cells",
-merge_cells_desc:"Merge table cells",
-row_desc:"Table row properties",
-cell_desc:"Table cell properties",
-props_desc:"Table properties",
-paste_row_before_desc:"Paste table row before",
-paste_row_after_desc:"Paste table row after",
-cut_row_desc:"Cut table row",
-copy_row_desc:"Copy table row",
-del:"Delete table",
-row:"Row",
-col:"Column",
-cell:"Cell"
-},
-autosave:{
-unload_msg:"The changes you made will be lost if you navigate away from this page."
-},
-fullscreen:{
-desc:"Toggle fullscreen mode"
-},
-media:{
-desc:"Insert / edit embedded media",
-edit:"Edit embedded media"
-},
-fullpage:{
-desc:"Document properties"
-},
-template:{
-desc:"Insert predefined template content"
-},
-visualchars:{
-desc:"Visual control characters on/off."
-},
-spellchecker:{
-desc:"Toggle spellchecker",
-menu:"Spellchecker settings",
-ignore_word:"Ignore word",
-ignore_words:"Ignore all",
-langs:"Languages",
-wait:"Please wait...",
-sug:"Suggestions",
-no_sug:"No suggestions",
-no_mpell:"No misspellings found."
-},
-pagebreak:{
-desc:"Insert page break."
-}}});

trunk/wp-includes/js/tinymce/plugins/media/langs/en_dlg.js

@@ -1 @@
-tinyMCE.addI18n('en.media_dlg',{
-title:"Insert / edit embedded media",
-general:"General",
-advanced:"Advanced",
-file:"File/URL",
-list:"List",
-size:"Dimensions",
-preview:"Preview",
-constrain_proportions:"Constrain proportions",
-type:"Type",
-id:"Id",
-name:"Name",
-class_name:"Class",
-vspace:"V-Space",
-hspace:"H-Space",
-play:"Auto play",
-loop:"Loop",
-menu:"Show menu",
-quality:"Quality",
-scale:"Scale",
-align:"Align",
-salign:"SAlign",
-wmode:"WMode",
-bgcolor:"Background",
-base:"Base",
-flashvars:"Flashvars",
-liveconnect:"SWLiveConnect",
-autohref:"AutoHREF",
-cache:"Cache",
-hidden:"Hidden",
-controller:"Controller",
-kioskmode:"Kiosk mode",
-playeveryframe:"Play every frame",
-targetcache:"Target cache",
-correction:"No correction",
-enablejavascript:"Enable JavaScript",
-starttime:"Start time",
-endtime:"End time",
-href:"Href",
-qtsrcchokespeed:"Choke speed",
-target:"Target",
-volume:"Volume",
-autostart:"Auto start",
-enabled:"Enabled",
-fullscreen:"Fullscreen",
-invokeurls:"Invoke URLs",
-mute:"Mute",
-stretchtofit:"Stretch to fit",
-windowlessvideo:"Windowless video",
-balance:"Balance",
-baseurl:"Base URL",
-captioningid:"Captioning id",
-currentmarker:"Current marker",
-currentposition:"Current position",
-defaultframe:"Default frame",
-playcount:"Play count",
-rate:"Rate",
-uimode:"UI Mode",
-flash_options:"Flash options",
-qt_options:"Quicktime options",
-wmp_options:"Windows media player options",
-rmp_options:"Real media player options",
-shockwave_options:"Shockwave options",
-autogotourl:"Auto goto URL",
-center:"Center",
-imagestatus:"Image status",
-maintainaspect:"Maintain aspect",
-nojava:"No java",
-prefetch:"Prefetch",
-shuffle:"Shuffle",
-console:"Console",
-numloop:"Num loops",
-controls:"Controls",
-scriptcallbacks:"Script callbacks",
-swstretchstyle:"Stretch style",
-swstretchhalign:"Stretch H-Align",
-swstretchvalign:"Stretch V-Align",
-sound:"Sound",
-progress:"Progress",
-qtsrc:"QT Src",
-qt_stream_warn:"Streamed rtsp resources should be added to the QT Src field under the advanced tab.\nYou should also add a non streamed version to the Src field..",
-align_top:"Top",
-align_right:"Right",
-align_bottom:"Bottom",
-align_left:"Left",
-align_center:"Center",
-align_top_left:"Top left",
-align_top_right:"Top right",
-align_bottom_left:"Bottom left",
-align_bottom_right:"Bottom right",
-flv_options:"Flash video options",
-flv_scalemode:"Scale mode",
-flv_buffer:"Buffer",
-flv_startimage:"Start image",
-flv_starttime:"Start time",
-flv_defaultvolume:"Default volumne",
-flv_hiddengui:"Hidden GUI",
-flv_autostart:"Auto start",
-flv_loop:"Loop",
-flv_showscalemodes:"Show scale modes",
-flv_smoothvideo:"Smooth video",
-flv_jscallback:"JS Callback"
-});

trunk/wp-includes/js/tinymce/plugins/paste/langs/en_dlg.js

@@ -1 @@
-tinyMCE.addI18n('en.paste_dlg',{
-text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
-text_linebreaks:"Keep linebreaks",
-word_title:"Use CTRL+V on your keyboard to paste the text into the window."
-});

trunk/wp-includes/js/tinymce/plugins/wordpress/langs/en.js

@@ -1 @@
-tinyMCE.addI18n('en.wordpress',{
-wp_adv_desc : 'Show/Hide Advanced Toolbar',
-wp_more_desc : 'Split post with More tag',
-wp_page_desc : 'Split post with Page tag',
-wp_help_desc : 'Help',
-wp_more_alt : 'More...',
-wp_page_alt : 'Next page...'
-});

trunk/wp-includes/js/tinymce/themes/advanced/langs/en.js

@@ -1 @@
-tinyMCE.addI18n('en.advanced',{
-style_select:"Styles",
-font_size:"Font size",
-fontdefault:"Font family",
-block:"Format",
-paragraph:"Paragraph",
-div:"Div",
-address:"Address",
-pre:"Preformatted",
-h1:"Heading 1",
-h2:"Heading 2",
-h3:"Heading 3",
-h4:"Heading 4",
-h5:"Heading 5",
-h6:"Heading 6",
-blockquote:"Blockquote",
-code:"Code",
-samp:"Code sample",
-dt:"Definition term ",
-dd:"Definition description",
-bold_desc:"Bold (Ctrl+B)",
-italic_desc:"Italic (Ctrl+I)",
-underline_desc:"Underline (Ctrl+U)",
-striketrough_desc:"Strikethrough",
-justifyleft_desc:"Align left",
-justifycenter_desc:"Align center",
-justifyright_desc:"Align right",
-justifyfull_desc:"Align full",
-bullist_desc:"Unordered list",
-numlist_desc:"Ordered list",
-outdent_desc:"Outdent",
-indent_desc:"Indent",
-undo_desc:"Undo (Ctrl+Z)",
-redo_desc:"Redo (Ctrl+Y)",
-link_desc:"Insert/edit link",
-unlink_desc:"Unlink",
-image_desc:"Insert/edit image",
-cleanup_desc:"Cleanup messy code",
-code_desc:"Edit HTML Source",
-sub_desc:"Subscript",
-sup_desc:"Superscript",
-hr_desc:"Insert horizontal ruler",
-removeformat_desc:"Remove formatting",
-custom1_desc:"Your custom description here",
-forecolor_desc:"Select text color",
-backcolor_desc:"Select background color",
-charmap_desc:"Insert custom character",
-visualaid_desc:"Toggle guidelines/invisible elements",
-anchor_desc:"Insert/edit anchor",
-cut_desc:"Cut",
-copy_desc:"Copy",
-paste_desc:"Paste",
-image_props_desc:"Image properties",
-newdocument_desc:"New document",
-help_desc:"Help",
-blockquote_desc:"Blockquote",
-clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\r\nDo you want more information about this issue?",
-path:"Path",
-newdocument:"Are you sure you want clear all contents?",
-toolbar_focus:"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",
-more_colors:"More colors"
-});

trunk/wp-includes/js/tinymce/themes/advanced/langs/en_dlg.js

@@ -1 @@
-tinyMCE.addI18n('en.advanced_dlg',{
-about_title:"About TinyMCE",
-about_general:"About",
-about_help:"Help",
-about_license:"License",
-about_plugins:"Plugins",
-about_plugin:"Plugin",
-about_author:"Author",
-about_version:"Version",
-about_loaded:"Loaded plugins",
-anchor_title:"Insert/edit anchor",
-anchor_name:"Anchor name",
-code_title:"HTML Source Editor",
-code_wordwrap:"Word wrap",
-colorpicker_title:"Select a color",
-colorpicker_picker_tab:"Picker",
-colorpicker_picker_title:"Color picker",
-colorpicker_palette_tab:"Palette",
-colorpicker_palette_title:"Palette colors",
-colorpicker_named_tab:"Named",
-colorpicker_named_title:"Named colors",
-colorpicker_color:"Color:",
-colorpicker_name:"Name:",
-charmap_title:"Select custom character",
-image_title:"Insert/edit image",
-image_src:"Image URL",
-image_alt:"Image description",
-image_list:"Image list",
-image_border:"Border",
-image_dimensions:"Dimensions",
-image_vspace:"Vertical space",
-image_hspace:"Horizontal space",
-image_align:"Alignment",
-image_align_baseline:"Baseline",
-image_align_top:"Top",
-image_align_middle:"Middle",
-image_align_bottom:"Bottom",
-image_align_texttop:"Text top",
-image_align_textbottom:"Text bottom",
-image_align_left:"Left",
-image_align_right:"Right",
-link_title:"Insert/edit link",
-link_url:"Link URL",
-link_target:"Target",
-link_target_same:"Open link in the same window",
-link_target_blank:"Open link in a new window",
-link_titlefield:"Title",
-link_is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",
-link_is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?",
-link_list:"Link list"
-});

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -3 +3 @@
     cache_javascript_headers();
 
-    function wp_translate_tinymce_lang($text) {
+    // deprecated
+    function wp_translate_tinymce_lang($text) {
         if ( ! function_exists('__') ) {
             return $text;
@@ -53 +54 @@
         $mce_css = str_replace('http://', 'https://', $mce_css);
 
-    $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower(get_locale());
+    $mce_locale = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); // only ISO 639-1
 ?>
 
@@ -77 +78 @@
     relative_urls : false,
     remove_script_host : false,
-    force_p_newlines : true,
-    force_br_newlines : false,
-    convert_newlines_to_brs : false,
-    remove_linebreaks : false,
     fix_list_elements : true,
     fix_table_elements : true,
@@ -90 +87 @@
     <?php if ( $valid_elements ) echo 'valid_elements : "' . $valid_elements . '",' . "\n"; ?>
     <?php if ( $invalid_elements ) echo 'invalid_elements : "' . $invalid_elements . '",' . "\n"; ?>
-    save_callback : "switchEditors.saveCallback",
+    save_callback : "switchEditors.saveCallback",
 <?php do_action('mce_options'); ?>
     plugins : "<?php echo $plugins; ?>"

trunk/wp-includes/js/tinymce/tiny_mce_gzip.php

@@ -1 +1 @@
 <?php
-/**
+/** Based on:
  * $Id: tiny_mce_gzip.php 315 2007-10-25 14:03:43Z spocke $
  *
@@ -11 +11 @@
  */
 
-//error_reporting(E_ALL);
-    @require_once('../../../wp-config.php');  // For get_bloginfo().
-
-    // Headers
-    $expiresOffset = 3600 * 24 * 10; // Cache for 10 days in browser cache
-    header("Content-type: text/javascript");
-    header("Vary: Accept-Encoding");  // Handle proxies
-    header("Expires: " . gmdate("D, d M Y H:i:s", time() + $expiresOffset) . " GMT");
+@require_once('../../../wp-config.php');  // For get_bloginfo().
+cache_javascript_headers();
 
 if ( isset($_GET['load']) ) {
 
-    function getParam( $name, $def = false ) {
+    function getParam( $name, $def = false ) {
         if ( ! isset($_GET[$name]) )
             return $def;
@@ -32 +26 @@
         $path = realpath($path);
 
-        if ( !$path || !@is_file($path) )
+        if ( ! $path || !@is_file($path) )
             return '';
 
@@ -53 +47 @@
     function putFileContents( $path, $content ) {
         if ( function_exists('file_put_contents') )
-            return @file_put_contents($path, $content);
+            return @file_put_contents( $path, $content );
 
         $fp = @fopen($path, 'wb');
@@ -62 +56 @@
     }
 
-
-    // Get input
+    // WP defaults
+    $themes = explode( ',', getParam('themes', 'advanced') );
+
+    $language = getParam( 'languages', 'en' );
+    $language = strtolower( substr($language, 0, 2) ); // only ISO 639-1
+
     $plugins = explode( ',', getParam('plugins', '') );
-    $languages = explode( ',', getParam('languages', '') );
-    $themes = explode( ',', getParam('themes', '') );
-    $diskCache = getParam( 'diskcache', '' ) == 'true';
-    $isJS = getParam( 'js', '' ) == 'true';
-    $compress = getParam( 'compress', 'true' ) == 'true';
-    $core = getParam( 'core', 'true' ) == 'true';
-    $suffix = getParam( 'suffix', '_src' ) == '_src' ? '_src' : '';
     $cachePath = realpath('.'); // Cache path, this is where the .gz files will be stored
 
-    $content = '';
     $encodings = array();
-    $supportsGzip = false;
-    $enc = '';
-    $cacheKey = '';
-
-    // WP. Language handling could be improved... Concat all translated langs files and store in /wp-content/languages as .mo?
-    $theme = getParam( 'theme', 'advanced' );
-    $themes = array($theme);
-
-    $language = getParam( 'language', 'en' );
-    $languages = array($language);
-
-    if ( $language != strtolower($language) )
-        $languages[] = strtolower($language);
-
-    if ( $language != substr($language, 0, 2) )
-        $languages[] = substr($language, 0, 2);
-
-    $diskCache = false;
-    $isJS = true;
-    $suffix = '';
+    $supportsGzip = $diskCache = false;
+    $compress = $core = true;
+    $suffix = $content = $enc = $cacheKey = '';
 
     // Custom extra javascripts to pack
@@ -104 +77 @@
     */);
 
-    // Is called directly then auto init with default settings
-    if ( ! $isJS ) {
-        echo getFileContents('tiny_mce_gzip.js');
-        echo 'tinyMCE_GZ.init({});';
-        die();
-    }
-
-    // Setup cache info
+    // Setup cache info
     if ( $diskCache ) {
         if ( ! $cachePath )
@@ -130 +96 @@
 
     // Check if it supports gzip
-    if ( isset($_SERVER['HTTP_ACCEPT_ENCODING']) )
-        $encodings = explode( ',', strtolower( preg_replace('/\s+/', '', $_SERVER['HTTP_ACCEPT_ENCODING']) ) );
-
-    if ( ( in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------']) ) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression') ) {
+    if ( isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) )
+        $encodings = explode(',', strtolower(preg_replace( '/\s+/', '', $_SERVER['HTTP_ACCEPT_ENCODING']) ) );
+
+    if ( ( in_array('gzip', $encodings ) || in_array( 'x-gzip', $encodings ) || isset($_SERVER['---------------']) ) && function_exists( 'ob_gzhandler' ) && ! ini_get('zlib.output_compression') ) {
         $enc = in_array( 'x-gzip', $encodings ) ? 'x-gzip' : 'gzip';
         $supportsGzip = true;
@@ -143 +109 @@
             header('Content-Encoding: ' . $enc);
 
-        echo getFileContents($cacheFile);
+        echo getFileContents( $cacheFile );
         die();
     }
@@ -149 +115 @@
     // Add core
     if ( $core == 'true' ) {
-        $content .= getFileContents('tiny_mce' . $suffix . '.js');
+        $content .= getFileContents( 'tiny_mce' . $suffix . '.js' );
 
         // Patch loading functions
@@ -155 +121 @@
     }
 
-    // Add core languages
-    $lang_content = '';
-    foreach ( $languages as $lang )
-        $lang_content .= getFileContents('langs/' . $lang . '.js');
-
-    if ( empty($lang_content) && file_exists('langs/en.js') )
-        $lang_content .= getFileContents('langs/en.js');
-
-    $content .= $lang_content;
+    // Add all languages (WP)
+    include_once( dirname(__file__).'/langs/wp-langs.php' );
+    $content .= $strings;
 
     // Add themes
-    foreach ( $themes as $theme ) {
-        $content .= getFileContents( 'themes/' . $theme . '/editor_template' . $suffix . '.js');
-
-        $lang_content = '';
-        foreach ( $languages as $lang )
-            $lang_content .= getFileContents( 'themes/' . $theme . '/langs/' . $lang . '.js' );
-
-        if ( empty($lang_content) && file_exists( 'themes/' . $theme . '/langs/en.js' ) )
-            $lang_content .= getFileContents( 'themes/' . $theme . '/langs/en.js' );
-
-        $content .= $lang_content;
-    }
-
+    foreach ( $themes as $theme ) 
+        $content .= getFileContents( 'themes/' . $theme . '/editor_template' . $suffix . '.js' );
+    
     // Add plugins
-    foreach ( $plugins as $plugin ) {
-        $content .= getFileContents('plugins/' . $plugin . '/editor_plugin' . $suffix . '.js');
-
-        $lang_content = '';
-        foreach ( $languages as $lang )
-            $lang_content .= getFileContents( 'plugins/' . $plugin . '/langs/' . $lang . '.js' );
-
-        if ( empty($lang_content) && file_exists( 'plugins/' . $plugin . '/langs/en.js' ) )
-            $lang_content .= getFileContents( 'plugins/' . $plugin . '/langs/en.js' );
-
-        $content .= $lang_content;
-    }
+    foreach ( $plugins as $plugin ) 
+        $content .= getFileContents( 'plugins/' . $plugin . '/editor_plugin' . $suffix . '.js' );
 
     // Add custom files
@@ -210 +150 @@
 
         // Write gz file
-        if ( $diskCache && $cacheKey != '' )
+        if ( $diskCache && '' != $cacheKey )
             putFileContents( $cacheFile, $cacheData );
 
@@ -237 +177 @@
     },
 
-    opt : {},
-
-    init : function(arr, cb) {
-        var t = this, n, s, nl = document.getElementsByTagName('script');
-
-        t.opt = arr;
-
-        t.settings.themes = arr.theme;
-        t.settings.plugins = arr.plugins;
-        t.settings.languages = arr.language;
-        s = t.settings;
-        t.cb = cb || '';
+    opt : {},
+
+    init : function(o, cb) {
+        var t = this, n, s = t.settings, nl = document.getElementsByTagName('script');
+
+        t.opt = o;
+
+        s.themes = o.theme;
+        s.plugins = o.plugins; 
+        s.languages = o.language;
+        t.settings = s;
+
+        t.cb = cb || '';
 
         for (i=0; i<nl.length; i++) {
@@ -256 +197 @@
                 t.baseURL = n.src.substring(0, n.src.lastIndexOf('/'));
         }
-        tinyMCEPreInit.base = t.baseURL;
-
+        tinyMCEPreInit.base = t.baseURL;
+        
         if (!t.coreLoaded)
             t.loadScripts(1, s.themes, s.plugins, s.languages);
@@ -282 +223 @@
             t.coreLoaded = 1;
 
-    // Easier to debug with this...
     //  document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + t.baseURL + '/' + s.page_name + '?' + q + '"></script>');
 

trunk/wp-includes/js/tinymce/tiny_mce_popup.js

@@ -84 +84 @@
         var u = this.getWindowArg('plugin_url') || this.getWindowArg('theme_url');
 
-        if (u)
+        if (u && u.indexOf('wp-includes') == -1 )
             document.write('<script type="text/javascript" src="' + u + '/langs/' + this.editor.settings.language + '_dlg.js' + '"></script>');
     },

trunk/wp-includes/script-loader.php

@@ -31 +31 @@
 
         // Modify this version when tinyMCE plugins are changed
-        $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20080129' );
+        $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20080208' );
 
         $mce_config = apply_filters('tiny_mce_config_url', '/wp-includes/js/tinymce/tiny_mce_config.php');