From 55030a165b03d6f2de9a7da0cd861a2f79ef3b86 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Sat, 23 Jan 2010 19:06:15 +0000 Subject: [PATCH] gettext for options-network. Props nacin. see #11644 git-svn-id: https://develop.svn.wordpress.org/trunk@12813 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/options-network.php | 116 +++++++++++++++++------------------ 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/wp-admin/options-network.php b/wp-admin/options-network.php index fa9033d8ee..dcb4c0b956 100644 --- a/wp-admin/options-network.php +++ b/wp-admin/options-network.php @@ -34,33 +34,35 @@ $dirs = array( substr( ABSPATH, 0, -1), ABSPATH . "wp-content" );
' . esc_html__('Server Summary') . ''; - print '

' . __("If you post a message to the WordPress support forum at http://wordpress.org/support/ then copy and paste the following information into your message:") . '

'; - - print "
"; - print "
ERROR: $err
"; +?> +

+

http://wordpress.org/support/ then copy and paste the following information into your message:'); ?>

+
+

+$val"; - print "    uid/gid: " . $stats[ 'uid' ] . "/" . $stats[ 'gid' ] . "
\n"; - print "    size: " . $stats[ 'size' ] . "
"; - print "    perms: " . substr( sprintf('%o', fileperms( $val ) ), -4 ) . "
"; - print "    readable: "; - print is_readable( $val ) == true ? "yes" : "no"; - print "
"; - print "    writeable: "; - print is_writeable( $val ) == true ? "yes" : "no"; - print "
"; - } elseif( file_exists( $val ) == false ) { - print "

$val

"; - print "    FILE NOT FOUND: $val
"; +?> +

+
+
+
+
+
+ +

+
+"; + echo "
"; } function step2_htaccess() { @@ -73,7 +75,7 @@ function step2_htaccess() { } $htaccess_sample = ABSPATH . 'wp-admin/includes/htaccess.ms'; if ( !file_exists( $htaccess_sample ) ) - wp_die("Sorry, I need a {$htaccess_sample} to work from. Please re-upload this file to your WordPress installation."); + wp_die( sprintf( __('Sorry, I need a %s to work from. Please re-upload this file to your WordPress installation.'), $htaccess_sample ) ); $htaccess_file = file( $htaccess_sample ); $fp = @fopen( $htaccess_sample, "r" ); @@ -84,12 +86,12 @@ function step2_htaccess() { fclose( $fp ); $htaccess_file = str_replace( "BASE", $base, $htaccess ); } else { - wp_die("Sorry, I need to be able to read {$htaccess_sample}. Please check the permissions on this file."); + wp_die( sprintf( __('Sorry, I need to be able to read %s. Please check the permissions on this file.'), $htaccess_sample ) ); } //@todo: check for super-cache in use ?> -
  • Replace the contents of your .htaccess with the following:

    +
  • .htaccess with the following:'); ?>

    @@ -105,29 +107,27 @@ function step1() {

      -
    • Access to your server to change directory permissions. This can be done through ssh or ftp for example.
    • -
    • A valid email where your password and administrative emails will be sent.
    • -
    • Wildcard dns records if you're going to use the virtual host (sub-domain) functionality. Check the README for further details.
    • +
    • +
    • +
    • README for further details."); ?>
    If the mod_rewrite module is disabled ask your administrator to enable that module, or look at the Apache documentation or elsewhere for help setting it up.

    "; + $mod_rewrite_msg = "\n

    " . __( "If the mod_rewrite module is disabled ask your administrator to enable that module, or look at the Apache documentation or elsewhere for help setting it up." ) . '

    '; - if( function_exists( "apache_get_modules" ) ) { + if ( function_exists( 'apache_get_modules' ) ) { $modules = apache_get_modules(); - if( in_array( "mod_rewrite", $modules ) == false ) { - echo "

    Warning! It looks like mod_rewrite is not installed.

    " . $mod_rewrite_msg; - } else { + if ( ! in_array( 'mod_rewrite', $modules ) ) + echo '

    ' . __('Warning! It looks like mod_rewrite is not installed.') . '

    ' . $mod_rewrite_msg; + else $rewrite_enabled = true; - } } else { - ?>

    Please make sure mod_rewrite is installed as it will be activated at the end of this install.

    ' . __( 'Please make sure mod_rewrite is installed as it will be activated at the end of this install.' ) . '

    ' . $mod_rewrite_msg; } return $rewrite_enabled; } function printstep1form( $rewrite_enabled = false ) { - $weblog_title = ucfirst( get_option( 'blogname' ) ) . ' Sites'; + $weblog_title = sprintf( __('%s Sites'), ucfirst( get_option( 'blogname' ) ) ); $email = get_option( 'admin_email' ); $hostname = get_clean_basedomain(); if( substr( $hostname, 0, 4 ) == 'www.' ) @@ -136,58 +136,58 @@ function printstep1form( $rewrite_enabled = false ) { wp_nonce_field( 'install-network-1' ); ?> -

    Site Addresses

    -

    Please choose whether you would like sites in your WordPress install to use sub-domains or sub-directories. You can not change this later.

    +

    +

    -

    Note It looks like mod_rewrite is not installed.

    +

    Note It looks like mod_rewrite is not installed.'); ?>

    -
    - +
    +

    -

    Server Address

    +

    -

    We recommend you change your siteurl to before enabling the network feature. It will still be possible to visit your site using the "www" prefix with an address like but any links will not have the "www" prefix.

    +

    %1$s before enabling the network feature. It will still be possible to visit your site using the "www" prefix with an address like %2$s but any links will not have the "www" prefix.' ), $nowww, $hostname ); ?>

    - +
    Server Address -

    This will be the Internet address of your site: .

    - -

    Do not use an IP address (like 127.0.0.1) or a single word hostname like localhost as your server address.

    +

    %s.' ), $hostname ); ?>

    + +

    localhost as your server address.' ); ?>

    -

    Site Details

    +

    - + - +
    Site Title - -
    What would you like to call your site? + +
    Email - -
    Your email address. + +
    -

    +

    ' />

    -

    Enabling WordPress Sites

    -

    Complete the following steps to enable the features for creating a network of sites. Note: We recommend you make a backup copy of your existing wp-config.php and .htaccess files.

    +

    +

    Note: We recommend you make a backup copy of your existing wp-config.php and .htaccess files.' ); ?>

      -
    1. Create a blogs.dir directory in your wp-content directory. This directory is used to stored uploaded media for your additional sites and must be writeable by the web server.
    2. +
    3. blogs.dir directory in your wp-content directory. This directory is used to stored uploaded media for your additional sites and must be writeable by the web server.' ); ?>
    @@ -202,11 +202,11 @@ function step2_config() { $config_sample = ABSPATH . 'wp-admin/includes/wp-config.ms'; if ( !file_exists( $config_sample ) ) - wp_die("Sorry, I need a {$config_sample} to work from. Please re-upload this file to your WordPress installation."); + wp_die( sprintf( __( 'Sorry, I need a %s to work from. Please re-upload this file to your WordPress installation.' ), $config_sample ) ); $wp_config_file = file( $config_sample ); ?> -
  • Replace the contents of your wp-config.php with the following:

    +
  • wp-config.php with the following:' ); ?>