<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12946] trunk: Introduce get_available_languages().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12946">12946</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-04 18:46:25 +0000 (Thu, 04 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce get_available_languages(). Validate WPLANG. fixes <a href="http://trac.wordpress.org/ticket/11774">#11774</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
<li><a href="#trunkwpincludesl10nphp">trunk/wp-includes/l10n.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (12945 => 12946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-02-04 18:19:21 UTC (rev 12945)
+++ trunk/wp-admin/ms-edit.php 2010-02-04 18:46:25 UTC (rev 12946)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> if ( empty( $_POST ) )
</span><span class="cx"> wp_die( __("You probably need to go back to the <a href='ms-options.php'>options page</a>") );
</span><span class="cx">
</span><del>- if ( isset($_POST['WPLANG']) )
</del><ins>+ if ( isset($_POST['WPLANG']) && ( '' === $_POST['WPLANG'] || in_array($_POST['WPLANG'], get_available_languages()) ) )
</ins><span class="cx"> update_site_option( "WPLANG", $_POST['WPLANG'] );
</span><span class="cx">
</span><span class="cx"> if ( is_email( $_POST['admin_email'] ) )
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (12945 => 12946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-02-04 18:19:21 UTC (rev 12945)
+++ trunk/wp-admin/ms-options.php 2010-02-04 18:46:25 UTC (rev 12946)
</span><span class="lines">@@ -252,19 +252,15 @@
</span><span class="cx"> <h3><?php _e('Site Wide Settings <em>(These settings may be overridden by blog owners)</em>') ?></h3>
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <?php
</span><del>- $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;
</del><ins>+ $languages = get_available_languages();
</ins><span class="cx"> $lang = get_site_option('WPLANG');
</span><del>- if ( !empty($lang_files) ) {
</del><ins>+ if ( !empty($languages) ) {
</ins><span class="cx"> ?>
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th width="33%"><?php _e('Default Language') ?></th>
</span><span class="cx"> <td>
</span><span class="cx"> <select name="WPLANG" id="WPLANG">
</span><del>- <?php mu_dropdown_languages( $lang_files, get_site_option('WPLANG') ); ?>
</del><ins>+ <?php mu_dropdown_languages( $languages, get_site_option('WPLANG') ); ?>
</ins><span class="cx"> </select>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span></span></pre></div>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (12945 => 12946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2010-02-04 18:19:21 UTC (rev 12945)
+++ trunk/wp-includes/l10n.php 2010-02-04 18:46:25 UTC (rev 12946)
</span><span class="lines">@@ -484,4 +484,30 @@
</span><span class="cx"> function translate_user_role( $name ) {
</span><span class="cx"> return translate_with_gettext_context( before_last_bar($name), 'User role' );
</span><span class="cx"> }
</span><ins>+
+/**
+ * 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;
+}
+
</ins><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>