diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php index 0495a7ade3..bc9cdc24c3 100644 --- a/wp-admin/import/blogger.php +++ b/wp-admin/import/blogger.php @@ -222,13 +222,13 @@ class Blogger_Import { if ( ( ! $this->import['user'] && ! is_array($this->import['cookies']) ) ) { // The user must provide a Blogger username and password. if ( ! ( $_POST['user'] && $_POST['pass'] ) ) { - $this->login_form(__('The script will log into your Blogger account, change some settings so it can read your blog, and restore the original settings when it\'s done. Here\'s what you do:

  1. Back up your Blogger template.
  2. Back up any other Blogger settings you might need later.
  3. Log out of Blogger
  4. Log in here with your Blogger username and password.
  5. On the next screen, click one of your Blogger blogs.
  6. Do not close this window or navigate away until the process is complete.
')); + $this->login_form(__('The script will log into your Blogger account, change some settings so it can read your blog, and restore the original settings when it\'s done. Here\'s what you do:').'

  1. '.__('Back up your Blogger template.').'
  2. '.__('Back up any other Blogger settings you might need later.').'
  3. '.__('Log out of Blogger').'
  4. '.__('Log in here with your Blogger username and password.').'
  5. '.__('On the next screen, click one of your Blogger blogs.').'
  6. '.__('Do not close this window or navigate away until the process is complete.').'
'); } // Try logging in. If we get an array of cookies back, we at least connected. $this->import['cookies'] = $this->login_blogger($_POST['user'], $_POST['pass']); if ( !is_array( $this->import['cookies'] ) ) { - $this->login_form("Login failed. Please enter your credentials again."); + $this->login_form(__('Login failed. Please enter your credentials again.')); } // Save the password so we can log the browser in when it's time to publish. @@ -237,7 +237,7 @@ class Blogger_Import { // Get the Blogger welcome page and scrape the blog numbers and names from it $response = $this->get_blogger('http://www.blogger.com/home', $this->import['cookies']); - if (! stristr($response['body'], 'signed in as') ) $this->login_form("Login failed. Please re-enter your username and password."); + if (! stristr($response['body'], 'signed in as') ) $this->login_form(__('Login failed. Please re-enter your username and password.')); $blogsary = array(); preg_match_all('#posts\.g\?blogID=(\d+)">([^<]+)#U', $response['body'], $blogsary); if ( ! count( $blogsary[1] < 1 ) ) @@ -290,7 +290,7 @@ class Blogger_Import { // Step 2: Backup the Blogger options pages, updating some of them. function backup_settings() { - $output.= "

Backing up Blogger options

\n"; + $output.= '

'.__('Backing up Blogger options')."

\n"; $form = false; foreach ($this->import['blogs'][$_GET['blog']]['options'] as $blog_opt => $optary) { if ( $blog_opt == $_GET['form'] ) { @@ -420,7 +420,7 @@ class Blogger_Import { $user_email = $wpdb->escape($post_author_email); $user_password = substr(md5(uniqid(microtime())), 0, 6); $result = wp_create_user( $user_login, $user_password, $user_email ); - $status.= "Registered user $user_login. "; + $status.= sprintf('Registered user %s.', $user_login); $this->import['blogs'][$_GET['blog']]['newusers'][] = $user_login; } $userdata = get_userdatabylogin( $post_author_name ); @@ -508,7 +508,9 @@ class Blogger_Import { } } } - $status = "$postcount ".__('post(s) parsed,')." $skippedpostcount ".__('skipped...')." $commentcount ".__('comment(s) parsed,')." $skippedcommentcount ".__('skipped...').' '.__('Done').''; + $status = sprintf(__('%s post(s) parsed, %s skipped...'), $postcount, $skippedpostcount).' '. + sprintf(__('%s comment(s) parsed, %s skipped...'), $commentcoun, $skippedcommentcount).' '. + ' '.__('Done').''; $import = $this->import; $import['blogs'][$_GET['blog']]['archives']["$url"] = $status; update_option('import-blogger', $import); @@ -552,11 +554,11 @@ class Blogger_Import { if ( $response['code'] >= 400 || strstr($response['body'], 'There are errors on this form') ) { $this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['error'] = true; update_option('import-blogger', $this->import); - $output .= "

$blog_opt ".__('failed. Trying again.').'

'; + $output .= sprintf(__('%s failed. Trying again.'), "

$blog_opt ").'

'; } else { $this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['restored'] = true; update_option('import-blogger', $this->import); - $output .= "

$blog_opt ".__('restored.').'

'; + $output .= sprintf(__('%s restored.'), "

$blog_opt ").'

'; } } $did_one = true; @@ -585,7 +587,7 @@ class Blogger_Import { if ( count($this->import['blogs']) > 1 ) echo '
  • '.__('In case you haven\'t done it already, you can import the posts from your other blogs:'). $this->show_blogs() . '
    • '; if ( $n = count($this->import['blogs'][$_GET['blog']]['newusers']) ) - echo '
  • '.__('Go to Authors & Users, where you can modify the new user(s) or delete them. If you want to make all of the imported posts yours, you will be given that option when you delete the new authors.').'
    • '; + echo '
  • '.sptintf(__('Go to Authors & Users, where you can modify the new user(s) or delete them. If you want to make all of the imported posts yours, you will be given that option when you delete the new authors.'), 'users.php', '_parent').'
    • '; echo '
  • '.__('For security, click the link below to reset this importer. That will clear your Blogger credentials and options from the database.').'
    • '; echo ''; }