Changeset 12946

Timestamp:

02/04/2010 06:46:25 PM (15 years ago)

Author:

ryan

Message:

Introduce get_available_languages(). Validate WPLANG. fixes #11774

Location:

trunk

Files:

• wp-admin/ms-edit.php (modified) (1 diff)
• wp-admin/ms-options.php (modified) (2 diffs)
• wp-includes/l10n.php (modified) (1 diff)

trunk/wp-admin/ms-edit.php

@@ -24 +24 @@
             wp_die( __("You probably need to go back to the <a href='ms-options.php'>options page</a>") );
 
-        if ( isset($_POST['WPLANG']) )
+        if ( isset($_POST['WPLANG']) && ( '' === $_POST['WPLANG'] || in_array($_POST['WPLANG'], get_available_languages()) ) )
             update_site_option( "WPLANG", $_POST['WPLANG'] );
 

trunk/wp-admin/ms-options.php

@@ -253 +253 @@
         <table class="form-table">
             <?php
-            $lang_files = array();
-            if ( is_dir( ABSPATH . LANGDIR ) && $dh = opendir( ABSPATH . LANGDIR ) )
-                while( ( $lang_file = readdir( $dh ) ) !== false )
-                    if ( substr( $lang_file, -3 ) == '.mo' )
-                        $lang_files[] = $lang_file;
+            $languages = get_available_languages();
             $lang = get_site_option('WPLANG');
-            if ( !empty($lang_files) ) {
+            if ( !empty($languages) ) {
                 ?>
                 <tr valign="top">
@@ -265 +261 @@
                     <td>
                         <select name="WPLANG" id="WPLANG">
-                            <?php mu_dropdown_languages( $lang_files, get_site_option('WPLANG') ); ?>
+                            <?php mu_dropdown_languages( $languages, get_site_option('WPLANG') ); ?>
                         </select>
                     </td>

trunk/wp-includes/l10n.php

@@ -485 +485 @@
     return translate_with_gettext_context( before_last_bar($name), 'User role' );
 }
+
+/**
+ * Get all available languages based on the presence of *.mo files in a given directory. The default directory is WP_LANG_DIR.
+ *
+ * @since 3.0.0
+ *
+ * @param string $dir A directory in which to search for language files. The default directory is WP_LANG_DIR.
+ * @return array Array of language codes or an empty array if no languages are present.  Language codes are formed by stripping the .mo extension from the language file names.
+ */
+function get_available_languages( $dir = null ) {
+    $languages = array();
+
+    if ( empty($dir) )
+        $dir = WP_LANG_DIR;
+
+    if ( is_dir( $dir ) && $dh = opendir( $dir ) ) {
+        while ( ( $lang_file = readdir( $dh ) ) !== false ) {
+            if ( substr( $lang_file, -3 ) == '.mo' )
+                $languages[] = basename($lang_file, '.mo');
+        }
+        closedir($dh);
+    }
+
+    return $languages;
+}
+
 ?>