Changeset 1559:b6601f74bcd2 for plugins

Timestamp:

08/24/13 11:25:47 (12 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

Import/Export? enhancements.

Location:

plugins/importExport/inc

Files:

• class.dc.export.flat.php (modified) (1 diff)
• class.dc.import.dc1.php (modified) (2 diffs)
• class.dc.import.feed.php (modified) (2 diffs)
• class.dc.import.flat.php (modified) (5 diffs)
• class.dc.import.wp.php (modified) (3 diffs)

plugins/importExport/inc/class.dc.export.flat.php

@@ -193 +193 @@
           '<form action="'.$this->getURL(true).'" method="post" class="fieldset">'.
           '<h3>'.__('Single blog').'</h3>'.
-          '<p>'.sprintf(__('This will create an export of your current blog: %s'),html::escapeHTML($this->core->blog->name)).'</p>'.
+          '<p>'.sprintf(__('This will create an export of your current blog: %s'),'<strong>'.html::escapeHTML($this->core->blog->name)).'</strong>.</p>'.
           
           '<p><label for="file_name">'.__('File name:').'</label>'.

plugins/importExport/inc/class.dc.import.dc1.php

@@ -143 +143 @@
                case 1:
                     echo
-                    '<p>'.sprintf(__('This will import your Dotclear 1.2 content as new content in the current blog: %s.'),
+                    '<p>'.sprintf(__('Import the content of a Dotclear 1.2\'s blog in the current blog: %s.'),
                     '<strong>'.html::escapeHTML($this->core->blog->name).'</strong>').'</p>'.
-                    '<p class="static-msg">'.__('Please note that this process '.
-                    'will empty your categories, blogroll, entries and comments on the current blog.').'</p>'.
-                    '<p>'.__('Depending on the size of your blog, it could take a few minutes.').'</p>';
+                    '<p class="form-note warn">'.__('Please note that this process '.
+                    'will empty your categories, blogroll, entries and comments on the current blog.').'</p>';
                     
                     printf($this->imForm(1,__('General information'),__('Import my blog now')),
-                    '<p class="form-note info">'.__('We first need some information about your old Dotclear 1.2 installation.').'</p>'.
+                    '<p>'.__('We first need some information about your old Dotclear 1.2 installation.').'</p>'.
                     '<p><label for="db_host">'.__('Database Host Name:').'</label> '.
                     form::field('db_host',30,255,html::escapeHTML($this->vars['db_host'])).'</p>'.
@@ -217 +216 @@
           return
           '<form action="'.$this->getURL(true).'" method="post">'.
-          '<fieldset><legend>'.$legend.'</legend>'.
+          '<h3>'.$legend.'</h3>'.
           $this->core->formNonce().
           form::hidden(array('do'),'step'.$step).
           '%s'.
           '<p><input type="submit" value="'.$submit_value.'" /></p>'.
-          '</fieldset>'.
+          '<p class="form-note info">'.__('Depending on the size of your blog, it could take a few minutes.').'</p>'.
           '</form>';
      }

plugins/importExport/inc/class.dc.import.feed.php

@@ -20 +20 @@
      {
           $this->type = 'import';
-          $this->name = __('Feed import');
-          $this->description = __('Imports a feed as new entries.');
+          $this->name = __('RSS or Atom feed import');
+          $this->description = __('Add a feed content to the blog.');
      }
      
@@ -82 +82 @@
           echo
           '<form action="'.$this->getURL(true).'" method="post">'.
-          '<p>'.sprintf(__('This will import a feed (RSS or Atom) a as new content in the current blog: %s.'),html::escapeHTML($this->core->blog->name)).'</p>'.
+          '<p>'.sprintf(__('Add a feed content to the current blog: <strong>%s</strong>.'),html::escapeHTML($this->core->blog->name)).'</p>'.
           
           '<p><label for="feed_url">'.__('Feed URL:').'</label>'.

plugins/importExport/inc/class.dc.import.flat.php

@@ -142 +142 @@
           if ($this->status == 'single')
           {
-               dcPage::message(__('Single blog successfully imported.'));
+               dcPage::success(__('Single blog successfully imported.'));
                return;
           }
           if ($this->status == 'full')
           {
-               dcPage::message(__('Content successfully imported.'));
+               dcPage::success(__('Content successfully imported.'));
                return;
           }
@@ -184 +184 @@
           '<p>'.sprintf(__('This will import a single blog backup as new content in the current blog: <strong>%s</strong>.'),html::escapeHTML($this->core->blog->name)).'</p>'.
           
-          '<p><label for="up_single_file" class="classic">'.__('Upload a backup file').
-          ' ('.sprintf(__('Maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'.' </label>'.
+          '<p><label for="up_single_file">'.__('Upload a backup file').
+          ' ('.sprintf(__('maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'.' </label>'.
           ' <input type="file" id="up_single_file" name="up_single_file" size="20" />'.
           '</p>';
@@ -191 +191 @@
           if ($has_files) {
                echo 
-               '<p><label for="public_single_file" class="classic">'.__('or pick up a local file in your public directory').'</label> '.
+               '<p><label for="public_single_file" class="">'.__('or pick up a local file in your public directory').' </label> '.
                form::combo('public_single_file',$public_files).
                '</p>';
@@ -212 +212 @@
                '<p class="warning">'.__('This will reset all the content of your database, except users.').'</p>'.
                
-               '<p><label for="up_full_file" class="classic">'.__('Upload a backup file').' '.
-               ' ('.sprintf(__('Maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'.' </label>'.
+               '<p><label for="up_full_file">'.__('Upload a backup file').' '.
+               ' ('.sprintf(__('maximum size %s'),files::size(DC_MAX_UPLOAD_SIZE)).')'.' </label>'.
                '<input type="file" id="up_full_file" name="up_full_file" size="20" />'.
                '</p>';
@@ -219 +219 @@
                if ($has_files) {
                     echo 
-                    '<p><label for="public_full_file" class="classic">'.__('or pick up a local file in your public directory').' </label>'.
+                    '<p><label for="public_full_file">'.__('or pick up a local file in your public directory').' </label>'.
                     form::combo('public_full_file',$public_files).
                     '</p>';

plugins/importExport/inc/class.dc.import.wp.php

@@ -176 +176 @@
                     '<p>'.sprintf(__('This will import your WordPress content as new content in the current blog: %s.'),
                     '<strong>'.html::escapeHTML($this->core->blog->name).'</strong>').'</p>'.
-                    '<p class="static-msg">'.__('Please note that this process '.
-                    'will empty your categories, blogroll, entries and comments on the current blog.').'</p>'.
-                    '<p>'.__('Depending on the size of your blog, it could take a few minutes.').'</p>';
+                    '<p class="form-note warn">'.__('Please note that this process '.
+                    'will empty your categories, blogroll, entries and comments on the current blog.').'</p>';
                     
                     printf($this->imForm(1,__('General information'),__('Import my blog now')),
-                    '<h3>'.__('We first need some information about your old WordPress installation.').'</h3>'.
+                    '<p>'.__('We first need some information about your old WordPress installation.').'</p>'.
                     '<p><label for="db_host">'.__('Database Host Name:').'</label> '.
                     form::field('db_host',30,255,html::escapeHTML($this->vars['db_host'])).'</p>'.
@@ -199 +198 @@
                     'category per post and will chose the lowest numbered one. If you want to keep a trace of '.
                     'every category, you can import them as tags, with an optional prefix.').'</p>'.
-                    '<p>'.__('On the other hand, in WordPress, a post can not be uncategorized, and a default '.
-                    'installation has a first category labelised <i>"Uncategorized"</i>. If you did not change that '.
-                    'category, you can just ignore it while importing your blog, as Dotclear allows you to '.
-                    'actually keep your posts uncategorized.').'</p>'.
+                    '<p>'.__('On the other hand, in WordPress, a post can not be uncategorized, and a '.
+                    'default installation has a first category labelised <i>"Uncategorized"</i>.'.
+                    'If you did not change that category, you can just ignore it while '.
+                    'importing your blog, as Dotclear allows you to actually keep your posts '.
+                    'uncategorized.').'</p>'.
 
                     '<p><label for="ignore_first_cat" class="classic">'.form::checkbox('ignore_first_cat',1,$this->vars['ignore_first_cat']).' '.
@@ -265 +265 @@
           return
           '<form action="'.$this->getURL(true).'" method="post">'.
-          '<fieldset><legend>'.$legend.'</legend>'.
+          '<h3>'.$legend.'</h3>'.
           $this->core->formNonce().
           form::hidden(array('do'),'step'.$step).
           '%s'.
           '<p><input type="submit" value="'.$submit_value.'" /></p>'.
-          '</fieldset>'.
+          '<p class="form-note info">'.__('Depending on the size of your blog, it could take a few minutes.').'</p>'.
           '</form>';
      }