From 26b4817adb7b21fbb99fe9cb875edf5b460ca7cd Mon Sep 17 00:00:00 2001 From: brol Date: Thu, 23 Jul 2015 18:48:10 +0200 Subject: [PATCH] 0.4.1 --- CHANGELOG | 12 +-- _admin.php | 15 ++- _define.php | 4 +- _public.php | 12 +-- adapt-themes/Notepad-Chaos-1.2.comListe.html | 4 +- default-templates/currywurst/comListe.html | 4 +- default-templates/mustek/comListe.html | 4 +- inc/class.dc.comListe.php | 13 ++- locales/fr/main.po | 105 ++++++++++++------- 9 files changed, 103 insertions(+), 70 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2dbeb01..7706f05 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,23 +1,23 @@ +comListe 0.4.1 - 23-07-2015 - Pierre Van Glabeke +* correction localisation + comListe 0.4 - 19-07-2015 - Pierre Van Glabeke -=========================================================== * ajout breadcrumb +* ajout favoris * héritage de thème mustek * suppression tpl pour Noviny2 (intégré directement dans v0.9 de Noviny2) * dc2.8 requis comListe 0.3.1 - 11-06-2015 - Pierre Van Glabeke -=========================================================== * modifs html5 * mise à jour adapt-themes * suppression tpl pour Freshy2 (intégré directement dans v1.9 de Freshy2) comListe 0.3 - 03-03-2015 - Pierre Van Glabeke -=========================================================== * correction localisation * ajout info sur widget comListe 0.2 - 19-12-2014 - Pierre Van Glabeke -=========================================================== * compatibilité dc2.7 * suppression dossier .settings + fichiers .buildpath et .project * modification tpl @@ -25,15 +25,12 @@ comListe 0.2 - 19-12-2014 - Pierre Van Glabeke * modification icône comListe 0.1.9 - 2013-10-13 - Pierre Van Glabeke -=========================================================== * compatibilité dc2.6 comListe 0.1.8 - 2009-07-20 -=========================================================== * correction sur le calcul du nombre de commentaires comListe 0.1.7 - 2009-07-20 -=========================================================== * mise à niveau pour la compatibilité Dotclear 2.2 * mise à niveau pour la compatibilité php 5.3.0 * Ticket #272 : coquille anglais corrigée @@ -41,7 +38,6 @@ comListe 0.1.7 - 2009-07-20 * mise à niveau de la licence de l'extension comListe 0.1.6 - 2009-10-07 -=========================================================== * correction d'une erreur dans la pagination * utilisation du plugin translater pour la traduction diff --git a/_admin.php b/_admin.php index 6975643..215700e 100644 --- a/_admin.php +++ b/_admin.php @@ -17,4 +17,17 @@ if (!defined('DC_CONTEXT_ADMIN')) { return; } $_menu['Blog']->addItem(__('List of comments'),'plugin.php?p=comListe','index.php?pf=comListe/icon.png', preg_match('/plugin.php\?p=comListe(&.*)?$/',$_SERVER['REQUEST_URI']), - $core->auth->check('admin',$core->blog->id)); \ No newline at end of file + $core->auth->check('admin',$core->blog->id)); + +$core->addBehavior('adminDashboardFavorites','comListeDashboardFavorites'); + +function comListeDashboardFavorites($core,$favs) +{ + $favs->register('comListe', array( + 'title' => __('List of comments'), + 'url' => 'plugin.php?p=comListe', + 'small-icon' => 'index.php?pf=comListe/icon.png', + 'large-icon' => 'index.php?pf=comListe/icon-big.png', + 'permissions' => 'usage,contentadmin' + )); +} \ No newline at end of file diff --git a/_define.php b/_define.php index b410dff..3af288f 100644 --- a/_define.php +++ b/_define.php @@ -16,13 +16,13 @@ $this->registerModule( /* Name */ "ComListe", /* Description*/ "Display a list of all comments and trackbacks of a blog in a public page", /* Author */ "Benoit de Marne, Pierre Van Glabeke", - /* Version */ '0.4', + /* Version */ '0.4.1', /* Properties */ array( 'permissions' => 'admin', 'type' => 'plugin', 'dc_min' => '2.8', - 'support' => 'http://lab.dotclear.org/wiki/plugin/comListe/fr', + 'support' => 'http://forum.dotclear.org/viewtopic.php?pid=333985#p333985', 'details' => 'http://plugins.dotaddict.org/dc2/details/comListe' ) ); \ No newline at end of file diff --git a/_public.php b/_public.php index a298315..a49d161 100644 --- a/_public.php +++ b/_public.php @@ -23,14 +23,4 @@ $core->tpl->addValue('ComListeNbCommentsPerPage',array('tplComListe','comListeNb $core->tpl->addBlock('ComListeCommentsEntries',array('tplComListe','comListeCommentsEntries')); $core->tpl->addValue('ComListePaginationLinks',array('tplComListe','comListePaginationLinks')); $core->tpl->addValue('ComListeOpenPostTitle',array('tplComListe','comListeOpenPostTitle')); -$core->addBehavior('publicBreadcrumb',array('extComListe','publicBreadcrumb')); - -class extComListe -{ - public static function publicBreadcrumb($context,$separator) - { - if ($context == 'comListe') { - return __('List of comments'); - } - } -} \ No newline at end of file +$core->addBehavior('publicBreadcrumb',array('extComListe','publicBreadcrumb')); \ No newline at end of file diff --git a/adapt-themes/Notepad-Chaos-1.2.comListe.html b/adapt-themes/Notepad-Chaos-1.2.comListe.html index c2d0d40..3363b1d 100644 --- a/adapt-themes/Notepad-Chaos-1.2.comListe.html +++ b/adapt-themes/Notepad-Chaos-1.2.comListe.html @@ -58,12 +58,12 @@

- {{tpl:ComListePaginationLinks}} + {{tpl:lang Pages:}} {{tpl:ComListePaginationLinks}}

{{tpl:lang Number of comments per page:}} {{tpl:ComListeNbCommentsPerPage}}
- {{tpl:lang Number of comments:}} {{tpl:ComListeNbComments}} + {{tpl:lang Total Comments:}} {{tpl:ComListeNbComments}}

diff --git a/default-templates/currywurst/comListe.html b/default-templates/currywurst/comListe.html index f95f746..03b01f1 100644 --- a/default-templates/currywurst/comListe.html +++ b/default-templates/currywurst/comListe.html @@ -52,13 +52,13 @@

- {{tpl:ComListePaginationLinks}} + {{tpl:lang Pages:}} {{tpl:ComListePaginationLinks}}

{{tpl:lang Number of comments per page:}} {{tpl:ComListeNbCommentsPerPage}}
- {{tpl:lang Number of comments:}} {{tpl:ComListeNbComments}} + {{tpl:lang Total Comments:}} {{tpl:ComListeNbComments}}

diff --git a/default-templates/mustek/comListe.html b/default-templates/mustek/comListe.html index 837ad44..8bcc8ba 100644 --- a/default-templates/mustek/comListe.html +++ b/default-templates/mustek/comListe.html @@ -50,12 +50,12 @@

- {{tpl:ComListePaginationLinks}} + {{tpl:lang Pages:}} {{tpl:ComListePaginationLinks}}

{{tpl:lang Number of comments per page:}} {{tpl:ComListeNbCommentsPerPage}}
- {{tpl:lang Number of comments:}} {{tpl:ComListeNbComments}} + {{tpl:lang Total Comments:}} {{tpl:ComListeNbComments}}

\ No newline at end of file diff --git a/inc/class.dc.comListe.php b/inc/class.dc.comListe.php index 16ac796..744f99c 100644 --- a/inc/class.dc.comListe.php +++ b/inc/class.dc.comListe.php @@ -259,7 +259,6 @@ class tplComListe $nb_sequence = 2*3+1; $quick_distance = 10; - echo "Pages : "; if($nb_pages <= $nb_max_pages) { /* less or equal than 10 pages, simple links */ for ($i = 1; $i <= $nb_pages; $i++) { @@ -337,6 +336,16 @@ class tplComListe '

'; return $w->renderDiv($w->content_only,'comliste '.$w->class,'',$res); - } + } +} + +class extComListe +{ + public static function publicBreadcrumb($context,$separator) + { + if ($context == 'comListe') { + return __('List of comments'); + } + } } \ No newline at end of file diff --git a/locales/fr/main.po b/locales/fr/main.po index 90dfa4d..0b1ecf6 100644 --- a/locales/fr/main.po +++ b/locales/fr/main.po @@ -1,64 +1,91 @@ +# Language: Français +# Module: comListe - 0.4.1 +# Date: 2015-07-23 16:43:21 +# Translated with translater 2015.03.02 + msgid "" msgstr "" "Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: comListe 0.2\n" +"Project-Id-Version: comListe 0.4.1\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2014-12-18T09:16:42+00:00\n" -"Last-Translator: Pierre Van Glabeke\n" +"PO-Revision-Date: 2015-07-23T16:43:21+00:00\n" +"Last-Translator: brol\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" #: _admin.php:18 -#: _widgets.php:22 -#: index.php:99 -#: index.php:111 -msgid "ComListe" -msgstr "ComListe" - -#: _widgets.php:21 +#: _admin.php:27 #: _widgets.php:23 -#: inc/class.dc.comListe.php:321 -#: index.php:48 +#: _widgets.php:25 +#: inc/class.dc.comListe.php:335 +#: inc/class.dc.comListe.php:348 +#: index.php:15 +#: index.php:50 msgid "List of comments" msgstr "Liste des commentaires" -#: inc/class.dc.comListe.php:91 -msgid "Number of comments:" -msgstr "Nombres de commentaires :" +#: _widgets.php:21 +#: _widgets.php:24 +msgid "ComListe" +msgstr "ComListe" -#: inc/class.dc.comListe.php:295 -msgid "open post" -msgstr "ouvrir le billet" +#: adapt-themes/Notepad-Chaos-1.2.comListe.html:45 +#: default-templates/currywurst/comListe.html:36 +#: default-templates/mustek/comListe.html:37 +msgid "source:" +msgstr "source :" -#: index.php:68 -msgid "No page title." -msgstr "Pas de titre de page." +#: adapt-themes/Notepad-Chaos-1.2.comListe.html:61 +#: default-templates/currywurst/comListe.html:55 +#: default-templates/mustek/comListe.html:53 +msgid "Pages:" +msgstr "Pages :" -#: index.php:123 -msgid "Plugin activation" -msgstr "Activation du plugin" - -#: index.php:126 -msgid "Enable comListe" -msgstr "Activer comListe" - -#: index.php:128 -msgid "General options" -msgstr "Options générales" - -#: index.php:129 -msgid "Title page" -msgstr "Titre de la page" - -#: index.php:132 +#: adapt-themes/Notepad-Chaos-1.2.comListe.html:65 +#: default-templates/currywurst/comListe.html:60 +#: default-templates/mustek/comListe.html:57 +#: index.php:139 msgid "Number of comments per page:" msgstr "Nombre de commentaires par page :" +#: adapt-themes/Notepad-Chaos-1.2.comListe.html:66 +#: default-templates/currywurst/comListe.html:61 +#: default-templates/mustek/comListe.html:58 +msgid "Total Comments:" +msgstr "Nombre total de commentaires :" + +#: inc/class.dc.comListe.php:306 +msgid "open post" +msgstr "ouvrir le billet" + +#: index.php:70 +msgid "No page title." +msgstr "Pas de titre de page." + +#: index.php:129 +msgid "Plugin activation" +msgstr "Activation du plugin" + +#: index.php:133 +msgid "Enable comListe" +msgstr "Activer comListe" + #: index.php:135 +msgid "General options" +msgstr "Options générales" + +#: index.php:136 +msgid "Title page" +msgstr "Titre de la page" + +#: index.php:142 msgid "Comments order" msgstr "Sens de tri pour les commentaires" +msgid "Number of comments:" +msgstr "Nombre de commentaires :" + msgid "Display a list of all comments and trackbacks of a blog in a public page" msgstr "Afficher la liste de tous les commentaires et rétroliens d'un blog dans une page publique" @@ -74,5 +101,3 @@ msgstr "Configuration mise à jour avec succès." msgid "Current page" msgstr "Page courante" -msgid "source:" -msgstr "source :" \ No newline at end of file