Changeset 5114

Timestamp:

03/26/2007 10:05:36 PM (19 years ago)

Author:

ryan

Message:

Fallback to loading english for tinyMCE if requested locale is not there. see #3882

Location:

trunk/wp-includes

Files:

• js/tinymce/tiny_mce_gzip.php (modified) (3 diffs)
• script-loader.php (modified) (1 diff)

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

@@ -120 +120 @@
 
         // Add core languages
+        $lang_content = '';
         foreach ($languages as $lang)
-                $content .= getFileContents("langs/" . $lang . ".js");
+                $lang_content .= getFileContents("langs/" . $lang . ".js");
+        if ( empty($lang_content) )
+                $lang_content .= getFileContents("langs/en.js");
+        $content .= $lang_content;
 
         // Add themes
@@ -127 +131 @@
                 $content .= wp_compact_tinymce_js(getFileContents( "themes/" . $theme . "/editor_template" . $suffix . ".js"));
 
+                $lang_content = '';
                 foreach ($languages as $lang)
-                        $content .= getFileContents("themes/" . $theme . "/langs/" . $lang . ".js");
+                        $lang_content .= getFileContents("themes/" . $theme . "/langs/" . $lang . ".js");
+                if ( empty($lang_content) )
+                        $lang_content .= getFileContents("themes/" . $theme . "/langs/en.js");
+                $content .= $lang_content;
         }
 
@@ -135 +143 @@
                 $content .= getFileContents("plugins/" . $plugin . "/editor_plugin" . $suffix . ".js");
 
+                $lang_content = '';
                 foreach ($languages as $lang)
-                        $content .= getFileContents("plugins/" . $plugin . "/langs/" . $lang . ".js");
+                        $lang_content .= getFileContents("plugins/" . $plugin . "/langs/" . $lang . ".js");
+                if ( empty($lang_content) )
+                        $lang_content .= getFileContents("plugins/" . $plugin . "/langs/en.js");
+                $content .= $lang_content;
         }
 

trunk/wp-includes/script-loader.php

@@ -16 +16 @@
                 $this->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '3517' );
                 $this->add( 'colorpicker', '/wp-includes/js/colorpicker.js', false, '3517' );
-                $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20070325' );
+                $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '20070326' );
                 $mce_config = apply_filters('tiny_mce_config_url', '/wp-includes/js/tinymce/tiny_mce_config.php');
                 $this->add( 'wp_tiny_mce', $mce_config, array('tiny_mce'), '20070225' );