From 2d1c27e8b4fc95c75b8ed3ce5c93baef1f94999c Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Tue, 24 May 2016 20:44:29 +0000 Subject: [PATCH] I18N: Add translators comments to wp-signup.php. Props ramiy. Fixes #35730. Built from https://develop.svn.wordpress.org/trunk@37551 git-svn-id: http://core.svn.wordpress.org/trunk@37519 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/version.php | 2 +- wp-signup.php | 34 +++++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/wp-includes/version.php b/wp-includes/version.php index 6412d45a24..6d557977b7 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-alpha-37550'; +$wp_version = '4.6-alpha-37551'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-signup.php b/wp-signup.php index ac20734c0c..99bd2afb9f 100644 --- a/wp-signup.php +++ b/wp-signup.php @@ -116,12 +116,15 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) { else echo '.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . '
'; - if ( !is_user_logged_in() ) { - if ( !is_subdomain_install() ) + if ( ! is_user_logged_in() ) { + if ( ! is_subdomain_install() ) { $site = $current_site->domain . $current_site->path . __( 'sitename' ); - else + } else { $site = __( 'domain' ) . '.' . $site_domain . $current_site->path; - echo '

(' . sprintf( __('Your address will be %s.'), $site ) . ') ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '

'; + } + + /* translators: %s: site address */ + echo '

(' . sprintf( __( 'Your address will be %s.' ), $site ) . ') ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '

'; } // Blog Title @@ -461,9 +464,13 @@ function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $ ); ?> -

+

%2$s is your new site. Log in as “%4$s” using your existing password.' ), esc_url( $home_url ), untrailingslashit( $domain . $path ), @@ -523,7 +530,10 @@ function signup_user( $user_name = '', $user_email = '', $errors = '' ) { ?> -

site_name ) ?>

+

site_name ); + ?>

  • -
  • +
  • ' . sprintf( __( 'Greetings Site Administrator! You are currently allowing “%s” registrations. To change or disable registration go to your Options page.' ), $i18n_signup[$active_signup], esc_url( network_admin_url( 'settings.php' ) ) ) . ''; +} $newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null; @@ -819,7 +834,8 @@ if ( $active_signup == 'none' ) { _e( 'Registration has been disabled.' ); } elseif ( $active_signup == 'blog' && !is_user_logged_in() ) { $login_url = wp_login_url( network_site_url( 'wp-signup.php' ) ); - echo sprintf( __( 'You must first log in, and then you can create a new site.' ), $login_url ); + /* translators: %s: login URL */ + printf( __( 'You must first log in, and then you can create a new site.' ), $login_url ); } else { $stage = isset( $_POST['stage'] ) ? $_POST['stage'] : 'default'; switch ( $stage ) {