From ebbcf250d5134405a1da651b94b2afd7b944b551 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 5 Sep 2006 18:52:24 +0000 Subject: [PATCH] i18n fixes from nbachiyski. fixes #3109 git-svn-id: http://svn.automattic.com/wordpress/trunk@4165 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/edit.php | 2 +- wp-admin/import/blogger.php | 10 ++--- wp-admin/import/blogware.php | 2 +- wp-admin/import/dotclear.php | 8 ++-- wp-admin/import/greymatter.php | 75 ++++++++++++++++--------------- wp-admin/import/livejournal.php | 2 +- wp-admin/import/mt.php | 14 +++--- wp-admin/import/rss.php | 2 +- wp-admin/import/textpattern.php | 6 +-- wp-admin/import/wordpress.php | 8 ++-- wp-admin/options-privacy.php | 4 +- wp-admin/page.php | 2 +- wp-admin/post.php | 2 +- wp-includes/bookmark-template.php | 9 ++-- wp-includes/classes.php | 8 ++-- wp-includes/functions.php | 4 +- wp-includes/post-template.php | 2 +- 17 files changed, 82 insertions(+), 78 deletions(-) diff --git a/wp-admin/edit.php b/wp-admin/edit.php index c473e4653..008b57000 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -115,7 +115,7 @@ if ( count($arc_result) ) { ?>
- +
diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php index d3115d87c..f6595ebb3 100644 --- a/wp-admin/import/blogger.php +++ b/wp-admin/import/blogger.php @@ -341,7 +341,7 @@ class Blogger_Import { $form = "
"; $form.= $body; $form.= "
"; - $output.= '

'.sprintf('%s in progress, please wait...', $blog_opt)."

\n"; + $output.= '

'.sprintf(__('%s in progress, please wait...'), $blog_opt)."

\n"; } else { $output.= "

$blog_opt

\n"; } @@ -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.= sprintf('Registered user %s.', $user_login); + $status.= sprintf(__('Registered user %s.'), $user_login); $this->import['blogs'][$_GET['blog']]['newusers'][] = $user_login; } $userdata = get_userdatabylogin( $post_author_name ); @@ -509,7 +509,7 @@ class Blogger_Import { } } $status = sprintf(__('%s post(s) parsed, %s skipped...'), $postcount, $skippedpostcount).' '. - sprintf(__('%s comment(s) parsed, %s skipped...'), $commentcoun, $skippedcommentcount).' '. + sprintf(__('%s comment(s) parsed, %s skipped...'), $commentcount, $skippedcommentcount).' '. ' '.__('Done').''; $import = $this->import; $import['blogs'][$_GET['blog']]['archives']["$url"] = $status; @@ -546,7 +546,7 @@ class Blogger_Import { $response = $this->get_blogger("http://www.blogger.com/blog-publishing.g?blogID={$_GET['blog']}&publishMode={$optary['backup']['publishMode']}", $headers); sleep(2); if ( $response['code'] >= 400 ) - wp_die('

Error restoring publishMode.

Please tell the devs.

' . addslashes(print_r($response, 1)) ); + wp_die('

'.__('Error restoring publishMode').'

'.__('Please tell the devs.').'

' . addslashes(print_r($response, 1)) ); } } if ( $optary['backup'] != $optary['modify'] ) { @@ -662,6 +662,6 @@ class Blogger_Import { $blogger_import = new Blogger_Import(); -register_importer('blogger', 'Blogger and Blogspot', __('Import posts and comments from your Blogger account'), array ($blogger_import, 'start')); +register_importer('blogger', __('Blogger and Blogspot'), __('Import posts and comments from your Blogger account'), array ($blogger_import, 'start')); ?> diff --git a/wp-admin/import/blogware.php b/wp-admin/import/blogware.php index 35ab61084..abb43d50e 100644 --- a/wp-admin/import/blogware.php +++ b/wp-admin/import/blogware.php @@ -188,5 +188,5 @@ class BW_Import { $blogware_import = new BW_Import(); -register_importer('blogware', 'Blogware', __('Import posts from Blogware'), array ($blogware_import, 'dispatch')); +register_importer('blogware', __('Blogware'), __('Import posts from Blogware'), array ($blogware_import, 'dispatch')); ?> diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php index 27ce6e6bf..ba988f6fa 100644 --- a/wp-admin/import/dotclear.php +++ b/wp-admin/import/dotclear.php @@ -632,15 +632,15 @@ class Dotclear_Import { echo '

'.__('Preserving Authors').'

'; echo '

'.__('Secondly, we have attempted to preserve post authors. If you are the only author or contributor to your blog, then you are safe. In most cases, we are successful in this preservation endeavor. However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'

'; echo '

'.__('Textile').'

'; - echo '

'.__('Also, since you\'re coming from Dotclear, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me... You\'ll want it.').'

'; + echo '

'.__('Also, since you\'re coming from Dotclear, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me... You\'ll want it.').'

'; echo '

'.__('WordPress Resources').'

'; echo '

'.__('Finally, there are numerous WordPress resources around the internet. Some of them are:').'

'; echo ''; - echo '

'.sprintf(__('That\'s it! What are you waiting for? Go login!'), '/wp-login.php').'

'; + echo '

'.sprintf(__('That\'s it! What are you waiting for? Go login!'), '../wp-login.php').'

'; } function db_form() @@ -743,5 +743,5 @@ class Dotclear_Import { } $dc_import = new Dotclear_Import(); -register_importer('dotclear', 'Dotclear', __('Import posts from a Dotclear Blog'), array ($dc_import, 'dispatch')); +register_importer('dotclear', __('Dotclear'), __('Import posts from a Dotclear Blog'), array ($dc_import, 'dispatch')); ?> diff --git a/wp-admin/import/greymatter.php b/wp-admin/import/greymatter.php index 8f7b34a4f..5494197f1 100644 --- a/wp-admin/import/greymatter.php +++ b/wp-admin/import/greymatter.php @@ -16,44 +16,44 @@ class GM_Import { function greet() { $this->header(); ?> -

This is a basic GreyMatter to WordPress import script.

-

What it does:

+

+

-

What it does not:

+

 

-

Second step: GreyMatter details:

+

- + - + - + - +
Path to GM files:
Path to GM entries:

This importer will search for files 00000001.cgi to 000-whatever.cgi,
so you need to enter the number of the last GM post here.
(if you don't know that number, just log into your FTP and look it out
in the entries' folder)
so you need to enter the number of the last GM post here.
(if you don't know that number, just log into your FTP and look it out
in the entries' folder)") ?>
Last entry's number:

-

When you're ready, click OK to start importing:

+

 

header(); ?> -

The importer is running...

+

 

-

Completed Greymatter import !

+

footer(); } @@ -308,5 +309,5 @@ class GM_Import { $gm_import = new GM_Import(); -register_importer('greymatter', 'Greymatter', __('Import posts and comments from your Greymatter blog'), array ($gm_import, 'dispatch')); +register_importer('greymatter', __('Greymatter'), __('Import posts and comments from your Greymatter blog'), array ($gm_import, 'dispatch')); ?> diff --git a/wp-admin/import/livejournal.php b/wp-admin/import/livejournal.php index 44b92a56b..d0c6102be 100644 --- a/wp-admin/import/livejournal.php +++ b/wp-admin/import/livejournal.php @@ -164,5 +164,5 @@ class LJ_Import { $livejournal_import = new LJ_Import(); -register_importer('livejournal', 'LiveJournal', __('Import posts from LiveJournal'), array ($livejournal_import, 'dispatch')); +register_importer('livejournal', __('LiveJournal'), __('Import posts from LiveJournal'), array ($livejournal_import, 'dispatch')); ?> diff --git a/wp-admin/import/mt.php b/wp-admin/import/mt.php index 8c2be5da5..4d608f7f3 100644 --- a/wp-admin/import/mt.php +++ b/wp-admin/import/mt.php @@ -32,7 +32,7 @@ class MT_Import { global $wpdb, $testing; $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY ID"); ?>
or map to existing '; + echo '
  • '.__('Current author:').' '.$author.'
    '.sprintf(__('Create user %1$s or map to existing'), '
    '); $this->users_form($j); echo '
    • '; } - echo ''.'
    '; + echo ''.'
    '; echo ''; echo ''; @@ -163,7 +163,7 @@ class MT_Import { $file = wp_import_handle_upload(); if ( isset($file['error']) ) { $this->header(); - echo '

    Sorry, there has been an error.

    '; + echo '

    '.__('Sorry, there has been an error').'.

    '; echo '

    ' . $file['error'] . '

    '; $this->footer(); return; @@ -334,7 +334,7 @@ class MT_Import { } } if ( $num_comments ) - printf(__(' (%s comments)'), $num_comments); + printf(' '.__('(%s comments)'), $num_comments); // Finally the pings // fix the double newline on the first one @@ -382,7 +382,7 @@ class MT_Import { } } if ( $num_pings ) - printf(__(' (%s pings)'), $num_pings); + printf(' '.__('(%s pings)'), $num_pings); echo ""; } @@ -430,5 +430,5 @@ class MT_Import { $mt_import = new MT_Import(); -register_importer('mt', 'Movable Type and Typepad', __('Imports posts and comments from your Movable Type or Typepad blog'), array ($mt_import, 'dispatch')); +register_importer('mt', __('Movable Type and Typepad'), __('Imports posts and comments from your Movable Type or Typepad blog'), array ($mt_import, 'dispatch')); ?> diff --git a/wp-admin/import/rss.php b/wp-admin/import/rss.php index ba31c2670..aabfe4e66 100644 --- a/wp-admin/import/rss.php +++ b/wp-admin/import/rss.php @@ -168,5 +168,5 @@ class RSS_Import { $rss_import = new RSS_Import(); -register_importer('rss', 'RSS', __('Import posts from an RSS feed'), array ($rss_import, 'dispatch')); +register_importer('rss', __('RSS'), __('Import posts from an RSS feed'), array ($rss_import, 'dispatch')); ?> diff --git a/wp-admin/import/textpattern.php b/wp-admin/import/textpattern.php index 4a123de5f..6af31aae2 100644 --- a/wp-admin/import/textpattern.php +++ b/wp-admin/import/textpattern.php @@ -555,12 +555,12 @@ class Textpattern_Import { echo '

    '.__('Preserving Authors').'

    '; echo '

    '.__('Secondly, we have attempted to preserve post authors. If you are the only author or contributor to your blog, then you are safe. In most cases, we are successful in this preservation endeavor. However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'

    '; echo '

    '.__('Textile').'

    '; - echo '

    '.__('Also, since you\'re coming from Textpattern, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me... You\'ll want it.').'

    '; + echo '

    '.__('Also, since you\'re coming from Textpattern, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me... You\'ll want it.').'

    '; echo '

    '.__('WordPress Resources').'

    '; echo '

    '.__('Finally, there are numerous WordPress resources around the internet. Some of them are:').'

    '; echo ''; echo '

    '.sprintf(__('That\'s it! What are you waiting for? Go login!'), '/wp-login.php').'

    '; @@ -659,5 +659,5 @@ class Textpattern_Import { } $txp_import = new Textpattern_Import(); -register_importer('textpattern', 'Textpattern', __('Import posts from a Textpattern Blog'), array ($txp_import, 'dispatch')); +register_importer('textpattern', __('Textpattern'), __('Import posts from a Textpattern Blog'), array ($txp_import, 'dispatch')); ?> diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php index 11c9f3efe..0740ddfa8 100644 --- a/wp-admin/import/wordpress.php +++ b/wp-admin/import/wordpress.php @@ -148,7 +148,7 @@ class WP_Import { $j = -1; foreach ($authors as $author) { ++ $j; - echo '
  • Current author: '.$author.'
    '.'Create user
    or map to existing '; + echo '
  • '.__('Current author:').' '.$author.'
    '.sprintf(__('Create user %1$s or map to existing'), '
    '); $this->users_form($j); echo '
    • '; } @@ -163,7 +163,7 @@ class WP_Import { $file = wp_import_handle_upload(); if ( isset($file['error']) ) { $this->header(); - echo '

    Sorry, there has been an error.

    '; + echo '

    '.__('Sorry, there has been an error.').'

    '; echo '

    ' . $file['error'] . '

    '; $this->footer(); return; @@ -248,7 +248,7 @@ class WP_Import { } } } if ( $num_comments ) - printf(__(' (%s comments)'), $num_comments); + printf(' '.__('(%s comments)'), $num_comments); // Now for post meta preg_match_all('|(.*?)|is', $post, $postmeta); @@ -266,7 +266,7 @@ class WP_Import { wp_import_cleanup($this->id); - echo '

    '.sprintf(__('All done. Have fun!'), get_option('home')).'

    '; + echo '

    '.sprintf(__('All done.').' '.__('Have fun!').'', get_option('home')).'

    '; } function import() { diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php index eb974a483..d91ea1d4d 100644 --- a/wp-admin/options-privacy.php +++ b/wp-admin/options-privacy.php @@ -16,10 +16,10 @@ include('./admin-header.php'); /> - +
    /> - + diff --git a/wp-admin/page.php b/wp-admin/page.php index 76164d218..554475da8 100644 --- a/wp-admin/page.php +++ b/wp-admin/page.php @@ -57,7 +57,7 @@ case 'edit': ?>

    - +

    - +
    link_updated_f, 0, 2) ) - $title .= ' (Last updated ' . date(get_option('links_updated_date_format'), $bookmark->link_updated_f + (get_option('gmt_offset') * 3600)) . ')'; + if ( '00' != substr($bookmark->link_updated_f, 0, 2) ) { + $title .= ' '; + $title .= sprintf(__('Last updated: %s'), date(get_option('links_updated_date_format'), $bookmark->link_updated_f + (get_option('gmt_offset') * 3600))); + $title .= ')'; + } if ( '' != $title ) $title = ' title="' . $title . '"'; @@ -348,4 +351,4 @@ function wp_list_bookmarks($args = '') { echo $output; } -?> \ No newline at end of file +?> diff --git a/wp-includes/classes.php b/wp-includes/classes.php index 1e98db1c2..3c1db019b 100644 --- a/wp-includes/classes.php +++ b/wp-includes/classes.php @@ -25,9 +25,9 @@ class retrospam_mgr { $cnt++; } } - echo "

    $cnt comment"; - if ($cnt != 1 ) echo "s"; - echo " moved to the moderation queue.

    \n"; + echo "

    "; + printf(__('%d comment(s) moved to the moderation queue.'), $cnt); + echo "

    \n"; } // End function move_spam function find_spam() { @@ -56,7 +56,7 @@ class retrospam_mgr { $numfound = count($counters[found]); $numqueue = $counters[in_queue]; - $body = '

    ' . sprintf(__('Suspected spam comments: %s'), $numfound) . '

    '; + $body = '

    ' . sprintf(__('Suspected spam comments: %s'), "$numfound") . '

    '; if ( count($counters[found]) > 0 ) { $id_list = implode( ',', $counters[found] ); diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 8d4b2a760..cfeccfdd4 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -947,7 +947,7 @@ function wp_upload_bits($name, $type, $bits) { $ifp = @ fopen($new_file, 'wb'); if ( ! $ifp ) - return array('error' => "Could not write file $new_file."); + return array('error' => sprintf(__('Could not write file %s'), $new_file)); $success = @ fwrite($ifp, $bits); fclose($ifp); @@ -1091,7 +1091,7 @@ function wp_explain_nonce($action) { } } - return __('Are you sure you want to do this'); + return __('Are you sure you want to do this?'); } function wp_nonce_ays($action) { diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index d339c7f3f..7acd6556b 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -330,7 +330,7 @@ function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false) return "guid}\" title=\"{$_post->post_title}\" >{$innerHTML}"; } else { - $p .= __('Missing attachment'); + $p .= __('Missing Attachment'); } return $p; }