Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

* finalized Post import

git-svn-id: http://plugins.svn.wordpress.org/canalblog-importer/branches/1.2@385126 b8457f37-d9ea-0310-8a92-e5e31aec5664
  • Loading branch information...
commit 79b71d13a5c50a22906863ca62b844ae6873454e 1 parent d905fc3
@oncletom authored
View
16 assets/javascripts/import.js
@@ -28,20 +28,30 @@
};
CI.HandleResponse = function(response){
- var $AjaxResponseHolder = $('#ajax-responses');
+ var $AjaxResponseHolder = $('#ajax-responses'),
+ progress = $('operation progress', response).text();
/*
* Adding messages to the UI
*/
$('object > response_data', response).each(function(){
$AjaxResponseHolder.prepend('<li>'+$(this).text()+'</li>');
+ isOK = true;
});
- $('#import-progress-value').text($('operation progress', response).text());
+ $('#import-progress-value').text(progress);
+
+ /*
+ * No progress? Means error
+ */
+ if ('' === progress)
+ {
+ $AjaxResponseHolder.prepend('<li>'+response+'</li>');
+ }
/*
* Continue batch
*/
- if (1 !== parseInt($('operation finished', response).text(), 10))
+ else if (1 !== parseInt($('operation finished', response).text(), 10))
{
return CI.ExecuteRemoteOperation();
}
View
BIN  i18n/canalblog-importer-fr_FR.mo
Binary file not shown
View
456 i18n/canalblog-importer-fr_FR.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Oncle Tom\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-01 23:04+0100\n"
-"PO-Revision-Date: 2010-07-01 23:05+0100\n"
+"POT-Creation-Date: 2011-05-15 18:21+0100\n"
+"PO-Revision-Date: 2011-05-15 18:21+0100\n"
"Last-Translator: Oncle Tom <thomas@oncle-tom.net>\n"
"Language-Team: Oncle Tom <thomas+i18n@oncle-tom.net>\n"
"MIME-Version: 1.0\n"
@@ -24,324 +24,426 @@ msgstr ""
msgid "Enables content importing from a blog hosted on Canalblog platform."
msgstr "Active l'import du contenu d'un blog hébergé sur la plateforme Canalblog."
-#: ../pages/06-ccln.php:3
-#: ../pages/01-init.php:3
-#: ../pages/04-arch.php:3
-#: ../pages/05-clnp.php:3
-#: ../pages/03-cats.php:3
-#: ../pages/02-tags.php:3
-msgid "Canalblog Importer"
-msgstr ""
+#: ../lib/Importer.class.php:53
+msgid "Cancel"
+msgstr "Annuler"
-#: ../pages/06-ccln.php:5
-msgid "Finished!"
-msgstr "Terminé !"
+#: ../lib/Importer.class.php:53
+msgid "Done"
+msgstr "Terminé"
-#: ../pages/06-ccln.php:11
-msgid "Finally, you've made your way from Canalblog. Before I wish you a newly happy blogging, please check these settings:"
-msgstr "Finalement vous avez fait votre chemin depuis Canalblog. Avant de vous souhaiter une nouvelle façon de bloguer, merci de vérifier ces derniers points :"
+#: ../lib/Plugin.class.php:54
+msgid "Import a Canalblog blog"
+msgstr "Importer un blog Canalblog"
-#: ../pages/06-ccln.php:14
-msgid "Users"
+#: ../lib/Plugin.class.php:107
+msgid "Canalblog"
msgstr ""
-#: ../pages/06-ccln.php:15
-msgid "Canalblog importer has created as many users as Canalblog authors with published posts. You may be counted in but it is a separate account that your current one: just delete any account to claim back its posts."
-msgstr "L'outil d'import Canalblog a créé autant d'utilisateurs qu'il y avait d'auteurs sur votre blog Canalblog. Vous en faites probablement partie mais les articles ont été publiés sur un compte différent du votre : supprimez-le afin d'en récupérer les articles."
+#: ../lib/Plugin.class.php:107
+msgid "Import posts, comments, and users from a Canalblog blog."
+msgstr "Importation d'articles, de commentaires et d'utilisateurs depuis Canalblog."
-#: ../pages/06-ccln.php:19
-msgid "Configure users"
-msgstr "Gérer les utilisateurs"
+#: ../lib/Importer/Archives.class.php:67
+#, php-format
+msgid "<strong>%s/%s</strong>: found %s posts."
+msgstr "<strong>%s/%s</strong>: %s articles identifiés."
-#: ../pages/06-ccln.php:22
-msgid "Blogroll"
-msgstr ""
+#: ../lib/Importer/Base.class.php:112
+#, php-format
+msgid "HTTP request returned an error: %s [%s]"
+msgstr "La requête HTTP a renvoyé une erreur : %s [%s]"
-#: ../pages/06-ccln.php:23
-msgid "Canalblog importer is not able to retrieve your friends links list. You'll have to retype it from scratch. Sorry ;-("
-msgstr "L'outil d'import Canalblog n'est pas capable de récupérer votre liste de liens amis. Il va falloir la reconstituer entièrement à la main. Désolé ;-("
+#: ../lib/Importer/Base.class.php:116
+#, php-format
+msgid "HTTP request did not returned an expected result [%s]"
+msgstr "La requête HTTP n'a pas renvoyé le résultat escompté [%s]"
-#: ../pages/06-ccln.php:25
-msgid "Configure blogroll"
-msgstr "Gérer mes liens"
+#: ../lib/Importer/Base.class.php:120
+#, php-format
+msgid "Tried to request an unavailable page [%s]"
+msgstr "Tentative d'accès à une page indisponible [%s]"
-#: ../pages/06-ccln.php:28
-msgid "Search Engine Optimization"
-msgstr "Référencement Web"
+#: ../lib/Importer/Base.class.php:124
+#, php-format
+msgid "Remote document is empty [%s]"
+msgstr "La page distante est vide [%s]"
-#: ../pages/06-ccln.php:30
-msgid "You changed your blog address without any possibility to redirect back your old blog to this one. Some advice:"
-msgstr "L'adresse de votre blog a changé sans avoir la possibilité de rediriger votre ancien contenu vers ce blog. Voici quelques conseils :"
+#: ../lib/Importer/Base.class.php:149
+#, php-format
+msgid "An error occured during HTTP request: %s. [%s]"
+msgstr "Une erreur s'est produite pendant une requête HTTP : %s. [%s]"
-#: ../pages/06-ccln.php:32
-msgid "Tell your friends your blog address has changed... so as they will update links towards your new blog!"
-msgstr "Indiquez à vos amis que l'adresse de votre blog a changé ... afin qu'ils puissent mettre à jour les liens vers votre nouvelle adresse de blog !"
+#: ../lib/Importer/Categories.class.php:59
+#: ../lib/Importer/Tags.class.php:64
+#, php-format
+msgid "<strong>%s</strong> already exists. Skipped."
+msgstr "<strong>%s</strong> existe déjà. Passé."
-#: ../pages/06-ccln.php:33
-msgid "Setup your Canalblog blog to hide from search engines (it's in Setup &gt; Syndication and ads). It will avoid duplicate content."
-msgstr "Configurez votre blog Canalblog de sorte à le masquer des moteurs de recherche (voir dans Paramètres &gt; Syndication et publicités). Ça évitera les doublons de contenus."
+#: ../lib/Importer/Categories.class.php:63
+#, php-format
+msgid "<strong>%s</strong> category created."
+msgstr "Catégorie <strong>%s</strong> créée."
-#: ../pages/06-ccln.php:34
-msgid "Change your email signature and social profiles to update your blog address."
-msgstr "Changez votre signature d'emails et vos profils de réseaux sociaux afin de refléter la nouvelle adresse de votre blog."
+#: ../lib/Importer/Categories.class.php:67
+#, php-format
+msgid "<strong>%s</strong> category creation failed."
+msgstr "<strong>%s</strong> : échec de la création de la catégorie."
-#: ../pages/06-ccln.php:38
-msgid "And finally..."
-msgstr "Et pour terminer ..."
+#: ../lib/Importer/Post.class.php:74
+msgid "error"
+msgstr "erreur"
-#: ../pages/06-ccln.php:40
-msgid "Once you're done, delete your Canalblog account and <a href='http://www.canalblog.com/cf/contact.cfm' target='_blank'>write a mail to their team</a> explaining why you left. They have not evolved, you did."
-msgstr "Une fois que vous en avez fini, supprimez votre compte Canalblog et <a href='http://www.canalblog.com/cf/contact.cfm' target='_blank'>adressez un email à leur équipe</a> en expliquant les raisons de votre départ. Ils n'ont pas évolué, vous oui."
+#: ../lib/Importer/Post.class.php:162
+msgid "skipped"
+msgstr "passé"
-#: ../pages/06-ccln.php:45
-#: ../lib/Importer.class.php:52
-msgid "Done"
-msgstr "Terminé"
+#: ../lib/Importer/Post.class.php:168
+msgid "overwritten"
+msgstr "mis à jour"
-#: ../pages/06-ccln.php:46
-msgid "I'm aware I've finally left Canalblog and this importer saved my life. Almost."
-msgstr "Je suis conscient(e) que j'ai finalement quitté Canalblog et que cet outil m'a sauvé la vie. Enfin presque."
+#: ../lib/Importer/Post.class.php:177
+msgid "imported"
+msgstr "importé"
+
+#: ../lib/Importer/Posts.class.php:61
+#, php-format
+msgid "<strong>%s</strong> post import: %s"
+msgstr "Import de <strong>%s</strong> : %s"
+
+#: ../lib/Importer/Posts.class.php:66
+#, php-format
+msgid "<em>%s comments</em>: %s new, %s skipped, %s overwritten"
+msgstr "<em>%s commentaires</em>: %s nouveaux, %s passés, %s mis à jour"
+
+#: ../lib/Importer/Posts.class.php:72
+#, php-format
+msgid "<em>%s medias</em>: %s new, %s skipped"
+msgstr "<em>%s médias</em>: %s nouveaux, %s passés"
+
+#: ../lib/Importer/Tags.class.php:68
+#, php-format
+msgid "<strong>%s</strong> tag created."
+msgstr "Mot-clé <strong>%s</strong> créé."
+
+#: ../lib/Importer/Tags.class.php:72
+#, php-format
+msgid "<strong>%s</strong> tag creation failed."
+msgstr "<strong>%s</strong> : échec de la création du mot-clé."
+
+#: ../pages/01-init.php:3
+#: ../pages/02-tags.php:3
+#: ../pages/03-cats.php:3
+#: ../pages/04-arch.php:3
+#: ../pages/05-post.php:3
+#: ../pages/06-clnp.php:3
+#: ../pages/07-ccln.php:3
+msgid "Canalblog Importer"
+msgstr ""
#: ../pages/01-init.php:5
msgid "You are only a few steps to your Canalblog to WordPress migration. Please fill in the fields and press <em>Start import</em>."
msgstr "Vous êtes à quelques étapes de votre migration de Canalblog vers WordPress. Merci de compléter les champs requis et de cliquer sur le bouton <em>Démarrer l'import</em>."
#: ../pages/01-init.php:7
-#: ../pages/04-arch.php:5
-#: ../pages/05-clnp.php:5
-#: ../pages/03-cats.php:5
#: ../pages/02-tags.php:5
+#: ../pages/03-cats.php:5
+#: ../pages/04-arch.php:5
+#: ../pages/05-post.php:5
+#: ../pages/06-clnp.php:5
msgid "Import Steps"
msgstr "Étapes de l'import"
#: ../pages/01-init.php:9
-#: ../pages/01-init.php:16
-#: ../pages/04-arch.php:7
-#: ../pages/05-clnp.php:7
-#: ../pages/03-cats.php:7
+#: ../pages/01-init.php:17
#: ../pages/02-tags.php:7
+#: ../pages/03-cats.php:7
+#: ../pages/04-arch.php:7
+#: ../pages/05-post.php:7
+#: ../pages/06-clnp.php:7
msgid "Configuration"
msgstr "Configuration"
#: ../pages/01-init.php:10
-#: ../pages/04-arch.php:8
-#: ../pages/05-clnp.php:8
-#: ../pages/03-cats.php:8
#: ../pages/02-tags.php:8
-#: ../pages/02-tags.php:14
+#: ../pages/02-tags.php:15
+#: ../pages/03-cats.php:8
+#: ../pages/04-arch.php:8
+#: ../pages/05-post.php:8
+#: ../pages/06-clnp.php:8
msgid "Tags"
msgstr "Mots-clefs"
#: ../pages/01-init.php:11
-#: ../pages/04-arch.php:9
-#: ../pages/05-clnp.php:9
-#: ../pages/03-cats.php:9
-#: ../pages/03-cats.php:14
#: ../pages/02-tags.php:9
+#: ../pages/03-cats.php:9
+#: ../pages/03-cats.php:15
+#: ../pages/04-arch.php:9
+#: ../pages/05-post.php:9
+#: ../pages/06-clnp.php:9
msgid "Categories"
msgstr "Catégories"
#: ../pages/01-init.php:12
-#: ../pages/04-arch.php:10
-#: ../pages/04-arch.php:14
-#: ../pages/05-clnp.php:10
-#: ../pages/03-cats.php:10
#: ../pages/02-tags.php:10
+#: ../pages/03-cats.php:10
+#: ../pages/04-arch.php:10
+#: ../pages/04-arch.php:15
+#: ../pages/05-post.php:10
+#: ../pages/06-clnp.php:10
msgid "Archives"
msgstr "Archives"
#: ../pages/01-init.php:13
-#: ../pages/04-arch.php:11
-#: ../pages/05-clnp.php:11
-#: ../pages/05-clnp.php:14
-#: ../pages/03-cats.php:11
#: ../pages/02-tags.php:11
+#: ../pages/03-cats.php:11
+#: ../pages/04-arch.php:11
+#: ../pages/05-post.php:11
+#: ../pages/05-post.php:15
+#: ../pages/06-clnp.php:11
+msgid "Posts, comments and media"
+msgstr "Billets, commentaires et médias"
+
+#: ../pages/01-init.php:14
+#: ../pages/02-tags.php:12
+#: ../pages/03-cats.php:12
+#: ../pages/04-arch.php:12
+#: ../pages/05-post.php:12
+#: ../pages/06-clnp.php:12
+#: ../pages/06-clnp.php:15
msgid "Cleanup"
msgstr "Nettoyage"
-#: ../pages/01-init.php:24
+#: ../pages/01-init.php:25
msgid "Blog URL"
msgstr "Adresse du blog"
-#: ../pages/01-init.php:27
+#: ../pages/01-init.php:28
msgid "Example: http://yourblog.canalblog.com"
msgstr "Exemple : http://votreblog.canalblog.com"
-#: ../pages/01-init.php:34
+#: ../pages/01-init.php:35
msgid "Overwrite existing contents"
msgstr "Mettre à jour le contenu existant"
-#: ../pages/01-init.php:37
+#: ../pages/01-init.php:38
msgid "If checked, already imported contents will be updated instead of being skipped."
msgstr "Si coché, le contenu déjà importé sera mis à jour au lieu d'être ignoré."
-#: ../pages/01-init.php:41
+#: ../pages/01-init.php:42
msgid "Default Comments Status"
msgstr "Statut des commentaires"
-#: ../pages/01-init.php:44
-#: ../pages/01-init.php:54
+#: ../pages/01-init.php:45
+#: ../pages/01-init.php:55
msgid "Opened"
msgstr "Ouvert"
-#: ../pages/01-init.php:45
-#: ../pages/01-init.php:55
+#: ../pages/01-init.php:46
+#: ../pages/01-init.php:56
msgid "Closed"
msgstr "Fermé"
-#: ../pages/01-init.php:47
-#: ../pages/01-init.php:57
+#: ../pages/01-init.php:48
+#: ../pages/01-init.php:58
msgid "It will be the default status for imported articles."
msgstr "Ce sera le réglage par défaut pour les articles importés."
-#: ../pages/01-init.php:51
+#: ../pages/01-init.php:52
msgid "Default Trackback Status"
msgstr "Statut des rétroliens"
-#: ../pages/01-init.php:61
+#: ../pages/01-init.php:62
msgid "Canalblog settings"
msgstr "Réglages de Canalblog"
-#: ../pages/01-init.php:63
+#: ../pages/01-init.php:64
msgid "Please ensure your Canalblog blog is configured with these settings:"
msgstr "Merci de vous assurer que votre blog Canalblog est configuré comme suit :"
-#: ../pages/01-init.php:65
+#: ../pages/01-init.php:66
#, php-format
msgid "Day formatting: %s"
msgstr "Format de la date : %s"
-#: ../pages/01-init.php:66
+#: ../pages/01-init.php:67
#, php-format
msgid "Hour formatting: %s"
msgstr "Format de l'heure : %s"
-#: ../pages/01-init.php:67
+#: ../pages/01-init.php:68
msgid "Digest format: Monthly"
msgstr "Fréquence des archives : Mensuelle"
-#: ../pages/01-init.php:70
+#: ../pages/01-init.php:71
msgid "Configure Canalblog settings"
msgstr "Réglages Canalblog"
-#: ../pages/01-init.php:74
+#: ../pages/01-init.php:75
msgid "Permalink structure"
msgstr "Structure des permaliens"
-#: ../pages/01-init.php:76
+#: ../pages/01-init.php:77
msgid "The importer will rewrite all your internal links (from a post to another). It can be done only once so check your permalink structure <em>before</em> importing anything."
msgstr "L'outil d'import va modifier tous vos liens internes (renvois d'article en article). Ce ne sera fait qu'une seule fois donc assurez vous d'avoir configuré vos permaliens <em>avant</em> d'importer la moindre chose."
-#: ../pages/01-init.php:77
+#: ../pages/01-init.php:78
msgid "Best permalink structure is at least the <em>month and title</em> one (<code>2010/02/sample-post/</code>)."
msgstr "La meilleure structure de permaliens est au moins <em>mois et titre</em> (<code>2010/02/sample-post/</code>)."
-#: ../pages/01-init.php:79
+#: ../pages/01-init.php:80
msgid "Configure permalink structure"
msgstr "Configurer la structure des permaliens"
-#: ../pages/01-init.php:83
+#: ../pages/01-init.php:84
msgid "Thumbnail size"
msgstr "Taille des vignettes"
-#: ../pages/01-init.php:85
+#: ../pages/01-init.php:86
msgid "The importer will retrieve <em>all</em> your pictures and will use the <strong>medium size</strong> format as a replacement within your posts (with a link to full size pictures)."
msgstr "L'outil d'import va rappatrier <em>toutes</em> vos images et utiliser le format <strong>taille moyenne</strong> au sein de vos articles (avec un lien vers la taille plein format)."
-#: ../pages/01-init.php:87
+#: ../pages/01-init.php:88
msgid "Configure thumbnail size"
msgstr "Configurer la taille des vignettes"
-#: ../pages/01-init.php:94
+#: ../pages/01-init.php:95
msgid "Start import"
msgstr "Démarrer l'import"
-#: ../pages/04-arch.php:15
-msgid "This step includes posts, comments, authors and attachments. This is done month by month so if you have a huge blog, be patient ;-)"
-msgstr "Cette étape inclut les articles, commentaires, auteurs et les médias. C'est effectué mois par mois donc si vous avez un blog important, soyez patient(e) ;-)"
-
-#: ../pages/04-arch.php:20
+#: ../pages/02-tags.php:20
#, php-format
-msgid "<strong>%s months of posts</strong> to import &mdash; currently %s/%s &mdash; %s remaining month(s)."
-msgstr "<strong>%s mois d'archives</strong> à importer &mdash; actuellement %s/%s &mdash; %s mois restant(s)."
-
-#: ../pages/04-arch.php:23
-msgid "Import Archives"
-msgstr "Importer les archives"
-
-#: ../pages/04-arch.php:24
-#: ../pages/05-clnp.php:24
-#: ../pages/03-cats.php:23
-#: ../pages/02-tags.php:23
-#: ../lib/Importer.class.php:52
-msgid "Cancel"
-msgstr "Annuler"
-
-#: ../pages/05-clnp.php:20
-msgid "This operation will basically fix all links on your blog and cleanup temporary data stored for all previous steps. It will be quick, promise!"
-msgstr "Cette opération va corriger tous les liens sur votre blog et nettoyer les données temporaires nécessaires aux étapes précédentes. Ça sera rapide, promis !"
-
-#: ../pages/05-clnp.php:23
-msgid "Cleanup and tell me what to do"
-msgstr "Nettoyer et me dire quoi faire"
+msgid "About to import <strong>%s tags</strong>."
+msgstr "Sur le point d'importer <strong>%s mots-clefs</strong>."
-#: ../pages/03-cats.php:19
+#: ../pages/03-cats.php:20
#, php-format
msgid "About to import <strong>%s categories</strong>."
msgstr "Sur le point d'importer <strong>%s catégories</strong>."
-#: ../pages/03-cats.php:22
-msgid "Import Categories"
-msgstr "Importer les catégories"
+#: ../pages/04-arch.php:16
+msgid "This step scans the presence of all the public posts for your whole history. Their content will be imported during the next step."
+msgstr "Cette étape scanne la présence de tous les billets publics au travers des archives. Leur contenu sera importé lors de l'étape suivante."
-#: ../pages/wordpress-importer-missing.php:3
+#: ../pages/04-arch.php:21
#, php-format
-msgid "Sorry but no WordPress Importer has been found. It is used to import post images. <a href='%s'>Please install it</a>, or import without getting back your pictures attachment."
-msgstr "Désolé mais aucun importeur WordPress n'a été trouvé. Il est utilisé pour rapatrier les images des articles. <a href='%s'>Merci de l'installer</a>, ou lancez l'import sans récupérer vos images jointes aux articles."
+msgid "<strong>%s months of posts</strong> to scan before import."
+msgstr "<strong>%s mois d'archives</strong> à scanner avant import."
-#: ../pages/02-tags.php:19
+#: ../pages/05-post.php:16
+msgid "This (long) step imports the scanned posts such as their related comments and media."
+msgstr "Cette (longue) étape importe les articles scannés ainsi que leurs commentaires et médias respectifs."
+
+#: ../pages/05-post.php:21
#, php-format
-msgid "About to import <strong>%s tags</strong>."
-msgstr "Sur le point d'importer <strong>%s mots-clefs</strong>."
+msgid "<strong>%s blog posts</strong> are about to be imported."
+msgstr "<strong>%s billets</strong> sont sur le point d'être importés."
-#: ../pages/02-tags.php:22
-msgid "Import Tags"
-msgstr "Importer les mots-clefs"
+#: ../pages/06-clnp.php:21
+msgid "This operation will basically fix all links on your blog and cleanup temporary data stored for all previous steps. It will be quick, promise!"
+msgstr "Cette opération va corriger tous les liens sur votre blog et nettoyer les données temporaires nécessaires aux étapes précédentes. Ça sera rapide, promis !"
-#: ../lib/Plugin.class.php:54
-msgid "Import a Canalblog blog"
-msgstr "Importer un blog Canalblog"
+#: ../pages/07-ccln.php:5
+msgid "Finished!"
+msgstr "Terminé !"
-#: ../lib/Plugin.class.php:85
-msgid "Canalblog"
+#: ../pages/07-ccln.php:11
+msgid "Finally, you've made your way from Canalblog. Before I wish you a newly happy blogging, please check these settings:"
+msgstr "Finalement vous avez fait votre chemin depuis Canalblog. Avant de vous souhaiter une nouvelle façon de bloguer, merci de vérifier ces derniers points :"
+
+#: ../pages/07-ccln.php:14
+msgid "Users"
+msgstr "Utilisateurs"
+
+#: ../pages/07-ccln.php:15
+msgid "Canalblog importer has created as many users as Canalblog authors with published posts. You may be counted in but it is a separate account that your current one: just delete any account to claim back its posts."
+msgstr "L'outil d'import Canalblog a créé autant d'utilisateurs qu'il y avait d'auteurs sur votre blog Canalblog. Vous en faites probablement partie mais les articles ont été publiés sur un compte différent du votre : supprimez-le afin d'en récupérer les articles."
+
+#: ../pages/07-ccln.php:19
+msgid "Configure users"
+msgstr "Gérer les utilisateurs"
+
+#: ../pages/07-ccln.php:22
+msgid "Blogroll"
msgstr ""
-#: ../lib/Plugin.class.php:85
-msgid "Import posts, comments, and users from a Canalblog blog."
-msgstr "Importation d'articles, de commentaires et d'utilisateurs depuis Canalblog."
+#: ../pages/07-ccln.php:23
+msgid "Canalblog importer is not able to retrieve your friends links list. You'll have to retype it from scratch. Sorry ;-("
+msgstr "L'outil d'import Canalblog n'est pas capable de récupérer votre liste de liens amis. Il va falloir la reconstituer entièrement à la main. Désolé ;-("
-#: ../lib/Importer/Base.class.php:112
-#, php-format
-msgid "HTTP request returned an error: %s [%s]"
-msgstr "La requête HTTP a renvoyé une erreur : %s [%s]"
+#: ../pages/07-ccln.php:25
+msgid "Configure blogroll"
+msgstr "Gérer mes liens"
-#: ../lib/Importer/Base.class.php:116
-#, php-format
-msgid "HTTP request did not returned an expected result [%s]"
-msgstr "La requête HTTP n'a pas renvoyé le résultat escompté [%s]"
+#: ../pages/07-ccln.php:28
+msgid "Search Engine Optimization"
+msgstr "Référencement Web"
-#: ../lib/Importer/Base.class.php:120
-#, php-format
-msgid "Tried to request an unavailable page [%s]"
-msgstr "Tentative d'accès à une page indisponible [%s]"
+#: ../pages/07-ccln.php:30
+msgid "You changed your blog address without any possibility to redirect back your old blog to this one. Some advice:"
+msgstr "L'adresse de votre blog a changé sans avoir la possibilité de rediriger votre ancien contenu vers ce blog. Voici quelques conseils :"
-#: ../lib/Importer/Base.class.php:124
-#, php-format
-msgid "Remote document is empty [%s]"
-msgstr "La page distante est vide [%s]"
+#: ../pages/07-ccln.php:32
+msgid "Tell your friends your blog address has changed... so as they will update links towards your new blog!"
+msgstr "Indiquez à vos amis que l'adresse de votre blog a changé ... afin qu'ils puissent mettre à jour les liens vers votre nouvelle adresse de blog !"
-#: ../lib/Importer/Base.class.php:149
+#: ../pages/07-ccln.php:33
+msgid "Setup your Canalblog blog to hide from search engines (it's in Setup &gt; Syndication and ads). It will avoid duplicate content."
+msgstr "Configurez votre blog Canalblog de sorte à le masquer des moteurs de recherche (voir dans Paramètres &gt; Syndication et publicités). Ça évitera les doublons de contenus."
+
+#: ../pages/07-ccln.php:34
+msgid "Change your email signature and social profiles to update your blog address."
+msgstr "Changez votre signature d'emails et vos profils de réseaux sociaux afin de refléter la nouvelle adresse de votre blog."
+
+#: ../pages/07-ccln.php:38
+msgid "And finally..."
+msgstr "Et pour terminer ..."
+
+#: ../pages/07-ccln.php:40
+msgid "Once you're done, delete your Canalblog account and <a href='http://www.canalblog.com/cf/contact.cfm' target='_blank'>write a mail to their team</a> explaining why you left. They have not evolved, you did."
+msgstr "Une fois que vous en avez fini, supprimez votre compte Canalblog et <a href='http://www.canalblog.com/cf/contact.cfm' target='_blank'>adressez un email à leur équipe</a> en expliquant les raisons de votre départ. Ils n'ont pas évolué, vous oui."
+
+#: ../pages/07-ccln.php:46
+msgid "I'm aware I've finally left Canalblog and this importer saved my life. Almost."
+msgstr "Je suis conscient(e) que j'ai finalement quitté Canalblog et que cet outil m'a sauvé la vie. Enfin presque."
+
+#: ../pages/ajax-results.php:4
+msgid "Loading"
+msgstr "Chargement"
+
+#: ../pages/ajax-results.php:5
+msgid "Operation in progress..."
+msgstr "Opération en cours"
+
+#: ../pages/form-submit.php:2
+msgid "Start Import"
+msgstr "Démarrer l'import"
+
+#: ../pages/form-submit.php:3
+msgid "Next Step &rarr;"
+msgstr "Étape suivante &arr;"
+
+#: ../pages/wordpress-importer-missing.php:3
#, php-format
-msgid "An error occured during HTTP request: %s. [%s]"
-msgstr "Une erreur s'est produite pendant une requête HTTP : %s. [%s]"
+msgid "Sorry but no WordPress Importer has been found. It is used to import post images. <a href='%s'>Please install it</a>, or import without getting back your pictures attachment."
+msgstr "Désolé mais aucun importeur WordPress n'a été trouvé. Il est utilisé pour rapatrier les images des articles. <a href='%s'>Merci de l'installer</a>, ou lancez l'import sans récupérer vos images jointes aux articles."
+
+#~ msgid ""
+#~ "This step includes posts, comments, authors and attachments. This is done "
+#~ "month by month so if you have a huge blog, be patient ;-)"
+#~ msgstr ""
+#~ "Cette étape inclut les articles, commentaires, auteurs et les médias. "
+#~ "C'est effectué mois par mois donc si vous avez un blog important, soyez "
+#~ "patient(e) ;-)"
+
+#~ msgid "Import Archives"
+#~ msgstr "Importer les archives"
+
+#~ msgid "Cleanup and tell me what to do"
+#~ msgstr "Nettoyer et me dire quoi faire"
+
+#~ msgid "Import Categories"
+#~ msgstr "Importer les catégories"
+#~ msgid "Import Tags"
+#~ msgstr "Importer les mots-clefs"
View
370 i18n/canalblog-importer.pot
@@ -5,99 +5,139 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: Canalblog Importer\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-01 23:04+0100\n"
-"PO-Revision-Date: 2010-07-01 23:04+0100\n"
+"POT-Creation-Date: 2011-05-15 18:21+0100\n"
+"PO-Revision-Date: 2011-05-15 18:21+0100\n"
"Last-Translator: Oncle Tom <thomas@oncle-tom.net>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-KeywordsList: _e;_e ;__;__ ;_c;_c ;__ngettext;__ngettext;esc_attr__\n"
"X-Poedit-Basepath: .\n"
+"X-Poedit-Language: English\n"
"X-Poedit-SearchPath-0: ..\n"
#: ../bootstrap.php:17
msgid "Enables content importing from a blog hosted on Canalblog platform."
msgstr ""
-#: ../pages/06-ccln.php:3
-#: ../pages/01-init.php:3
-#: ../pages/04-arch.php:3
-#: ../pages/05-clnp.php:3
-#: ../pages/03-cats.php:3
-#: ../pages/02-tags.php:3
-msgid "Canalblog Importer"
+#: ../lib/Importer.class.php:53
+msgid "Cancel"
msgstr ""
-#: ../pages/06-ccln.php:5
-msgid "Finished!"
+#: ../lib/Importer.class.php:53
+msgid "Done"
msgstr ""
-#: ../pages/06-ccln.php:11
-msgid "Finally, you've made your way from Canalblog. Before I wish you a newly happy blogging, please check these settings:"
+#: ../lib/Plugin.class.php:54
+msgid "Import a Canalblog blog"
msgstr ""
-#: ../pages/06-ccln.php:14
-msgid "Users"
+#: ../lib/Plugin.class.php:107
+msgid "Canalblog"
msgstr ""
-#: ../pages/06-ccln.php:15
-msgid "Canalblog importer has created as many users as Canalblog authors with published posts. You may be counted in but it is a separate account that your current one: just delete any account to claim back its posts."
+#: ../lib/Plugin.class.php:107
+msgid "Import posts, comments, and users from a Canalblog blog."
msgstr ""
-#: ../pages/06-ccln.php:19
-msgid "Configure users"
+#: ../lib/Importer/Archives.class.php:67
+#, php-format
+msgid "<strong>%s/%s</strong>: found %s posts."
msgstr ""
-#: ../pages/06-ccln.php:22
-msgid "Blogroll"
+#: ../lib/Importer/Base.class.php:112
+#, php-format
+msgid "HTTP request returned an error: %s [%s]"
msgstr ""
-#: ../pages/06-ccln.php:23
-msgid "Canalblog importer is not able to retrieve your friends links list. You'll have to retype it from scratch. Sorry ;-("
+#: ../lib/Importer/Base.class.php:116
+#, php-format
+msgid "HTTP request did not returned an expected result [%s]"
msgstr ""
-#: ../pages/06-ccln.php:25
-msgid "Configure blogroll"
+#: ../lib/Importer/Base.class.php:120
+#, php-format
+msgid "Tried to request an unavailable page [%s]"
msgstr ""
-#: ../pages/06-ccln.php:28
-msgid "Search Engine Optimization"
+#: ../lib/Importer/Base.class.php:124
+#, php-format
+msgid "Remote document is empty [%s]"
msgstr ""
-#: ../pages/06-ccln.php:30
-msgid "You changed your blog address without any possibility to redirect back your old blog to this one. Some advice:"
+#: ../lib/Importer/Base.class.php:149
+#, php-format
+msgid "An error occured during HTTP request: %s. [%s]"
msgstr ""
-#: ../pages/06-ccln.php:32
-msgid "Tell your friends your blog address has changed... so as they will update links towards your new blog!"
+#: ../lib/Importer/Categories.class.php:59
+#: ../lib/Importer/Tags.class.php:64
+#, php-format
+msgid "<strong>%s</strong> already exists. Skipped."
msgstr ""
-#: ../pages/06-ccln.php:33
-msgid "Setup your Canalblog blog to hide from search engines (it's in Setup &gt; Syndication and ads). It will avoid duplicate content."
+#: ../lib/Importer/Categories.class.php:63
+#, php-format
+msgid "<strong>%s</strong> category created."
msgstr ""
-#: ../pages/06-ccln.php:34
-msgid "Change your email signature and social profiles to update your blog address."
+#: ../lib/Importer/Categories.class.php:67
+#, php-format
+msgid "<strong>%s</strong> category creation failed."
msgstr ""
-#: ../pages/06-ccln.php:38
-msgid "And finally..."
+#: ../lib/Importer/Post.class.php:74
+msgid "error"
msgstr ""
-#: ../pages/06-ccln.php:40
-msgid "Once you're done, delete your Canalblog account and <a href='http://www.canalblog.com/cf/contact.cfm' target='_blank'>write a mail to their team</a> explaining why you left. They have not evolved, you did."
+#: ../lib/Importer/Post.class.php:162
+msgid "skipped"
msgstr ""
-#: ../pages/06-ccln.php:45
-#: ../lib/Importer.class.php:52
-msgid "Done"
+#: ../lib/Importer/Post.class.php:168
+msgid "overwritten"
msgstr ""
-#: ../pages/06-ccln.php:46
-msgid "I'm aware I've finally left Canalblog and this importer saved my life. Almost."
+#: ../lib/Importer/Post.class.php:177
+msgid "imported"
+msgstr ""
+
+#: ../lib/Importer/Posts.class.php:61
+#, php-format
+msgid "<strong>%s</strong> post import: %s"
+msgstr ""
+
+#: ../lib/Importer/Posts.class.php:66
+#, php-format
+msgid "<em>%s comments</em>: %s new, %s skipped, %s overwritten"
+msgstr ""
+
+#: ../lib/Importer/Posts.class.php:72
+#, php-format
+msgid "<em>%s medias</em>: %s new, %s skipped"
+msgstr ""
+
+#: ../lib/Importer/Tags.class.php:68
+#, php-format
+msgid "<strong>%s</strong> tag created."
+msgstr ""
+
+#: ../lib/Importer/Tags.class.php:72
+#, php-format
+msgid "<strong>%s</strong> tag creation failed."
+msgstr ""
+
+#: ../pages/01-init.php:3
+#: ../pages/02-tags.php:3
+#: ../pages/03-cats.php:3
+#: ../pages/04-arch.php:3
+#: ../pages/05-post.php:3
+#: ../pages/06-clnp.php:3
+#: ../pages/07-ccln.php:3
+msgid "Canalblog Importer"
msgstr ""
#: ../pages/01-init.php:5
@@ -105,241 +145,285 @@ msgid "You are only a few steps to your Canalblog to WordPress migration. Please
msgstr ""
#: ../pages/01-init.php:7
-#: ../pages/04-arch.php:5
-#: ../pages/05-clnp.php:5
-#: ../pages/03-cats.php:5
#: ../pages/02-tags.php:5
+#: ../pages/03-cats.php:5
+#: ../pages/04-arch.php:5
+#: ../pages/05-post.php:5
+#: ../pages/06-clnp.php:5
msgid "Import Steps"
msgstr ""
#: ../pages/01-init.php:9
-#: ../pages/01-init.php:16
-#: ../pages/04-arch.php:7
-#: ../pages/05-clnp.php:7
-#: ../pages/03-cats.php:7
+#: ../pages/01-init.php:17
#: ../pages/02-tags.php:7
+#: ../pages/03-cats.php:7
+#: ../pages/04-arch.php:7
+#: ../pages/05-post.php:7
+#: ../pages/06-clnp.php:7
msgid "Configuration"
msgstr ""
#: ../pages/01-init.php:10
-#: ../pages/04-arch.php:8
-#: ../pages/05-clnp.php:8
-#: ../pages/03-cats.php:8
#: ../pages/02-tags.php:8
-#: ../pages/02-tags.php:14
+#: ../pages/02-tags.php:15
+#: ../pages/03-cats.php:8
+#: ../pages/04-arch.php:8
+#: ../pages/05-post.php:8
+#: ../pages/06-clnp.php:8
msgid "Tags"
msgstr ""
#: ../pages/01-init.php:11
-#: ../pages/04-arch.php:9
-#: ../pages/05-clnp.php:9
-#: ../pages/03-cats.php:9
-#: ../pages/03-cats.php:14
#: ../pages/02-tags.php:9
+#: ../pages/03-cats.php:9
+#: ../pages/03-cats.php:15
+#: ../pages/04-arch.php:9
+#: ../pages/05-post.php:9
+#: ../pages/06-clnp.php:9
msgid "Categories"
msgstr ""
#: ../pages/01-init.php:12
-#: ../pages/04-arch.php:10
-#: ../pages/04-arch.php:14
-#: ../pages/05-clnp.php:10
-#: ../pages/03-cats.php:10
#: ../pages/02-tags.php:10
+#: ../pages/03-cats.php:10
+#: ../pages/04-arch.php:10
+#: ../pages/04-arch.php:15
+#: ../pages/05-post.php:10
+#: ../pages/06-clnp.php:10
msgid "Archives"
msgstr ""
#: ../pages/01-init.php:13
-#: ../pages/04-arch.php:11
-#: ../pages/05-clnp.php:11
-#: ../pages/05-clnp.php:14
-#: ../pages/03-cats.php:11
#: ../pages/02-tags.php:11
+#: ../pages/03-cats.php:11
+#: ../pages/04-arch.php:11
+#: ../pages/05-post.php:11
+#: ../pages/05-post.php:15
+#: ../pages/06-clnp.php:11
+msgid "Posts, comments and media"
+msgstr ""
+
+#: ../pages/01-init.php:14
+#: ../pages/02-tags.php:12
+#: ../pages/03-cats.php:12
+#: ../pages/04-arch.php:12
+#: ../pages/05-post.php:12
+#: ../pages/06-clnp.php:12
+#: ../pages/06-clnp.php:15
msgid "Cleanup"
msgstr ""
-#: ../pages/01-init.php:24
+#: ../pages/01-init.php:25
msgid "Blog URL"
msgstr ""
-#: ../pages/01-init.php:27
+#: ../pages/01-init.php:28
msgid "Example: http://yourblog.canalblog.com"
msgstr ""
-#: ../pages/01-init.php:34
+#: ../pages/01-init.php:35
msgid "Overwrite existing contents"
msgstr ""
-#: ../pages/01-init.php:37
+#: ../pages/01-init.php:38
msgid "If checked, already imported contents will be updated instead of being skipped."
msgstr ""
-#: ../pages/01-init.php:41
+#: ../pages/01-init.php:42
msgid "Default Comments Status"
msgstr ""
-#: ../pages/01-init.php:44
-#: ../pages/01-init.php:54
+#: ../pages/01-init.php:45
+#: ../pages/01-init.php:55
msgid "Opened"
msgstr ""
-#: ../pages/01-init.php:45
-#: ../pages/01-init.php:55
+#: ../pages/01-init.php:46
+#: ../pages/01-init.php:56
msgid "Closed"
msgstr ""
-#: ../pages/01-init.php:47
-#: ../pages/01-init.php:57
+#: ../pages/01-init.php:48
+#: ../pages/01-init.php:58
msgid "It will be the default status for imported articles."
msgstr ""
-#: ../pages/01-init.php:51
+#: ../pages/01-init.php:52
msgid "Default Trackback Status"
msgstr ""
-#: ../pages/01-init.php:61
+#: ../pages/01-init.php:62
msgid "Canalblog settings"
msgstr ""
-#: ../pages/01-init.php:63
+#: ../pages/01-init.php:64
msgid "Please ensure your Canalblog blog is configured with these settings:"
msgstr ""
-#: ../pages/01-init.php:65
+#: ../pages/01-init.php:66
#, php-format
msgid "Day formatting: %s"
msgstr ""
-#: ../pages/01-init.php:66
+#: ../pages/01-init.php:67
#, php-format
msgid "Hour formatting: %s"
msgstr ""
-#: ../pages/01-init.php:67
+#: ../pages/01-init.php:68
msgid "Digest format: Monthly"
msgstr ""
-#: ../pages/01-init.php:70
+#: ../pages/01-init.php:71
msgid "Configure Canalblog settings"
msgstr ""
-#: ../pages/01-init.php:74
+#: ../pages/01-init.php:75
msgid "Permalink structure"
msgstr ""
-#: ../pages/01-init.php:76
+#: ../pages/01-init.php:77
msgid "The importer will rewrite all your internal links (from a post to another). It can be done only once so check your permalink structure <em>before</em> importing anything."
msgstr ""
-#: ../pages/01-init.php:77
+#: ../pages/01-init.php:78
msgid "Best permalink structure is at least the <em>month and title</em> one (<code>2010/02/sample-post/</code>)."
msgstr ""
-#: ../pages/01-init.php:79
+#: ../pages/01-init.php:80
msgid "Configure permalink structure"
msgstr ""
-#: ../pages/01-init.php:83
+#: ../pages/01-init.php:84
msgid "Thumbnail size"
msgstr ""
-#: ../pages/01-init.php:85
+#: ../pages/01-init.php:86
msgid "The importer will retrieve <em>all</em> your pictures and will use the <strong>medium size</strong> format as a replacement within your posts (with a link to full size pictures)."
msgstr ""
-#: ../pages/01-init.php:87
+#: ../pages/01-init.php:88
msgid "Configure thumbnail size"
msgstr ""
-#: ../pages/01-init.php:94
+#: ../pages/01-init.php:95
msgid "Start import"
msgstr ""
-#: ../pages/04-arch.php:15
-msgid "This step includes posts, comments, authors and attachments. This is done month by month so if you have a huge blog, be patient ;-)"
+#: ../pages/02-tags.php:20
+#, php-format
+msgid "About to import <strong>%s tags</strong>."
msgstr ""
-#: ../pages/04-arch.php:20
+#: ../pages/03-cats.php:20
#, php-format
-msgid "<strong>%s months of posts</strong> to import &mdash; currently %s/%s &mdash; %s remaining month(s)."
+msgid "About to import <strong>%s categories</strong>."
msgstr ""
-#: ../pages/04-arch.php:23
-msgid "Import Archives"
+#: ../pages/04-arch.php:16
+msgid "This step scans the presence of all the public posts for your whole history. Their content will be imported during the next step."
msgstr ""
-#: ../pages/04-arch.php:24
-#: ../pages/05-clnp.php:24
-#: ../pages/03-cats.php:23
-#: ../pages/02-tags.php:23
-#: ../lib/Importer.class.php:52
-msgid "Cancel"
+#: ../pages/04-arch.php:21
+#, php-format
+msgid "<strong>%s months of posts</strong> to scan before import."
+msgstr ""
+
+#: ../pages/05-post.php:16
+msgid "This (long) step imports the scanned posts such as their related comments and media."
msgstr ""
-#: ../pages/05-clnp.php:20
+#: ../pages/05-post.php:21
+#, php-format
+msgid "<strong>%s blog posts</strong> are about to be imported."
+msgstr ""
+
+#: ../pages/06-clnp.php:21
msgid "This operation will basically fix all links on your blog and cleanup temporary data stored for all previous steps. It will be quick, promise!"
msgstr ""
-#: ../pages/05-clnp.php:23
-msgid "Cleanup and tell me what to do"
+#: ../pages/07-ccln.php:5
+msgid "Finished!"
msgstr ""
-#: ../pages/03-cats.php:19
-#, php-format
-msgid "About to import <strong>%s categories</strong>."
+#: ../pages/07-ccln.php:11
+msgid "Finally, you've made your way from Canalblog. Before I wish you a newly happy blogging, please check these settings:"
msgstr ""
-#: ../pages/03-cats.php:22
-msgid "Import Categories"
+#: ../pages/07-ccln.php:14
+msgid "Users"
msgstr ""
-#: ../pages/wordpress-importer-missing.php:3
-#, php-format
-msgid "Sorry but no WordPress Importer has been found. It is used to import post images. <a href='%s'>Please install it</a>, or import without getting back your pictures attachment."
+#: ../pages/07-ccln.php:15
+msgid "Canalblog importer has created as many users as Canalblog authors with published posts. You may be counted in but it is a separate account that your current one: just delete any account to claim back its posts."
msgstr ""
-#: ../pages/02-tags.php:19
-#, php-format
-msgid "About to import <strong>%s tags</strong>."
+#: ../pages/07-ccln.php:19
+msgid "Configure users"
msgstr ""
-#: ../pages/02-tags.php:22
-msgid "Import Tags"
+#: ../pages/07-ccln.php:22
+msgid "Blogroll"
msgstr ""
-#: ../lib/Plugin.class.php:54
-msgid "Import a Canalblog blog"
+#: ../pages/07-ccln.php:23
+msgid "Canalblog importer is not able to retrieve your friends links list. You'll have to retype it from scratch. Sorry ;-("
msgstr ""
-#: ../lib/Plugin.class.php:85
-msgid "Canalblog"
+#: ../pages/07-ccln.php:25
+msgid "Configure blogroll"
msgstr ""
-#: ../lib/Plugin.class.php:85
-msgid "Import posts, comments, and users from a Canalblog blog."
+#: ../pages/07-ccln.php:28
+msgid "Search Engine Optimization"
msgstr ""
-#: ../lib/Importer/Base.class.php:112
-#, php-format
-msgid "HTTP request returned an error: %s [%s]"
+#: ../pages/07-ccln.php:30
+msgid "You changed your blog address without any possibility to redirect back your old blog to this one. Some advice:"
msgstr ""
-#: ../lib/Importer/Base.class.php:116
-#, php-format
-msgid "HTTP request did not returned an expected result [%s]"
+#: ../pages/07-ccln.php:32
+msgid "Tell your friends your blog address has changed... so as they will update links towards your new blog!"
msgstr ""
-#: ../lib/Importer/Base.class.php:120
-#, php-format
-msgid "Tried to request an unavailable page [%s]"
+#: ../pages/07-ccln.php:33
+msgid "Setup your Canalblog blog to hide from search engines (it's in Setup &gt; Syndication and ads). It will avoid duplicate content."
msgstr ""
-#: ../lib/Importer/Base.class.php:124
-#, php-format
-msgid "Remote document is empty [%s]"
+#: ../pages/07-ccln.php:34
+msgid "Change your email signature and social profiles to update your blog address."
msgstr ""
-#: ../lib/Importer/Base.class.php:149
+#: ../pages/07-ccln.php:38
+msgid "And finally..."
+msgstr ""
+
+#: ../pages/07-ccln.php:40
+msgid "Once you're done, delete your Canalblog account and <a href='http://www.canalblog.com/cf/contact.cfm' target='_blank'>write a mail to their team</a> explaining why you left. They have not evolved, you did."
+msgstr ""
+
+#: ../pages/07-ccln.php:46
+msgid "I'm aware I've finally left Canalblog and this importer saved my life. Almost."
+msgstr ""
+
+#: ../pages/ajax-results.php:4
+msgid "Loading"
+msgstr ""
+
+#: ../pages/ajax-results.php:5
+msgid "Operation in progress..."
+msgstr ""
+
+#: ../pages/form-submit.php:2
+msgid "Start Import"
+msgstr ""
+
+#: ../pages/form-submit.php:3
+msgid "Next Step &rarr;"
+msgstr ""
+
+#: ../pages/wordpress-importer-missing.php:3
#, php-format
-msgid "An error occured during HTTP request: %s. [%s]"
+msgid "Sorry but no WordPress Importer has been found. It is used to import post images. <a href='%s'>Please install it</a>, or import without getting back your pictures attachment."
msgstr ""
View
9 lib/Importer.class.php
@@ -14,8 +14,9 @@ class CanalblogImporterImporter
2 => array('page' => '02-tags', 'operation' => 'CanalblogImporterImporterTags'),
3 => array('page' => '03-cats', 'operation' => 'CanalblogImporterImporterCategories'),
4 => array('page' => '04-arch', 'operation' => 'CanalblogImporterImporterArchives'),
- 5 => array('page' => '05-clnp', 'operation' => 'CanalblogImporterImporterCleanup'),
- 6 => array('page' => '06-ccln', 'operation' => 'CanalblogImporterImporterConclusion'),
+ 5 => array('page' => '05-post', 'operation' => 'CanalblogImporterImporterPosts'),
+ 6 => array('page' => '06-clnp', 'operation' => 'CanalblogImporterImporterCleanup'),
+ 7 => array('page' => '07-ccln', 'operation' => 'CanalblogImporterImporterConclusion'),
);
protected $plugin;
protected $is_ready_to_process = false;
@@ -121,7 +122,9 @@ public function process(CanalblogImporterImporterBase $operation)
if ($return === true)
{
update_option('canalblog_importer_step', $this->current_page + 1);
- wp_redirect(get_admin_url(null, 'import.php?import=canalblog&step='.get_option('canalblog_importer_step')), 307);
+ printf('<script type="text/javascript">document.location.href="%s";</script>',
+ get_admin_url(null, 'import.php?import=canalblog&step='.get_option('canalblog_importer_step'))
+ );
}
}
catch(CanalblogImporterException $e)
View
9 lib/Importer/Base.class.php
@@ -205,7 +205,7 @@ public static function getWordPressImporterLocation(CanalblogImporterConfigurati
}
}
- return false;
+ return null;
}
/**
@@ -217,7 +217,7 @@ public static function getWordPressImporterLocation(CanalblogImporterConfigurati
*/
public static function isWordPressImporterInstalled(CanalblogImporterConfiguration $configuration)
{
- return self::getWordPressImporterLocation($configuration) ? true : false;
+ return file_exists(self::getWordPressImporterLocation($configuration));
}
/**
@@ -230,6 +230,11 @@ public static function requireWordPressImporter(CanalblogImporterConfiguration $
{
if (self::isWordPressImporterInstalled($configuration))
{
+ if (!defined('WP_LOAD_IMPORTERS'))
+ {
+ define('WP_LOAD_IMPORTERS', true);
+ }
+
require_once self::getWordPressImporterLocation($configuration);
}
else
View
62 lib/Importer/Post.class.php
@@ -44,16 +44,16 @@ public function dispatch()
*/
public function process()
{
- return false;
+ $data = array();
$query = $this->getRemoteXpath($this->uri, "//div[@id='content']", $html);
$dom = new DomDocument();
$dom->appendChild($dom->importNode($query->item(0), true));
- $post_id = $this->savePost($dom, $html);
- $this->saveComments($dom, $html);
- $this->saveMedias($dom, $html);
+ $data['post'] = $this->savePost($dom, $html);
+ $data['comments'] = $this->saveComments($dom, $html);
+ $data['medias'] = $this->saveMedias($dom, $html);
- return $post_id;
+ return $data;
}
/**
@@ -71,6 +71,7 @@ public function savePost(DomDocument $dom)
$data = array(
'post_status' => 'publish',
);
+ $stats = array('title' => $this->uri, 'status' => __('error', 'canalblog-importer'));
/*
* Initial stuff
@@ -80,12 +81,21 @@ public function savePost(DomDocument $dom)
preg_match('#/(\d+)\.html$#U', $this->uri, $matches);
$canalblog_id = $matches[1];
- $tmpdom = new DomDocument();
- $tmpdom->appendChild($tmpdom->importNode($xpath->query("//div[@class='blogbody']//div[@class='itemfooter']")->item(0), true));
- $itemfooter = $tmpdom->saveHTML();
+ if ($footerdom = $xpath->query("//div[@class='blogbody']//div[@class='itemfooter']")->item(0))
+ {
+ $tmpdom = new DomDocument();
+ $tmpdom->appendChild($tmpdom->importNode($footerdom, true));
+ $itemfooter = $tmpdom->saveHTML();
+ }
+ else
+ {
+ return $stats;
+ }
+
preg_match('#archives/(?P<post_year>\d{4})/(?P<post_month>\d{2})/(?P<post_day>\d{2})/(?P<post_id>\d+).html$#U', $this->uri, $matches);
extract($matches);
- unset($matches, $tmpdom);
+ unset($matches, $tmpdom, $footerdom);
+
/*
* Determining title
@@ -149,11 +159,13 @@ public function savePost(DomDocument $dom)
if ($post_id = post_exists($data['post_title'], '', $data['post_date']))
{
$data['ID'] = $post_id;
+ $stats['status'] = __('skipped', 'canalblog-importer');
if ($this->overwrite_contents)
{
wp_untrash_post($post_id);
wp_update_post($data);
+ $stats['status'] = __('overwritten', 'canalblog-importer');
}
$post_existed = true;
@@ -162,7 +174,11 @@ public function savePost(DomDocument $dom)
{
$post_id = wp_insert_post($data);
$data['ID'] = $post_id;
+ $stats['status'] = __('imported', 'canalblog-importer');
}
+
+ $stats['id'] = $data['ID'];
+ $stats['title'] = $data['post_title'];
/*
* Post save extras
@@ -206,7 +222,7 @@ public function savePost(DomDocument $dom)
$this->data = $data;
$this->id = $post_id;
- return $post_id;
+ return $stats;
}
/**
@@ -219,9 +235,11 @@ public function savePost(DomDocument $dom)
*/
public function saveComments(DomDocument $dom, $html)
{
+ $stats = array('count' => 0, 'new' => 0, 'skipped' => 0, 'overwritten' => 0);
+
if ($this->data['comment_status'] == 'closed')
{
- return false;
+ return $stats;
}
/*
@@ -235,11 +253,12 @@ public function saveComments(DomDocument $dom, $html)
preg_match_all('#<a id="c\d+"></a>(.+)<div class="itemfooter">.+</div>#siU', $html_comments, $matches);
$found_comments = $matches[0];
+ $stats['count'] = count($found_comments);
unset($matches);
if (empty($found_comments))
{
- return 0;
+ return $stats;
}
$comments = get_comments(array('post_id' => $this->id));
@@ -304,6 +323,7 @@ public function saveComments(DomDocument $dom, $html)
//happens rarely, don't know why: we skip the import of this comment
if (null === $commentFooterNode)
{
+ $stats['skipped']++;
continue;
}
@@ -343,12 +363,18 @@ public function saveComments(DomDocument $dom, $html)
}
wp_update_comment($data);
+ $stats['overwritten']++;
+ }
+ else
+ {
+ $stats['skipped']++;
}
}
else
{
$comment_id = wp_insert_comment($data);
add_comment_meta($comment_id, 'canalblog_id', $canalblog_comment_id, true);
+ $stats['new']++;
}
unset($tmp, $data);
@@ -358,6 +384,7 @@ public function saveComments(DomDocument $dom, $html)
* Recounting comments for this post
*/
wp_update_comment_count_now($this->id);
+ return $stats;
}
/**
@@ -372,6 +399,8 @@ public function saveComments(DomDocument $dom, $html)
*/
public function saveMedias(DomDocument $dom)
{
+ $stats = array('count' => 0, 'new' => 0, 'skipped' => 0, 'overwritten' => 0);
+
/*
* Initialize WordPress importer
*/
@@ -380,7 +409,7 @@ public function saveMedias(DomDocument $dom)
}
catch (CanalblogImporterException $e)
{
- return false;
+ return $stats;
}
$wpImport = new WP_Import();
@@ -410,13 +439,14 @@ public function saveMedias(DomDocument $dom)
}
$remote_uris = array_unique($remote_uris);
+ $stats['count'] = count($remote_uris);
/*
* No picture? No need to go furthermore
*/
if (empty($remote_uris))
{
- return false;
+ return $stats;
}
$upload = wp_upload_dir($post['post_date']);
@@ -437,6 +467,7 @@ public function saveMedias(DomDocument $dom)
*/
if (!empty($candidates))
{
+ $stats['skipped']++;
continue;
}
@@ -452,6 +483,7 @@ public function saveMedias(DomDocument $dom)
$attachment_id = $wpImport->process_attachment($postdata, $remote_uri);
add_post_meta($attachment_id, 'canalblog_attachment_uri', $remote_uri, true);
$attachments[$remote_uri] = $attachment_id;
+ $stats['new']++;
}
/*
@@ -511,6 +543,8 @@ public function saveMedias(DomDocument $dom)
{
$wpImport->backfill_attachment_urls();
}
+
+ return $stats;
}
protected function thumbnailFilenameFixNew($uri)
View
150 lib/Importer/Posts.class.php
@@ -1,6 +1,6 @@
<?php
-class CanalblogImporterImporterArchives extends CanalblogImporterImporterBase
+class CanalblogImporterImporterPosts extends CanalblogImporterImporterBase
{
/**
* @see lib/Importer/CanalblogImporterImporterBase#dispatch()
@@ -12,11 +12,8 @@ public function dispatch()
return false;
}
- $this->arguments['pagination_limit'] = 250;
- $this->arguments['page'] = get_option('canalblog_importer_archives_current_index', 0);
- $this->arguments['months'] = $this->getMonths();
-
ini_set('memory_limit', '128M');
+ $this->arguments['permalinks'] = get_transient('canalblog_permalinks');
return true;
}
@@ -26,94 +23,71 @@ public function dispatch()
*/
public function process()
{
- return false;
-
- /*
- * No index defined? We can go the next step
- */
- if (empty($this->arguments['months']) || !isset($this->arguments['months'][$this->arguments['page']]))
- {
- return true;
- }
-
- $archives_index = $this->arguments['months'][$this->arguments['page']];
- $permalinks = $this->getMonth($archives_index['year'], $archives_index['month']);
-
- foreach ($permalinks as $permalink)
- {
- /*
- * Importing post content
- */
- $post = new CanalblogImporterImporterPost($this->getConfiguration());
- $post->setUri($permalink);
- $post->process();
- }
+ if (!!get_transient('canablog_have_finished_posts'))
+ {
+ delete_transient('canablog_have_finished_posts');
+ delete_transient('canalblog_permalinks');
+ delete_transient('canalblog_step_offset');
- update_option('canalblog_importer_archives_current_index', $this->arguments['page'] + 1);
- $url = '?import=canalblog&step='.get_option('canalblog_importer_step').'&process-import=1&_wpnonce='.wp_create_nonce('import-canalblog');
- echo '<script type="text/javascript">window.location.href = "'.$url.'";</script>';
+ return true;
+ }
+
+ return false;
}
-
- /**
- * Retrieves all permalinks within a month archive
- * @param unknown_type $year
- * @param unknown_type $month
- * @return unknown_type
- */
- protected function getMonth($year, $month)
+
+ public function processRemote(WP_Ajax_Response $response)
{
- $uri_suffix = sprintf('%s/%s/p0-%s.html', $year, $month, $this->arguments['pagination_limit']);
- $dom = $this->getRemoteDomDocument(get_option('canalblog_importer_blog_uri').'/archives/'.$uri_suffix);
- $xpath = new DOMXPath($dom);
- $permalinks = array();
-
- foreach ($xpath->query("//div[@id='content']//a[@rel='bookmark']") as $node)
- {
- $permalinks[] = $node->getAttribute('href');
- }
+ $offset = (int)get_transient('canalblog_step_offset');
+ $new_offset = $offset + 10;
+ $progress = floor(($offset / count($this->arguments['permalinks'])) * 100);
+ $is_finished = false;
- /*
- * Collecting other pages
- * Skipping first link and next page
- */
- foreach ($xpath->query("//div[@id='content']//div[last()]/a[position()>1 and position()<last()]") as $node)
- {
- if (preg_match('#/archives/\d{4}/\d{2}/p\d+-\d+\.html#U', $node->getAttribute('href')))
- {
- foreach ($this->getRemoteXpath($node->getAttribute('href'), "//div[@id='content']//a[@rel='bookmark']") as $node)
- {
- $permalinks[] = $node->getAttribute('href');
- }
- }
- }
-
- return $permalinks;
- }
-
- /**
- * Retrieves categories from Canalblog
- *
- * @author oncletom
- * @return unknown_type
- */
- protected function getMonths()
- {
- if ($months = get_transient('canalblog_months'))
+ for ($i = $offset; $i < $new_offset; $i++)
{
- return $months;
+ if (!isset($this->arguments['permalinks'][$i]))
+ {
+ $is_finished = true;
+ $progress = 100;
+ $new_offset = count($this->arguments['permalinks']);
+ set_transient('canablog_have_finished_posts', 1);
+ break;
+ }
+
+ $permalink = $this->arguments['permalinks'][$i];
+ $post = new CanalblogImporterImporterPost($this->getConfiguration());
+ $post->setUri($permalink);
+ $data = $post->process();
+
+ $message = sprintf(__('<strong>%s</strong> post import: %s', 'canalblog-importer'),
+ $data['post']['title'],
+ $data['post']['status']
+ );
+ $message .= '<ul>';
+ $message .= '<li>'.sprintf(__('<em>%s comments</em>: %s new, %s skipped, %s overwritten', 'canalblog-importer'),
+ $data['comments']['count'],
+ $data['comments']['new'],
+ $data['comments']['skipped'],
+ $data['comments']['overwritten']
+ ).'</li>';
+ $message .= '<li>'.sprintf(__('<em>%s medias</em>: %s new, %s skipped', 'canalblog-importer'),
+ $data['medias']['count'],
+ $data['medias']['new'],
+ $data['medias']['skipped']
+ ).'</li>';
+ $message .= '</ul>';
+
+ $response->add(array(
+ 'data' => $message,
+ ));
}
-
- foreach ($this->getRemoteXpath(get_option('canalblog_importer_blog_uri').'/archives/', "//div[@id='content']//p/a[@href]") as $node)
- {
- if (preg_match('#archives/(\d{4})/(\d{2})/index.html$#iU', $node->getAttribute('href'), $matches))
- {
- $months[] = array('year' => $matches[1], 'month' => $matches[2]);
- }
- }
-
- unset($dom, $http);
- set_transient('canalblog_months', $months);
-
- return $months;
+
+ set_transient('canalblog_step_offset', $new_offset);
+ $response->add(array(
+ 'what' => 'operation',
+ 'supplemental' => array(
+ 'finished' => (int)$is_finished,
+ 'progress' => $progress,
+ )
+ ));
}
}
View
1  pages/01-init.php
@@ -10,6 +10,7 @@
<li><?php _e('Tags', 'canalblog-importer') ?></li>
<li><?php _e('Categories', 'canalblog-importer') ?></li>
<li><?php _e('Archives', 'canalblog-importer') ?></li>
+ <li><?php _e('Posts, comments and media', 'canalblog-importer') ?></li>
<li><?php _e('Cleanup', 'canalblog-importer') ?></li>
</ol>
View
1  pages/02-tags.php
@@ -8,6 +8,7 @@
<li><strong><?php _e('Tags', 'canalblog-importer') ?></strong></li>
<li><?php _e('Categories', 'canalblog-importer') ?></li>
<li><?php _e('Archives', 'canalblog-importer') ?></li>
+ <li><?php _e('Posts, comments and media', 'canalblog-importer') ?></li>
<li><?php _e('Cleanup', 'canalblog-importer') ?></li>
</ol>
View
1  pages/03-cats.php
@@ -8,6 +8,7 @@
<li><?php _e('Tags', 'canalblog-importer') ?></li>
<li><strong><?php _e('Categories', 'canalblog-importer') ?></strong></li>
<li><?php _e('Archives', 'canalblog-importer') ?></li>
+ <li><?php _e('Posts, comments and media', 'canalblog-importer') ?></li>
<li><?php _e('Cleanup', 'canalblog-importer') ?></li>
</ol>
View
3  pages/04-arch.php
@@ -8,11 +8,12 @@
<li><?php _e('Tags', 'canalblog-importer') ?></li>
<li><?php _e('Categories', 'canalblog-importer') ?></li>
<li><strong><?php _e('Archives', 'canalblog-importer') ?></strong></li>
+ <li><?php _e('Posts, comments and media', 'canalblog-importer') ?></li>
<li><?php _e('Cleanup', 'canalblog-importer') ?></li>
</ol>
<h3><?php _e('Archives', 'canalblog-importer') ?></h3>
- <p><?php _e('This step includes posts, comments, authors and attachments. This is done month by month so if you have a huge blog, be patient ;-)', 'canalblog-importer') ?></p>
+ <p><?php _e('This step scans the presence of all the public posts for your whole history. Their content will be imported during the next step.', 'canalblog-importer') ?></p>
<form action="?import=canalblog" method="post">
<?php wp_nonce_field('import-canalblog') ?>
<input type="hidden" name="process-import" value="1" />
View
27 pages/05-post.php
@@ -0,0 +1,27 @@
+<div class="wrap">
+ <div id="icon-tools" class="icon32"><br /></div>
+ <h2><?php _e('Canalblog Importer', 'canalblog-importer') ?></h2>
+
+ <p><strong><?php _e('Import Steps', 'canalblog-importer') ?></strong></p>
+ <ol>
+ <li><?php _e('Configuration', 'canalblog-importer') ?></li>
+ <li><?php _e('Tags', 'canalblog-importer') ?></li>
+ <li><?php _e('Categories', 'canalblog-importer') ?></li>
+ <li><?php _e('Archives', 'canalblog-importer') ?></li>
+ <li><strong><?php _e('Posts, comments and media', 'canalblog-importer') ?></strong></li>
+ <li><?php _e('Cleanup', 'canalblog-importer') ?></li>
+ </ol>
+
+ <h3><?php _e('Posts, comments and media', 'canalblog-importer') ?></h3>
+ <p><?php _e('This (long) step imports the scanned posts such as their related comments and media.', 'canalblog-importer') ?></p>
+ <form action="?import=canalblog" method="post">
+ <?php wp_nonce_field('import-canalblog') ?>
+ <input type="hidden" name="process-import" value="1" />
+
+ <p><?php printf(__('<strong>%s blog posts</strong> are about to be imported.', 'canalblog-importer'), count($permalinks)) ?></p>
+
+ <?php include dirname(__FILE__).'/form-submit.php' ?>
+ </form>
+
+ <?php include dirname(__FILE__).'/ajax-results.php' ?>
+</div>
View
1  pages/05-clnp.php → pages/06-clnp.php
@@ -8,6 +8,7 @@
<li><?php _e('Tags', 'canalblog-importer') ?></li>
<li><?php _e('Categories', 'canalblog-importer') ?></li>
<li><?php _e('Archives', 'canalblog-importer') ?></li>
+ <li><?php _e('Posts, comments and media', 'canalblog-importer') ?></li>
<li><strong><?php _e('Cleanup', 'canalblog-importer') ?></strong></li>
</ol>
View
0  pages/06-ccln.php → pages/07-ccln.php
File renamed without changes
View
2  pages/ajax-results.php
@@ -2,7 +2,7 @@
<p class="worker-container">
<img src="<?php echo get_admin_url() ?>/images/wpspin_light.gif" alt="<?php _e('Loading') ?>" />
- <?php _e('Operation in progress...', 'canalblog-importer') ?>
+ <?php _e('Operation in progress...', 'canalblog-importer') ?> &mdash;
<span id="import-progress-value">0</span>%
</p>
View
2  pages/form-submit.php
@@ -1,5 +1,5 @@
<p class="submit">
<input type="button" class="button-primary start-remote-operation" value="<?php echo esc_attr__('Start Import', 'canalblog-importer') ?>" />
- <input type="submit" class="button-primary next-operation hidden" value="<?php echo esc_attr__('Next Step ', 'canalblog-importer') ?>" />
+ <input type="submit" class="button-primary next-operation hidden" value="<?php echo esc_attr__('Next Step &rarr;', 'canalblog-importer') ?>" />
<a href="<?php echo wp_nonce_url('import.php?import=canalblog&cancel=1', 'import-canalblog-cancel') ?>" class="button"><?php echo esc_attr__('Cancel', 'canalblog-importer') ?></a>
</p>
Please sign in to comment.
Something went wrong with that request. Please try again.