X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/03f2fa83c13c1b532284205fa7efcab9b8b2c41f..3d39054f012aefe514b3f5509e32f09fc4feda44:/wp-admin/includes/network.php diff --git a/wp-admin/includes/network.php b/wp-admin/includes/network.php index 7f30c99d..d04b4f9a 100644 --- a/wp-admin/includes/network.php +++ b/wp-admin/includes/network.php @@ -52,11 +52,11 @@ function allow_subdomain_install() { function allow_subdirectory_install() { global $wpdb; /** - * Filter whether to enable the subdirectory install feature in Multisite. + * Filters whether to enable the subdirectory install feature in Multisite. * * @since 3.0.0 * - * @param bool true Whether to enable the subdirectory install feature in Multisite. Default is false. + * @param bool $allow Whether to enable the subdirectory install feature in Multisite. Default is false. */ if ( apply_filters( 'allow_subdirectory_install', false ) ) return true; @@ -159,7 +159,7 @@ function network_step1( $errors = false ) { $subdomain_install = true; } else { $subdomain_install = false; - if ( $got_mod_rewrite = got_mod_rewrite() ) { // dangerous assumptions + if ( $got_mod_rewrite = got_mod_rewrite() ) { // dangerous assumptions echo '
' . __( 'Note:' ) . ' ';
/* translators: %s: mod_rewrite */
printf( __( 'Please make sure the Apache %s module is installed as it will be used at the end of this installation.' ),
@@ -180,8 +180,8 @@ function network_step1( $errors = false ) {
/* translators: 1: mod_rewrite, 2: mod_rewrite documentation URL, 3: Google search for mod_rewrite */
printf( __( 'If %1$s is disabled, ask your administrator to enable that module, or look at the Apache documentation or elsewhere for help setting it up.' ),
'mod_rewrite
',
- 'http://httpd.apache.org/docs/mod/mod_rewrite.html',
- 'http://www.google.com/search?q=apache+mod_rewrite'
+ 'https://httpd.apache.org/docs/mod/mod_rewrite.html',
+ 'https://www.google.com/search?q=apache+mod_rewrite'
);
echo '
' . __( 'Caution:' ) . ' ';
printf(
/* translators: 1: wp-config.php 2: .htaccess */
- __( 'Caution: We recommend you back up your existing %1$s and %2$s files.' ),
+ __( 'We recommend you back up your existing %1$s and %2$s files.' ),
'wp-config.php
',
'.htaccess
'
);
} elseif ( file_exists( $home_path . 'web.config' ) ) {
+ echo '' . __( 'Caution:' ) . ' ';
printf(
/* translators: 1: wp-config.php 2: web.config */
- __( 'Caution: We recommend you back up your existing %1$s and %2$s files.' ),
+ __( 'We recommend you back up your existing %1$s and %2$s files.' ),
'wp-config.php
',
'web.config
'
);
} else {
+ echo '' . __( 'Caution:' ) . ' ';
printf(
/* translators: 1: wp-config.php */
- __( 'Caution: We recommend you back up your existing %s file.' ),
+ __( 'We recommend you back up your existing %s file.' ),
'wp-config.php
'
);
}
@@ -402,10 +405,16 @@ function network_step2( $errors = false ) {
?>
above the line reading /* That’s all, stop editing! Happy blogging. */
:' ),
+ /* translators: 1: wp-config.php 2: location of wp-config file, 3: translated version of "That's all, stop editing! Happy blogging." */
+ __( 'Add the following to your %1$s file in %2$s above the line reading %3$s:' ),
'wp-config.php
',
- '' . $location_of_wp_config . '
'
+ '' . $location_of_wp_config . '
',
+ /*
+ * translators: This string should only be translated if wp-config-sample.php is localized.
+ * You can check the localized release package or
+ * https://i18n.svn.wordpress.org//* ' . __( 'That’s all, stop editing! Happy blogging.' ) . ' */
'
); ?>