From fba798a103256f5f400cb1a1dcb9cc5b45cf8166 Mon Sep 17 00:00:00 2001 From: donncha Date: Sat, 3 Dec 2005 13:49:00 +0000 Subject: WP Merge and misc fixes, worth upgrading for! git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@460 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- wp-inst/wp-admin/import/textpattern.php | 108 ++++++++++++++++---------------- 1 file changed, 55 insertions(+), 53 deletions(-) (limited to 'wp-inst/wp-admin/import/textpattern.php') diff --git a/wp-inst/wp-admin/import/textpattern.php b/wp-inst/wp-admin/import/textpattern.php index fa9e4a6..48202a9 100644 --- a/wp-inst/wp-admin/import/textpattern.php +++ b/wp-inst/wp-admin/import/textpattern.php @@ -42,7 +42,7 @@ class Textpattern_Import { { echo '
'; echo '

'.__('Import Textpattern').'

'; - echo '

'.__('Steps may take a few minutes depending on the size of your database. Please be patient.

'); + echo '

'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

'; } function footer() @@ -52,12 +52,12 @@ class Textpattern_Import { function greet() { - _e('

Howdy! This importer allows you to extract posts from any Textpattern 4.0.2+ into your blog. This has not been tested on previous versions of Textpattern. Mileage may vary.

'); - _e('

Your Textpattern Configuration settings are as follows:

'); - _e('
'); + echo '

'.__('Howdy! This importer allows you to extract posts from any Textpattern 4.0.2+ into your blog. This has not been tested on previous versions of Textpattern. Mileage may vary.').'

'; + echo '

'.__('Your Textpattern Configuration settings are as follows:').'

'; + echo ''; $this->db_form(); - _e(''); - _e('
'); + echo ''; + echo ''; } function get_txp_cats() @@ -162,7 +162,7 @@ class Textpattern_Import { // Do the Magic if(is_array($categories)) { - echo __('

Importing Categories...

'); + echo '

'.__('Importing Categories...').'

'; foreach ($categories as $category) { $count++; @@ -186,7 +186,7 @@ class Textpattern_Import { // Store category translation for future use add_option('txpcat2wpcat',$txpcat2wpcat); - echo __('

Done! '.$count.' categories imported.

'); + echo '

'.sprintf(__('Done! %1$s categories imported.'), $count).'

'; return true; } echo __('No Categories to Import!'); @@ -203,7 +203,7 @@ class Textpattern_Import { // Midnight Mojo if(is_array($users)) { - echo __('

Importing Users...

'); + echo '

'.__('Importing Users...').'

'; foreach($users as $user) { $count++; @@ -258,7 +258,7 @@ class Textpattern_Import { add_option('txpid2wpid',$txpid2wpid); - echo __('

Done! '.$count.' users imported.

'); + echo '

'.sprintf(__('Done! %1$s users imported.'), $count).'

'; return true; }// End if(is_array($users) @@ -278,7 +278,7 @@ class Textpattern_Import { // Do the Magic if(is_array($posts)) { - echo __('

Importing Posts...

'); + echo '

'.__('Importing Posts...').'

'; foreach($posts as $post) { $count++; @@ -344,7 +344,7 @@ class Textpattern_Import { // Store ID translation for later use add_option('txpposts2wpposts',$txpposts2wpposts); - echo __('

Done! '.$count.' posts imported.

'); + echo '

'.sprintf(__('Done! %1$s posts imported.'), $count).'

'; return true; } @@ -359,7 +359,7 @@ class Textpattern_Import { // Magic Mojo if(is_array($comments)) { - echo __('

Importing Comments...

'); + echo '

'.__('Importing Comments...').'

'; foreach($comments as $comment) { $count++; @@ -411,7 +411,7 @@ class Textpattern_Import { get_comment_count($ret_id); - echo __('

Done! '.$count.' comments imported.

'); + echo '

'.sprintf(__('Done! %1$s comments imported.'), $count).'

'; return true; } echo __('No Comments to Import!'); @@ -427,7 +427,7 @@ class Textpattern_Import { // Deal with the links if(is_array($links)) { - echo __('

Importing Links...

'); + echo '

'.__('Importing Links...').'

'; foreach($links as $link) { $count++; @@ -462,7 +462,9 @@ class Textpattern_Import { $txplinks2wplinks[$link_id] = $ret_id; } add_option('txplinks2wplinks',$txplinks2wplinks); - echo __('

Done! '.$count.' Links imported.

'); + echo '

'; + printf(__('Done! %s Links imported'), $count); + echo '

'; return true; } echo __('No Links to Import!'); @@ -478,9 +480,9 @@ class Textpattern_Import { - _e('
'); - _e(''); - _e('
'); + echo '
'; + printf('', __('Import Users')); + echo '
'; } @@ -490,9 +492,9 @@ class Textpattern_Import { $users = $this->get_txp_users(); $this->users2wp($users); - _e('
'); - _e(''); - _e('
'); + echo '
'; + printf('', __('Import Posts')); + echo '
'; } function import_posts() @@ -501,9 +503,9 @@ class Textpattern_Import { $posts = $this->get_txp_posts(); $this->posts2wp($posts); - _e('
'); - _e(''); - _e('
'); + echo '
'; + printf('', __('Import Comments')); + echo '
'; } function import_comments() @@ -512,9 +514,9 @@ class Textpattern_Import { $comments = $this->get_txp_comments(); $this->comments2wp($comments); - _e('
'); - _e(''); - _e('
'); + echo '
'; + printf('', __('Import Links')); + echo '
'; } function import_links() @@ -524,9 +526,9 @@ class Textpattern_Import { $this->links2wp($links); add_option('txp_links', $links); - _e('
'); - _e(''); - _e('
'); + echo '
'; + printf('', __('Finish')); + echo '
'; } function cleanup_txpimport() @@ -547,32 +549,32 @@ class Textpattern_Import { function tips() { - echo __('

Welcome to WordPress. We hope (and expect!) that you will find this platform incredibly rewarding! As a new WordPress user coming from Textpattern, there are some things that we would like to point out. Hopefully, they will help your transition go as smoothly as possible.

'); - echo __('

Users

'); - echo __('

You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn\'t have that login in Textpattern, why should you have it here? Instead we have taken care to import all of your users into our system. Unfortunately there is one downside. Because both WordPress and Textpattern uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users. Every user has the same username, but their passwords are reset to password123. So Login and change it.

'); - 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 __('

WordPress Resources

'); - echo __('

Finally, there are numerous WordPress resources around the internet. Some of them are:

'); - echo __(''); - echo __('

That\'s it! What are you waiting for? Go login!

'); + echo '

'.__('Welcome to WordPress. We hope (and expect!) that you will find this platform incredibly rewarding! As a new WordPress user coming from Textpattern, there are some things that we would like to point out. Hopefully, they will help your transition go as smoothly as possible.').'

'; + echo '

'.__('Users').'

'; + echo '

'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn\'t have that login in Textpattern, why should you have it here? Instead we have taken care to import all of your users into our system. Unfortunately there is one downside. Because both WordPress and Textpattern uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users. Every user has the same username, but their passwords are reset to password123. So Login and change it.'), '/wp-login.php').'

'; + 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 '

'.__('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').'

'; } function db_form() { - _e(''); + echo ''; } function dispatch() -- cgit