WordPress 4.4

[autoinstalls/wordpress.git] / wp-admin / network / settings.php

diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php
index 1872eb81c0932c13aa3dfcf543b615c6c5d56b6f..cd8e251d8bfbb2d070f1c31c115c85e17cf3b86a 100644 (file)
--- a/wp-admin/network/settings.php
+++ b/wp-admin/network/settings.php
@@ -22,27 +22,6 @@ if ( ! current_user_can( 'manage_network_options' ) )
 $title = __( 'Network Settings' );
 $parent_file = 'settings.php';
 
 $title = __( 'Network Settings' );
 $parent_file = 'settings.php';
 

-/**
- * Print JavaScript in the header on the Network Settings screen.
- *
- * @since 4.1.0
-*/
-function network_settings_add_js() {
-?>
-<script type="text/javascript">
-jQuery(document).ready( function($) {
-       var languageSelect = $( '#WPLANG' );
-       $( 'form' ).submit( function() {
-               // Don't show a spinner for English and installed languages,
-               // as there is nothing to download.
-               if ( ! languageSelect.find( 'option:selected' ).data( 'installed' ) ) {
-                       $( '#submit', this ).after( '<span class="spinner language-install-spinner" />' );
-               }
-       });
-});
-</script>
-<?php
-}

 add_action( 'admin_head', 'network_settings_add_js' );
 
 get_current_screen()->add_help_tab( array(
 add_action( 'admin_head', 'network_settings_add_js' );
 
 get_current_screen()->add_help_tab( array(


@@ -122,7 +101,7 @@ if ( isset( $_GET['updated'] ) ) {
        <h1><?php echo esc_html( $title ); ?></h1>
        <form method="post" action="settings.php" novalidate="novalidate">
                <?php wp_nonce_field( 'siteoptions' ); ?>
        <h1><?php echo esc_html( $title ); ?></h1>
        <form method="post" action="settings.php" novalidate="novalidate">
                <?php wp_nonce_field( 'siteoptions' ); ?>

-               <h3><?php _e( 'Operational Settings' ); ?></h3>
+               <h2><?php _e( 'Operational Settings' ); ?></h2>

                <table class="form-table">
                        <tr>
                                <th scope="row"><label for="site_name"><?php _e( 'Network Title' ) ?></label></th>
                <table class="form-table">
                        <tr>
                                <th scope="row"><label for="site_name"><?php _e( 'Network Title' ) ?></label></th>


@@ -141,7 +120,7 @@ if ( isset( $_GET['updated'] ) ) {
                                </td>
                        </tr>
                </table>
                                </td>
                        </tr>
                </table>

-               <h3><?php _e( 'Registration Settings' ); ?></h3>
+               <h2><?php _e( 'Registration Settings' ); ?></h2>

                <table class="form-table">
                        <tr>
                                <th scope="row"><?php _e( 'Allow new registrations' ) ?></th>
                <table class="form-table">
                        <tr>
                                <th scope="row"><?php _e( 'Allow new registrations' ) ?></th>


@@ -158,7 +137,13 @@ if ( isset( $_GET['updated'] ) ) {
                                        <label><input name="registration" type="radio" id="registration3" value="blog"<?php checked( $reg, 'blog') ?> /> <?php _e( 'Logged in users may register new sites.' ); ?></label><br />
                                        <label><input name="registration" type="radio" id="registration4" value="all"<?php checked( $reg, 'all') ?> /> <?php _e( 'Both sites and user accounts can be registered.' ); ?></label>
                                        <?php if ( is_subdomain_install() ) {
                                        <label><input name="registration" type="radio" id="registration3" value="blog"<?php checked( $reg, 'blog') ?> /> <?php _e( 'Logged in users may register new sites.' ); ?></label><br />
                                        <label><input name="registration" type="radio" id="registration4" value="all"<?php checked( $reg, 'all') ?> /> <?php _e( 'Both sites and user accounts can be registered.' ); ?></label>
                                        <?php if ( is_subdomain_install() ) {

-                                               echo '<p class="description">' . __( 'If registration is disabled, please set <code>NOBLOGREDIRECT</code> in <code>wp-config.php</code> to a URL you will redirect visitors to if they visit a non-existent site.' ) . '</p>';
+                                               echo '<p class="description">';
+                                               /* translators: 1: NOBLOGREDIRECT 2: wp-config.php */
+                                               printf( __( 'If registration is disabled, please set %1$s in %2$s to a URL you will redirect visitors to if they visit a non-existent site.' ),
+                                                       '<code>NOBLOGREDIRECT</code>',
+                                                       '<code>wp-config.php</code>'
+                                               );
+                                               echo '</p>';

                                        } ?>
                                        </fieldset>
                                </td>
                                        } ?>
                                        </fieldset>
                                </td>


@@ -217,7 +202,7 @@ if ( isset( $_GET['updated'] ) ) {
                        </tr>
 
                </table>
                        </tr>
 
                </table>

-               <h3><?php _e('New Site Settings'); ?></h3>
+               <h2><?php _e( 'New Site Settings' ); ?></h2>

                <table class="form-table">
 
                        <tr>
                <table class="form-table">
 
                        <tr>


@@ -289,12 +274,12 @@ if ( isset( $_GET['updated'] ) ) {
                                </td>
                        </tr>
                </table>
                                </td>
                        </tr>
                </table>

-               <h3><?php _e( 'Upload Settings' ); ?></h3>
+               <h2><?php _e( 'Upload Settings' ); ?></h2>

                <table class="form-table">
                        <tr>
                                <th scope="row"><?php _e( 'Site upload space' ) ?></th>
                                <td>
                <table class="form-table">
                        <tr>
                                <th scope="row"><?php _e( 'Site upload space' ) ?></th>
                                <td>

-                                       <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="' . esc_attr( get_site_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />
+                                       <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( (bool) get_site_option( 'upload_space_check_disabled' ), false ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="' . esc_attr( get_site_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />

                                        <p class="screen-reader-text" id="blog-upload-space-desc">
                                                <?php _e( 'Size in megabytes' ) ?>
                                        </p>
                                        <p class="screen-reader-text" id="blog-upload-space-desc">
                                                <?php _e( 'Size in megabytes' ) ?>
                                        </p>


@@ -327,7 +312,7 @@ if ( isset( $_GET['updated'] ) ) {
                $translations = wp_get_available_translations();
                if ( ! empty( $languages ) || ! empty( $translations ) ) {
                        ?>
                $translations = wp_get_available_translations();
                if ( ! empty( $languages ) || ! empty( $translations ) ) {
                        ?>

-                       <h3><?php _e( 'Language Settings' ); ?></h3>
+                       <h2><?php _e( 'Language Settings' ); ?></h2>

                        <table class="form-table">
                                <tr>
                                        <th><label for="WPLANG"><?php _e( 'Default Language' ); ?></label></th>
                        <table class="form-table">
                                <tr>
                                        <th><label for="WPLANG"><?php _e( 'Default Language' ); ?></label></th>


@@ -354,7 +339,7 @@ if ( isset( $_GET['updated'] ) ) {
                }
                ?>
 
                }
                ?>
 

-               <h3><?php _e( 'Menu Settings' ); ?></h3>
+               <h2><?php _e( 'Menu Settings' ); ?></h2>

                <table id="menu" class="form-table">
                        <tr>
                                <th scope="row"><?php _e( 'Enable administration menus' ); ?></th>
                <table id="menu" class="form-table">
                        <tr>
                                <th scope="row"><?php _e( 'Enable administration menus' ); ?></th>