From 84aa0e52b20cca0ec0ce22b479747687f14a0428 Mon Sep 17 00:00:00 2001
From: Jean-Christian Denis <contact@jcdenis.fr>
Date: Sat, 11 Sep 2021 22:29:42 +0200
Subject: [PATCH] fix translations, typo and add some help

---
 README.md                             |   8 +-
 inc/lib.improve.action.gitshields.php |   5 +-
 inc/lib.improve.action.php            |   2 +-
 inc/lib.improve.action.zip.php        |   3 +-
 index.php                             |   4 +-
 locales/fr/main.lang.php              |  81 ++++++++++++++++----
 locales/fr/main.po                    | 104 +++++++++++++++++++++-----
 7 files changed, 167 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index c1a0ae8..5bff4d2 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Configure actions. Select actions and module to work with, then click fix.
  * Fix End Of Line
  * Fix End Of File on php files
  * Fix header (phpdoc) on php files
- * _Fix license old style bloc (removed)_
+ * Fix license file
  * Fix dcstore.xml file
  * Fix README.md shields.io badges
  * Create package
@@ -49,7 +49,11 @@ Configure actions. Select actions and module to work with, then click fix.
  * Scan for deprecated function
  * ...
 
+ Hope some of you have idea to complete function of this plugin 
+ and help devs to maintain their plugins and themes.
+
 ## MORE
 
  * License : GNU GPL v2
- * Source & contribution : [GitHub Page](https://github.com/JcDenis/improve)
\ No newline at end of file
+ * Source & contribution : [GitHub Page](https://github.com/JcDenis/improve)
+ * Packages & details:  [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/improve)
\ No newline at end of file
diff --git a/inc/lib.improve.action.gitshields.php b/inc/lib.improve.action.gitshields.php
index 7651f6c..6383650 100644
--- a/inc/lib.improve.action.gitshields.php
+++ b/inc/lib.improve.action.gitshields.php
@@ -30,7 +30,7 @@ class ImproveActionGitshields extends ImproveAction
     {
         $this->setProperties([
             'id'       => 'gitshields',
-            'name'     => __('Add shields badges'),
+            'name'     => __('Fix shields badges'),
             'desc'     => __('Add and maintain shields.io badges to the REDAME.md file'),
             'priority' => 380,
             'config'   => true,
@@ -55,7 +55,8 @@ class ImproveActionGitshields extends ImproveAction
         return '
         <p><label for="bloc_action">' . __('Your Github user name :') . '</label>' .
         form::field('username', 60, 100, $this->getPreference('username')) . '
-        </p><p class="form-note">' . __('Used in your Github URL: http://github.com/username/module_id.') . '</p>';
+        </p><p class="form-note">' . __('Used in your Github URL: http://github.com/username/module_id.') . '<br />' .
+        __('If you have badges not created by this tool in the README.md file you should remove them manually.') . '</p>';
     }
 
     public function openModule(string $module_type, array $module_info): ?bool
diff --git a/inc/lib.improve.action.php b/inc/lib.improve.action.php
index 183311c..85eec44 100644
--- a/inc/lib.improve.action.php
+++ b/inc/lib.improve.action.php
@@ -125,7 +125,7 @@ class ImproveActionEndoffile extends ImproveAction
     {
         $this->setProperties([
             'id' => 'endoffile',
-            'name' => _('Fix end of file'),
+            'name' => __('Fix end of file'),
             'desc' => __('Remove php tag and empty lines from end of files'),
             'priority' => 860,
             'config' => true,
diff --git a/inc/lib.improve.action.zip.php b/inc/lib.improve.action.zip.php
index 1116a5d..7897b30 100644
--- a/inc/lib.improve.action.zip.php
+++ b/inc/lib.improve.action.zip.php
@@ -105,7 +105,8 @@ class ImproveActionZip extends ImproveAction
         <p><label for="pack_excludefiles">' . __('Extra files to exclude from package:') . ' ' .
         form::field('pack_excludefiles', 65, 255, $this->getPreference('pack_excludefiles'), 'maximal') .
         '</label></p>
-        <p class="form-note">' . sprintf(__('Preconization: %s'), '*.zip,*.tar,*.tar.gz') . '</p>
+        <p class="form-note">' . sprintf(__('Preconization: %s'), '*.zip,*.tar,*.tar.gz') . '<br />' .
+        sprintf(__('By default all these files are always removed from packages : %s'), implode(', ', self::$exclude)) . '</p>
 
         <p><label class="classic" for="pack_nocomment">' .
         form::checkbox('pack_nocomment', 1, $this->getPreference('pack_nocomment')) . ' ' .
diff --git a/index.php b/index.php
index 2e308af..ea11365 100644
--- a/index.php
+++ b/index.php
@@ -125,9 +125,9 @@ if (!empty($_REQUEST['config'])) {
 
         echo '
         <h3>' . sprintf(__('Configure module "%s"'), $action->name) . '</h3>
+        <p><a class="back" href="' . $back_url . '">' . __('Back') . '</a></p>
         <p>' . html::escapeHTML($action->desc) . '</p>
-        <form action="' . $improve->getURL() . '" method="post" id="form-actions">
-        <p><a class="back" href="' . $back_url . '">' . __('Back') . '</a></p>' .
+        <form action="' . $improve->getURL() . '" method="post" id="form-actions">' .
         (empty($res) ? '<p class="message">' . __('Nothing to configure'). '</p>' : $res) . '
         <p class="clear"><input type="submit" name="save" value="' . __('Save') . '" />' .
         form::hidden('type', $type) .
diff --git a/locales/fr/main.lang.php b/locales/fr/main.lang.php
index 1b053f7..242db5d 100644
--- a/locales/fr/main.lang.php
+++ b/locales/fr/main.lang.php
@@ -1,7 +1,7 @@
 <?php
 // Language: Français 
 // Module: improve - 0.0.1
-// Date: 2021-09-11 15:39:25 
+// Date: 2021-09-11 20:19:34 
 // Translated with dcTranslater - 2021.09.02.1 
 
 #inc/class.improve.php:77
@@ -65,7 +65,7 @@ $GLOBALS['__l10n']['no details URL'] = 'Lien de détail non défini';
 $GLOBALS['__l10n']['no support URL'] = 'Lien de support non défini';
 
 #inc/lib.improve.action.gitshields.php:33
-$GLOBALS['__l10n']['Add shields badges'] = 'Ajouter  les badges Shields';
+$GLOBALS['__l10n']['Fix shields badges'] = 'Fixer les badges shields.io';
 
 #inc/lib.improve.action.gitshields.php:34
 $GLOBALS['__l10n']['Add and maintain shields.io badges to the REDAME.md file'] = 'Ajoute et maintient à jour les badges shields.io du fichier README.md';
@@ -76,21 +76,58 @@ $GLOBALS['__l10n']['Your Github user name :'] = 'Votre "username" Github :';
 #inc/lib.improve.action.gitshields.php:58
 $GLOBALS['__l10n']['Used in your Github URL: http://github.com/username/module_id.'] = 'Utilisé dans l\'URL Github tel que : http://github.com/username/module_id.';
 
-#inc/lib.improve.action.gitshields.php:88
+#inc/lib.improve.action.gitshields.php:59
+$GLOBALS['__l10n']['If you have badges not created by this tool in the README.md file you should remove them manually.'] = 'Si vous avez déjà des badges non créés par cet outil, vous devrez les retirer manuellement.';
+
+#inc/lib.improve.action.gitshields.php:89
 #inc/lib.improve.action.phpheader.php:153
 $GLOBALS['__l10n']['bloc is empty'] = 'le bloc est vide';
 
-#inc/lib.improve.action.license.php:53
-#inc/lib.improve.action.license.php:59
+#inc/lib.improve.action.licensefile.php:29
+$GLOBALS['__l10n']['Fix license file'] = 'Fixer le fichier de licence';
+
+#inc/lib.improve.action.licensefile.php:30
+$GLOBALS['__l10n']['Add or remove full license file to module root'] = 'Ajoute ou supprime le fichier de licence';
+
+#inc/lib.improve.action.licensefile.php:36
+$GLOBALS['__l10n']['no version selected'] = 'aucune version selectionnée';
+
+#inc/lib.improve.action.licensefile.php:43
 #inc/lib.improve.action.phpheader.php:44
 $GLOBALS['__l10n']['Do nothing'] = 'Ne rien faire';
 
-#inc/lib.improve.action.license.php:60
-#inc/lib.improve.action.phpheader.php:45
-$GLOBALS['__l10n']['Add bloc if it does not exist'] = 'Ajouter les blocs si ils n\'existent pas déjà';
+#inc/lib.improve.action.licensefile.php:44
+$GLOBALS['__l10n']['Add file if it does not exist'] = 'Ajouter le fichier si il n\'existe pas';
 
-#inc/lib.improve.action.license.php:108
-$GLOBALS['__l10n']['Do not add license block to files from locales folder'] = 'Ne pas ajouter la licence aux fichiers du dossier locales';
+#inc/lib.improve.action.licensefile.php:45
+$GLOBALS['__l10n']['Add file even if it exists'] = 'Ajouter le fichier même si il existe';
+
+#inc/lib.improve.action.licensefile.php:46
+$GLOBALS['__l10n']['Add file and remove others'] = 'Ajouter la nouvelle licence et supprimer les autres';
+
+#inc/lib.improve.action.licensefile.php:47
+$GLOBALS['__l10n']['Remove license files'] = 'Supprimer les fichiers de licence';
+
+#inc/lib.improve.action.licensefile.php:68
+$GLOBALS['__l10n']['License version:'] = 'Version de la licence :';
+
+#inc/lib.improve.action.licensefile.php:72
+$GLOBALS['__l10n']['Action on file:'] = 'Action sur le fichier :';
+
+#inc/lib.improve.action.licensefile.php:87
+$GLOBALS['__l10n']['no full license type selected'] = 'Aucun type de licence sélectionné';
+
+#inc/lib.improve.action.licensefile.php:100
+$GLOBALS['__l10n']['failed to load full license'] = 'Impossible de charger le fichier de licence';
+
+#inc/lib.improve.action.licensefile.php:106
+$GLOBALS['__l10n']['failed to write full license'] = 'Impossible d\'écrire le fichier de license';
+
+#inc/lib.improve.action.licensefile.php:120
+$GLOBALS['__l10n']['full license is not deletable (%s)'] = 'Le fichier de licence n\'est pas supprimable (%s)';
+
+#inc/lib.improve.action.licensefile.php:123
+$GLOBALS['__l10n']['failed to delete full license (%s)'] = 'Impossible de supprimer le fichier de licence (%s)';
 
 #inc/lib.improve.action.php:20
 $GLOBALS['__l10n']['Fix tabulation'] = 'Fixer les tabulations';
@@ -110,6 +147,9 @@ $GLOBALS['__l10n']['List of files extension to work on:'] = 'Liste des extension
 #inc/lib.improve.action.php:94
 $GLOBALS['__l10n']['Use comma separated list of extensions without dot, recommand "php,js,xml,txt,md".'] = 'Utiliser une liste d\'extensions séparé par des virgules et sans le point, recommandation: "php,js,xml,txt,md".';
 
+#inc/lib.improve.action.php:128
+$GLOBALS['__l10n']['Fix end of file'] = 'Fixer les fins de fichiers';
+
 #inc/lib.improve.action.php:129
 $GLOBALS['__l10n']['Remove php tag and empty lines from end of files'] = 'Supprimer le tag PHP et els lignes vides de fin de fichiers';
 
@@ -125,6 +165,9 @@ $GLOBALS['__l10n']['Fix PHP header'] = 'Fixer les enêtes php';
 #inc/lib.improve.action.phpheader.php:37
 $GLOBALS['__l10n']['Add or remove phpdoc header bloc from php file'] = 'Ajouter ou supprimer les bloc d\'entête phpdoc des fichiers php';
 
+#inc/lib.improve.action.phpheader.php:45
+$GLOBALS['__l10n']['Add bloc if it does not exist'] = 'Ajouter les blocs si ils n\'existent pas déjà';
+
 #inc/lib.improve.action.phpheader.php:46
 $GLOBALS['__l10n']['Add and overwrite bloc'] = 'Ajouter et écraser les blocs';
 
@@ -146,6 +189,12 @@ $GLOBALS['__l10n']['Do not add bloc to files from "locales" and "libs" folder']
 #inc/lib.improve.action.phpheader.php:86
 $GLOBALS['__l10n']['Bloc content:'] = 'Contenu du bloc :';
 
+#inc/lib.improve.action.phpheader.php:91
+$GLOBALS['__l10n']['You can use wildcards %s'] = 'Vous pouvez utiliser les jokers suivants :';
+
+#inc/lib.improve.action.phpheader.php:93
+$GLOBALS['__l10n']['Do not put structural elements to the begining of lines.'] = 'Ne pas mettre d\'élément de structure en début de ligne';
+
 #inc/lib.improve.action.phpheader.php:182
 $GLOBALS['__l10n']['failed to parse bloc'] = 'impossible de traiter le bloc';
 
@@ -185,13 +234,16 @@ $GLOBALS['__l10n']['Overwrite existing package'] = 'Écraser les paquetages exis
 #inc/lib.improve.action.zip.php:105
 $GLOBALS['__l10n']['Extra files to exclude from package:'] = 'Fichiers supplémentaires à exclure du paquetage :';
 
-#inc/lib.improve.action.zip.php:112
+#inc/lib.improve.action.zip.php:109
+$GLOBALS['__l10n']['By default all these files are always removed from packages : %s'] = 'Pas défaut tous ces fichiers sont toujours exclu des paquetages : %s';
+
+#inc/lib.improve.action.zip.php:113
 $GLOBALS['__l10n']['Remove comments from files'] = 'Retirer les commentaires des fichiers';
 
-#inc/lib.improve.action.zip.php:154
+#inc/lib.improve.action.zip.php:155
 $GLOBALS['__l10n']['Destination filename already exists'] = 'Le fichier de destination existe déjà';
 
-#inc/lib.improve.action.zip.php:159
+#inc/lib.improve.action.zip.php:160
 $GLOBALS['__l10n']['Destination path is not writable'] = 'Le répertoire de destination n\'est pas accessible en écriture';
 
 #index.php:54
@@ -238,5 +290,4 @@ $GLOBALS['__l10n']['Save fields selection as preference'] = 'Enregistrer la sél
 $GLOBALS['__l10n']['Select a module:'] = 'Sélectionner un  module :';
 
 #index.php:188
-$GLOBALS['__l10n']['Fix it'] = 'Corriger';
-
+$GLOBALS['__l10n']['Fix it'] = 'Corriger';
\ No newline at end of file
diff --git a/locales/fr/main.po b/locales/fr/main.po
index b2f8c36..505fbbb 100644
--- a/locales/fr/main.po
+++ b/locales/fr/main.po
@@ -1,6 +1,6 @@
 # Language: Français
 # Module: improve - 0.0.1
-# Date: 2021-09-11 15:39:25
+# Date: 2021-09-11 20:19:34
 # Translated with translater 2021.09.02.1
 
 msgid ""
@@ -8,7 +8,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: improve 0.0.1\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2021-09-11T15:39:25+00:00\n"
+"PO-Revision-Date: 2021-09-11T20:19:34+00:00\n"
 "Last-Translator: Jean-Christian Denis\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -96,8 +96,8 @@ msgid "no support URL"
 msgstr "Lien de support non défini"
 
 #: inc/lib.improve.action.gitshields.php:33
-msgid "Add shields badges"
-msgstr "Ajouter  les badges Shields"
+msgid "Fix shields badges"
+msgstr "Fixer les badges shields.io"
 
 #: inc/lib.improve.action.gitshields.php:34
 msgid "Add and maintain shields.io badges to the REDAME.md file"
@@ -111,25 +111,75 @@ msgstr "Votre \"username\" Github :"
 msgid "Used in your Github URL: http://github.com/username/module_id."
 msgstr "Utilisé dans l'URL Github tel que : http://github.com/username/module_id."
 
-#: inc/lib.improve.action.gitshields.php:88
+#: inc/lib.improve.action.gitshields.php:59
+msgid "If you have badges not created by this tool in the README.md file you should remove them manually."
+msgstr "Si vous avez déjà des badges non créés par cet outil, vous devrez les retirer manuellement."
+
+#: inc/lib.improve.action.gitshields.php:89
 #: inc/lib.improve.action.phpheader.php:153
 msgid "bloc is empty"
 msgstr "le bloc est vide"
 
-#: inc/lib.improve.action.license.php:53
-#: inc/lib.improve.action.license.php:59
+#: inc/lib.improve.action.licensefile.php:29
+msgid "Fix license file"
+msgstr "Fixer le fichier de licence"
+
+#: inc/lib.improve.action.licensefile.php:30
+msgid "Add or remove full license file to module root"
+msgstr "Ajoute ou supprime le fichier de licence"
+
+#: inc/lib.improve.action.licensefile.php:36
+msgid "no version selected"
+msgstr "aucune version selectionnée"
+
+#: inc/lib.improve.action.licensefile.php:43
 #: inc/lib.improve.action.phpheader.php:44
 msgid "Do nothing"
 msgstr "Ne rien faire"
 
-#: inc/lib.improve.action.license.php:60
-#: inc/lib.improve.action.phpheader.php:45
-msgid "Add bloc if it does not exist"
-msgstr "Ajouter les blocs si ils n'existent pas déjà"
+#: inc/lib.improve.action.licensefile.php:44
+msgid "Add file if it does not exist"
+msgstr "Ajouter le fichier si il n'existe pas"
 
-#: inc/lib.improve.action.license.php:108
-msgid "Do not add license block to files from locales folder"
-msgstr "Ne pas ajouter la licence aux fichiers du dossier locales"
+#: inc/lib.improve.action.licensefile.php:45
+msgid "Add file even if it exists"
+msgstr "Ajouter le fichier même si il existe"
+
+#: inc/lib.improve.action.licensefile.php:46
+msgid "Add file and remove others"
+msgstr "Ajouter la nouvelle licence et supprimer les autres"
+
+#: inc/lib.improve.action.licensefile.php:47
+msgid "Remove license files"
+msgstr "Supprimer les fichiers de licence"
+
+#: inc/lib.improve.action.licensefile.php:68
+msgid "License version:"
+msgstr "Version de la licence :"
+
+#: inc/lib.improve.action.licensefile.php:72
+msgid "Action on file:"
+msgstr "Action sur le fichier :"
+
+#: inc/lib.improve.action.licensefile.php:87
+msgid "no full license type selected"
+msgstr "Aucun type de licence sélectionné"
+
+#: inc/lib.improve.action.licensefile.php:100
+msgid "failed to load full license"
+msgstr "Impossible de charger le fichier de licence"
+
+#: inc/lib.improve.action.licensefile.php:106
+msgid "failed to write full license"
+msgstr "Impossible d'écrire le fichier de license"
+
+#: inc/lib.improve.action.licensefile.php:120
+msgid "full license is not deletable (%s)"
+msgstr "Le fichier de licence n'est pas supprimable (%s)"
+
+#: inc/lib.improve.action.licensefile.php:123
+msgid "failed to delete full license (%s)"
+msgstr "Impossible de supprimer le fichier de licence (%s)"
 
 #: inc/lib.improve.action.php:20
 msgid "Fix tabulation"
@@ -155,6 +205,10 @@ msgstr "Liste des extensions de fichier à corriger:"
 msgid "Use comma separated list of extensions without dot, recommand \"php,js,xml,txt,md\"."
 msgstr "Utiliser une liste d'extensions séparé par des virgules et sans le point, recommandation: \"php,js,xml,txt,md\"."
 
+#: inc/lib.improve.action.php:128
+msgid "Fix end of file"
+msgstr "Fixer les fins de fichiers"
+
 #: inc/lib.improve.action.php:129
 msgid "Remove php tag and empty lines from end of files"
 msgstr "Supprimer le tag PHP et els lignes vides de fin de fichiers"
@@ -175,6 +229,10 @@ msgstr "Fixer les enêtes php"
 msgid "Add or remove phpdoc header bloc from php file"
 msgstr "Ajouter ou supprimer les bloc d'entête phpdoc des fichiers php"
 
+#: inc/lib.improve.action.phpheader.php:45
+msgid "Add bloc if it does not exist"
+msgstr "Ajouter les blocs si ils n'existent pas déjà"
+
 #: inc/lib.improve.action.phpheader.php:46
 msgid "Add and overwrite bloc"
 msgstr "Ajouter et écraser les blocs"
@@ -203,6 +261,14 @@ msgstr "Ne pas ajouter les blocs d'entête aux fichiers des répertoires \"local
 msgid "Bloc content:"
 msgstr "Contenu du bloc :"
 
+#: inc/lib.improve.action.phpheader.php:91
+msgid "You can use wildcards %s"
+msgstr "Vous pouvez utiliser les jokers suivants :"
+
+#: inc/lib.improve.action.phpheader.php:93
+msgid "Do not put structural elements to the begining of lines."
+msgstr "Ne pas mettre d'élément de structure en début de ligne"
+
 #: inc/lib.improve.action.phpheader.php:182
 msgid "failed to parse bloc"
 msgstr "impossible de traiter le bloc"
@@ -254,15 +320,19 @@ msgstr "Écraser les paquetages existants"
 msgid "Extra files to exclude from package:"
 msgstr "Fichiers supplémentaires à exclure du paquetage :"
 
-#: inc/lib.improve.action.zip.php:112
+#: inc/lib.improve.action.zip.php:109
+msgid "By default all these files are always removed from packages : %s"
+msgstr "Pas défaut tous ces fichiers sont toujours exclu des paquetages : %s"
+
+#: inc/lib.improve.action.zip.php:113
 msgid "Remove comments from files"
 msgstr "Retirer les commentaires des fichiers"
 
-#: inc/lib.improve.action.zip.php:154
+#: inc/lib.improve.action.zip.php:155
 msgid "Destination filename already exists"
 msgstr "Le fichier de destination existe déjà"
 
-#: inc/lib.improve.action.zip.php:159
+#: inc/lib.improve.action.zip.php:160
 msgid "Destination path is not writable"
 msgstr "Le répertoire de destination n'est pas accessible en écriture"