From ed203095dc3f5127192528bbe47f08c7cd5b9fb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= <frederic.tempez@outlook.com>
Date: Thu, 29 Sep 2022 19:20:10 +0200
Subject: [PATCH] rempalce template topic par helper translate

---
 core/class/template.class.php                  |  9 ---------
 core/module/config/view/backup/backup.js.php   |  8 ++++----
 core/module/config/view/backup/backup.php      |  2 +-
 core/module/config/view/connect/connect.php    |  4 ++--
 core/module/config/view/index/index.js.php     |  2 +-
 core/module/config/view/network/network.php    |  4 ++--
 core/module/config/view/restore/restore.php    |  2 +-
 core/module/config/view/setup/setup.php        |  4 ++--
 core/module/config/view/social/social.php      |  6 +++---
 core/module/install/view/index/index.php       |  2 +-
 .../install/view/postinstall/postinstall.php   |  6 +++---
 core/module/install/view/update/update.js.php  |  8 ++++----
 core/module/install/view/update/update.php     | 18 +++++++++---------
 core/module/maintenance/view/index/index.php   |  2 +-
 core/module/page/view/edit/edit.js.php         | 10 +++++-----
 .../plugin/view/dataImport/dataImport.php      |  2 +-
 core/module/plugin/view/index/index.js.php     |  4 ++--
 core/module/plugin/view/index/index.php        |  6 +++---
 core/module/plugin/view/item/item.php          |  8 ++++----
 core/module/plugin/view/upload/upload.php      |  2 +-
 core/module/theme/view/admin/admin.php         |  4 ++--
 core/module/theme/view/body/body.php           |  2 +-
 core/module/theme/view/fontAdd/fontAdd.php     |  2 +-
 core/module/theme/view/fontEdit/fontEdit.php   |  2 +-
 core/module/theme/view/footer/footer.php       | 12 ++++++------
 core/module/theme/view/header/header.php       | 16 ++++++++--------
 core/module/theme/view/manage/manage.php       |  8 ++++----
 core/module/theme/view/menu/menu.php           |  8 ++++----
 core/module/theme/view/site/site.php           |  8 ++++----
 core/module/translate/view/add/add.php         |  2 +-
 core/module/translate/view/copy/copy.php       |  2 +-
 core/module/translate/view/index/index.js.php  |  2 +-
 core/module/translate/view/index/index.php     |  2 +-
 core/module/user/view/add/add.php              | 16 ++++++++--------
 core/module/user/view/edit/edit.php            | 16 ++++++++--------
 core/module/user/view/import/import.php        |  2 +-
 core/module/user/view/index/index.js.php       |  2 +-
 37 files changed, 103 insertions(+), 112 deletions(-)

diff --git a/core/class/template.class.php b/core/class/template.class.php
index 755c1fe2..3b2a0ff3 100644
--- a/core/class/template.class.php
+++ b/core/class/template.class.php
@@ -3,15 +3,6 @@
 class template
 {
 
-    /**
-     * retourne un texte traduit
-     */
-    public static function topic($text)
-    {
-        $text = helper::translate($text);
-        return $text;
-    }
-
     /**
      * Crée un bouton
      * @param string $nameId Nom et id du champ
diff --git a/core/module/config/view/backup/backup.js.php b/core/module/config/view/backup/backup.js.php
index 77aaee99..9095d251 100644
--- a/core/module/config/view/backup/backup.js.php
+++ b/core/module/config/view/backup/backup.js.php
@@ -15,9 +15,9 @@ $(document).ready(function () {
         //$("#configBackupSubmit").addClass("disabled").prop("disabled", true);
         e.preventDefault();
         var url = "<?php echo helper::baseUrl() . $this->getUrl(0); ?>/backup";
-        var message_success = "<?php echo template::topic('Sauvegarde générée avec succès.'); ?>";
-        var message_error = "<?php echo template::topic('Erreur : sauvegarde non générée !'); ?>";
-        var message_title = "<?php echo template::topic('Sauvegarder'); ?>";
+        var message_success = "<?php echo helper::translate('Sauvegarde générée avec succès.'); ?>";
+        var message_error = "<?php echo helper::translate('Erreur : sauvegarde non générée !'); ?>";
+        var message_title = "<?php echo helper::translate('Sauvegarder'); ?>";
         $.ajax({
             type: "POST",
             url: url,
@@ -45,7 +45,7 @@ $(document).ready(function () {
      */
     $("#configBackupSubmit").on("click", function () {
         if ($("input[name=configBackupOption]").is(':checked')) {
-            var message_warning = "<?php echo template::topic('La sauvegarde des fichiers peut prendre du temps. Continuer ?'); ?>";
+            var message_warning = "<?php echo helper::translate('La sauvegarde des fichiers peut prendre du temps. Continuer ?'); ?>";
             return core.confirm(message_warning, function () {
                 //$(location).attr("href", _this.attr("href"));
                 $('body, .button').css('cursor', 'wait');
diff --git a/core/module/config/view/backup/backup.php b/core/module/config/view/backup/backup.php
index 9f5809ee..55694dcb 100644
--- a/core/module/config/view/backup/backup.php
+++ b/core/module/config/view/backup/backup.php
@@ -18,7 +18,7 @@
 	<div class="col12">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Paramètres de la sauvegarde'); ?>
+				<?php echo helper::translate('Paramètres de la sauvegarde'); ?>
 			</h4>
 			<div class="row">
 				<div class="col12">
diff --git a/core/module/config/view/connect/connect.php b/core/module/config/view/connect/connect.php
index 1dba83c0..e2f5a207 100644
--- a/core/module/config/view/connect/connect.php
+++ b/core/module/config/view/connect/connect.php
@@ -2,7 +2,7 @@
 	<div class="row">
 		<div class="col12">
 			<div class="block">
-				<h4><?php echo template::topic('Sécurité de la connexion'); ?>
+				<h4><?php echo helper::translate('Sécurité de la connexion'); ?>
 					<span id="specialeHelpButton" class="helpDisplayButton">
 						<a href="https://doc.zwiicms.fr/connexion" target="_blank" title="Cliquer pour consulter l'aide en ligne">
 							<?php echo template::ico('help', ['margin' => 'left']); ?>
@@ -91,7 +91,7 @@
 	<div class="row">
 		<div class="col12">
 			<div class="block">
-				<h4><?php echo template::topic('Journalisation'); ?>
+				<h4><?php echo helper::translate('Journalisation'); ?>
 					<span id="specialeHelpButton" class="helpDisplayButton">
 						<a href="https://doc.zwiicms.fr/journalisation" target="_blank" title="Cliquer pour consulter l'aide en ligne">
 							<?php echo template::ico('help', ['margin' => 'left']); ?>
diff --git a/core/module/config/view/index/index.js.php b/core/module/config/view/index/index.js.php
index 78328919..093e6f03 100644
--- a/core/module/config/view/index/index.js.php
+++ b/core/module/config/view/index/index.js.php
@@ -17,7 +17,7 @@ $(document).ready(function () {
      */
     $("#configBackupDelButton").on("click", function () {
         var _this = $(this);
-        var message_warning = "<?php echo template::topic('Supprimer toutes les sauvegardes automatiques ?'); ?>";
+        var message_warning = "<?php echo helper::translate('Supprimer toutes les sauvegardes automatiques ?'); ?>";
         return core.confirm(message_warning, function () {
             $(location).attr("href", _this.attr("href"));
         });
diff --git a/core/module/config/view/network/network.php b/core/module/config/view/network/network.php
index 1701f4d7..aa64c9e9 100644
--- a/core/module/config/view/network/network.php
+++ b/core/module/config/view/network/network.php
@@ -2,7 +2,7 @@
 	<div class="row">
 		<div class="col12">
 			<div class="block">
-				<h4><?php echo template::topic('Paramètres'); ?>
+				<h4><?php echo helper::translate('Paramètres'); ?>
 					<span id="specialeHelpButton" class="helpDisplayButton">
 						<a href="https://doc.zwiicms.fr/reseau" target="_blank" title="Cliquer pour consulter l'aide en ligne">
 							<?php echo template::ico('help', ['margin' => 'left']); ?>
@@ -37,7 +37,7 @@
 	<div class="row">
 		<div class="col12">
 			<div class="block">
-				<h4><?php echo template::topic('SMTP'); ?>
+				<h4><?php echo helper::translate('SMTP'); ?>
 					<span id="specialeHelpButton" class="helpDisplayButton">
 						<a href="https://doc.zwiicms.fr/smtp" target="_blank" title="Cliquer pour consulter l'aide en ligne">
 							<?php echo template::ico('help', ['margin' => 'left']); ?>
diff --git a/core/module/config/view/restore/restore.php b/core/module/config/view/restore/restore.php
index ab0c6266..4e5e1442 100644
--- a/core/module/config/view/restore/restore.php
+++ b/core/module/config/view/restore/restore.php
@@ -19,7 +19,7 @@
 	<div class="col12">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Archive à restaurer'); ?>
+				<?php echo helper::translate('Archive à restaurer'); ?>
 			</h4>
 			<div class="row">
 				<div class="col10 offset1">
diff --git a/core/module/config/view/setup/setup.php b/core/module/config/view/setup/setup.php
index a8e2abad..32db0980 100644
--- a/core/module/config/view/setup/setup.php
+++ b/core/module/config/view/setup/setup.php
@@ -2,7 +2,7 @@
 	<div class="row">
 		<div class="col12">
 			<div class="block">
-				<h4><?php echo template::topic('Paramétres'); ?>
+				<h4><?php echo helper::translate('Paramétres'); ?>
 					<span id="setupHelpButton" class="helpDisplayButton">
 						<a href="https://doc.zwiicms.fr/parametres" target="_blank" title="Cliquer pour consulter l'aide en ligne">
 							<?php echo template::ico('help', ['margin' => 'left']); ?>
@@ -56,7 +56,7 @@
 		<div class="col12">
 			<div class="block">
 				<h4>
-					<?php echo template::topic('Mise à jour automatisée'); ?>
+					<?php echo helper::translate('Mise à jour automatisée'); ?>
 					<span id="updateHelpButton" class="helpDisplayButton">
 						<a href="https://doc.zwiicms.fr/mise-a-jour" target="_blank" title="Cliquer pour consulter l'aide en ligne">
 							<?php echo template::ico('help', ['margin' => 'left']); ?>
diff --git a/core/module/config/view/social/social.php b/core/module/config/view/social/social.php
index aa4291b3..5b273b50 100644
--- a/core/module/config/view/social/social.php
+++ b/core/module/config/view/social/social.php
@@ -3,7 +3,7 @@
 		<div class="col12">
 			<div class="block">
 				<h4>
-					<?php echo template::topic('Capture d\'écran Open Graph'); ?>
+					<?php echo helper::translate('Capture d\'écran Open Graph'); ?>
 					<span id="specialeHelpButton" class="helpDisplayButton">
 						<a href="https://doc.zwiicms.fr/referencement" target="_blank" title="Cliquer pour consulter l'aide en ligne">
 							<?php echo template::ico('help', ['margin' => 'left']); ?>
@@ -47,7 +47,7 @@
 		<div class="col12">
 			<div class="block">
 				<h4>
-					<?php echo template::topic('Référencement'); ?>
+					<?php echo helper::translate('Référencement'); ?>
 				</h4>
 				<div class="row">
 					<div class="col4 offset1">
@@ -69,7 +69,7 @@
 		<div class="col12">
 			<div class="block">
 				<h4>
-					<?php echo template::topic('Réseaux sociaux'); ?>
+					<?php echo helper::translate('Réseaux sociaux'); ?>
 					<span id="specialeHelpButton" class="helpDisplayButton">
 						<a href="https://doc.zwiicms.fr/reseaux-sociaux" target="_blank" title="Cliquer pour consulter l'aide en ligne">
 							<?php echo template::ico('help', ['margin' => 'left']); ?>
diff --git a/core/module/install/view/index/index.php b/core/module/install/view/index/index.php
index 0717b540..9a70f299 100644
--- a/core/module/install/view/index/index.php
+++ b/core/module/install/view/index/index.php
@@ -1,6 +1,6 @@
 <?php echo template::formOpen('installForm'); ?>
 <h3>
-	<?php echo template::topic('Dans quelle langue utiliserez-vous Zwii ?'); ?>
+	<?php echo helper::translate('Dans quelle langue utiliserez-vous Zwii ?'); ?>
 </h3>
 <div class="row">
     <div class="col6 offset3">
diff --git a/core/module/install/view/postinstall/postinstall.php b/core/module/install/view/postinstall/postinstall.php
index 6a175e61..a20c8a6f 100644
--- a/core/module/install/view/postinstall/postinstall.php
+++ b/core/module/install/view/postinstall/postinstall.php
@@ -1,9 +1,9 @@
 <p>
-	<?php echo template::topic('Renseignez les champs ci-dessous pour finaliser l\'installation.'); ?>
+	<?php echo helper::translate('Renseignez les champs ci-dessous pour finaliser l\'installation.'); ?>
 </p>
 <?php echo template::formOpen('installForm'); ?>
 <h3>
-	<?php echo template::topic('Compte administrateur'); ?>
+	<?php echo helper::translate('Compte administrateur'); ?>
 </h3>
 <div>
 	<div class="row">
@@ -50,7 +50,7 @@
 <ul class="accordion" data-speed="150">
 	<li class="accordion-item">
 		<h3 class="accordion-title">
-			<?php echo template::topic('&#9655; Options avancées'); ?>
+			<?php echo helper::translate('&#9655; Options avancées'); ?>
 		</h3>
 		<div class="accordion-content">
 			<div class="row">
diff --git a/core/module/install/view/update/update.js.php b/core/module/install/view/update/update.js.php
index 4d1a05d2..2fa72559 100644
--- a/core/module/install/view/update/update.js.php
+++ b/core/module/install/view/update/update.js.php
@@ -4,10 +4,10 @@
 function step(i, data) {
 	// tableau des erreurs
 	var errors = [
-		"<?php echo template::topic('Préparation de la mise à jour'); ?>",
-		"<?php echo template::topic('Téléchargement et validation de l\'archive'); ?>",
-		"<?php echo template::topic('Installation'); ?>",
-		"<?php echo template::topic('Configuration'); ?>"
+		"<?php echo helper::translate('Préparation de la mise à jour'); ?>",
+		"<?php echo helper::translate('Téléchargement et validation de l\'archive'); ?>",
+		"<?php echo helper::translate('Installation'); ?>",
+		"<?php echo helper::translate('Configuration'); ?>"
 	];
 	// Affiche le texte de progression
 	$(".installUpdateProgressText").hide();
diff --git a/core/module/install/view/update/update.php b/core/module/install/view/update/update.php
index a9b40480..2ea32329 100644
--- a/core/module/install/view/update/update.php
+++ b/core/module/install/view/update/update.php
@@ -1,42 +1,42 @@
 <p><strong>
-	<?php echo template::topic('Mise à jour de ZwiiCMS'); ?>
+	<?php echo helper::translate('Mise à jour de ZwiiCMS'); ?>
 	&nbsp;
 	<?php echo self::ZWII_VERSION; ?> 
-	<?php echo template::topic('vers ZwiiCMS'); ?>
+	<?php echo helper::translate('vers ZwiiCMS'); ?>
 	&nbsp;
 	<?php echo $module::$newVersion; ?>.
 </strong></p>
 <p>
-<?php echo template::topic('Afin d\'assurer le bon fonctionnement de Zwii, veuillez ne pas fermer cette page avant la fin de l\'opération.'); ?>
+<?php echo helper::translate('Afin d\'assurer le bon fonctionnement de Zwii, veuillez ne pas fermer cette page avant la fin de l\'opération.'); ?>
 </p>
 <div class="row">
 	<div class="col9 verticalAlignMiddle">
 		<div id="installUpdateProgress">
 			<?php echo template::ico('spin', ['animate' => true]); ?>
 			<span class="installUpdateProgressText" data-id="1">
-				<?php echo template::topic('1/4 : Préparation...'); ?>
+				<?php echo helper::translate('1/4 : Préparation...'); ?>
 			</span>
 			<span class="installUpdateProgressText displayNone" data-id="2">
-				<?php echo template::topic('2/4 : Téléchargement...'); ?>
+				<?php echo helper::translate('2/4 : Téléchargement...'); ?>
 			</span>
 			<span class="installUpdateProgressText displayNone" data-id="3">
-				<?php echo template::topic('3/4 : Installation...'); ?>
+				<?php echo helper::translate('3/4 : Installation...'); ?>
 			</span>
 			<span class="installUpdateProgressText displayNone" data-id="4">
-				<?php echo template::topic('4/4 : Configuration...'); ?>
+				<?php echo helper::translate('4/4 : Configuration...'); ?>
 			</span>
 		</div>
 		<div id="installUpdateError" class="colorRed displayNone">
 			<?php echo template::ico('cancel'); ?>
 			<strong>
-				<?php echo template::topic('Une erreur est survenue lors de l\'étape :'); ?>
+				<?php echo helper::translate('Une erreur est survenue lors de l\'étape :'); ?>
 				&nbsp;
 				<span id="installUpdateErrorStep"> </span>.
 			</strong>
 		</div>
 		<div id="installUpdateSuccess" class="colorGreen displayNone">
 			<?php echo template::ico('check'); ?>
-			<?php echo template::topic('Mise à jour terminée avec succès.'); ?>
+			<?php echo helper::translate('Mise à jour terminée avec succès.'); ?>
 		</div>
 	</div>
 	<div class="col3 verticalAlignTop">
diff --git a/core/module/maintenance/view/index/index.php b/core/module/maintenance/view/index/index.php
index e217c222..ca9c61e1 100644
--- a/core/module/maintenance/view/index/index.php
+++ b/core/module/maintenance/view/index/index.php
@@ -1,5 +1,5 @@
 <p>
-	<?php echo template::topic('Notre site est actuellement en maintenance. Nous sommes désolés pour la gêne occasionnée et faisons notre possible pour être rapidement de retour.'); ?>
+	<?php echo helper::translate('Notre site est actuellement en maintenance. Nous sommes désolés pour la gêne occasionnée et faisons notre possible pour être rapidement de retour.'); ?>
 </p>
 <div class="row">
 	<div class="col4 offset8 textAlignCenter">
diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php
index 1575e28d..8dde2304 100644
--- a/core/module/page/view/edit/edit.js.php
+++ b/core/module/page/view/edit/edit.js.php
@@ -17,7 +17,7 @@
 */
  $("#pageEditDelete").on("click", function() {
 	var _this = $(this);
-	var message_delete = "<?php echo template::topic('Confirmer la suppression de la page'); ?>";
+	var message_delete = "<?php echo helper::translate('Confirmer la suppression de la page'); ?>";
 	return core.confirm(message_delete, function() {
 		$(location).attr("href", _this.attr("href"));
 	});
@@ -34,7 +34,7 @@ function protectModule() {
 	if ( oldModule !== "" &&
 		 oldModule !== newModule) {
 		var _this = $(this);
-		var message_delete = "<?php echo template::topic('Confirmer la suppression des données du module'); ?>";
+		var message_delete = "<?php echo helper::translate('Confirmer la suppression des données du module'); ?>";
 		core.confirm(message_delete + " " + oldModuleText,
 				function() {
 					$(location).attr("href", _this.attr("href"));
@@ -648,9 +648,9 @@ function buildPagesList(extraPosition) {
 	var positionInitial = <?php echo $this->getData(['page',$this->getUrl(2),"position"]); ?>;
 	var extraPosition = $("#pageEditExtraPosition").val();
 	var positionDOM = $("#pageEditPosition");
-	var message_none = "<?php echo template::topic('Ne pas afficher'); ?>";
-	var message_begin = "<?php echo template::topic('Au début'); ?>";
-	var message_after = "<?php echo template::topic('Après'); ?>";
+	var message_none = "<?php echo helper::translate('Ne pas afficher'); ?>";
+	var message_begin = "<?php echo helper::translate('Au début'); ?>";
+	var message_after = "<?php echo helper::translate('Après'); ?>";
 	positionDOM.empty().append(
 		$("<option>").val(0).text(message_none),
 		$("<option>").val(1).text(message_begin)
diff --git a/core/module/plugin/view/dataImport/dataImport.php b/core/module/plugin/view/dataImport/dataImport.php
index f522f128..6de767d8 100644
--- a/core/module/plugin/view/dataImport/dataImport.php
+++ b/core/module/plugin/view/dataImport/dataImport.php
@@ -17,7 +17,7 @@
     <div class="col12">
         <div class="block">
             <h4>
-                <?php echo template::topic('Installer les données d\'un module'); ?>
+                <?php echo helper::translate('Installer les données d\'un module'); ?>
             </h4>
             <div class="row">
                 <div class="col6">
diff --git a/core/module/plugin/view/index/index.js.php b/core/module/plugin/view/index/index.js.php
index ba149cb1..ef39f90c 100644
--- a/core/module/plugin/view/index/index.js.php
+++ b/core/module/plugin/view/index/index.js.php
@@ -33,7 +33,7 @@
  */
 $(".moduleDelete").on("click", function() {
 	var _this = $(this);
-    var message_delete = "<?php echo template::topic('Confirmer la désinstallation du module'); ?>";
+    var message_delete = "<?php echo helper::translate('Confirmer la désinstallation du module'); ?>";
 	return core.confirm(message_delete, function() {
 		$(location).attr("href", _this.attr("href"));
 	});
@@ -44,7 +44,7 @@ $(".moduleDelete").on("click", function() {
  */
  $(".dataDelete").on("click", function() {
 	var _this = $(this);
-    var message_unlink = "<?php echo template::topic('Confirmer la dissociation du module de cette page'); ?>";
+    var message_unlink = "<?php echo helper::translate('Confirmer la dissociation du module de cette page'); ?>";
 	return core.confirm(message_unlink, function() {
 		$(location).attr("href", _this.attr("href"));
 	});
diff --git a/core/module/plugin/view/index/index.php b/core/module/plugin/view/index/index.php
index ce197ef7..0dd0c437 100644
--- a/core/module/plugin/view/index/index.php
+++ b/core/module/plugin/view/index/index.php
@@ -46,7 +46,7 @@
 			<div class="col12">
 				<div class="block">
 					<h4>
-						<?php echo template::topic('Sauvegarde'); ?>
+						<?php echo helper::translate('Sauvegarde'); ?>
 					</h4>
 					<?php echo template::table([2, 2, 1, 5, 1, 1], $module::$modulesInstalled, ['Module', 'Identifiant', 'Version', '', '', '']); ?>
 				</div>
@@ -60,7 +60,7 @@
 			<div class="col12">
 				<div class="block">
 					<h4>
-						<?php echo template::topic('Modules orphelins'); ?>
+						<?php echo helper::translate('Modules orphelins'); ?>
 					</h4>
 					<?php echo template::table([2, 2, 1, 6, 1], $module::$modulesOrphan, ['Module', 'Identifiant', 'Version', '', '']); ?>
 				</div>
@@ -76,7 +76,7 @@
 			<div class="col12">
 				<div class="block">
 					<h4>
-						<?php echo template::topic('Modules configurés'); ?>
+						<?php echo helper::translate('Modules configurés'); ?>
 						&nbsp;
 						<?php echo template::flag(self::$i18nContent, '20px'); ?>
 					</h4>
diff --git a/core/module/plugin/view/item/item.php b/core/module/plugin/view/item/item.php
index 8f009857..34d9301c 100644
--- a/core/module/plugin/view/item/item.php
+++ b/core/module/plugin/view/item/item.php
@@ -16,18 +16,18 @@
     </div>
     <div class="row">
         <div class="col12 textAlignCenter">
-            <?php echo template::topic('Version n°') . $module::$storeItem['fileVersion']; ?>
+            <?php echo helper::translate('Version n°') . $module::$storeItem['fileVersion']; ?>
         </div>
     </div>
     <div class="row">
         <div class="col12 textAlignCenter">
-            &nbsp;<?php echo template::topic('du') . '&nbsp;' .  $module::$storeItem['fileDate']; ?>
+            &nbsp;<?php echo helper::translate('du') . '&nbsp;' .  $module::$storeItem['fileDate']; ?>
         </div>
     </div>
     <div class="row">
         <div class="col12 textAlignCenter">
             <span>
-                <?php echo template::topic('Auteur :'); ?>
+                <?php echo helper::translate('Auteur :'); ?>
                 <?php echo $module::$storeItem['fileAuthor']; ?>
             </span>
         </div>
@@ -35,7 +35,7 @@
     <div class="row">
         <div class="col12 textAlignCenter">
             <span>
-                <?php echo template::topic('Licence :'); ?>
+                <?php echo helper::translate('Licence :'); ?>
                 &nbsp;
                 <?php echo $module::$storeItem['fileLicense']; ?>
             </span>
diff --git a/core/module/plugin/view/upload/upload.php b/core/module/plugin/view/upload/upload.php
index cc1cdc79..d00b8bf6 100644
--- a/core/module/plugin/view/upload/upload.php
+++ b/core/module/plugin/view/upload/upload.php
@@ -27,7 +27,7 @@
   <div class="col12">
     <div class="block">
       <h4>
-        <?php echo template::topic('Installer ou mettre à jour un module téléchargé'); ?>
+        <?php echo helper::translate('Installer ou mettre à jour un module téléchargé'); ?>
       </h4>
       <div class="row">
         <div class="col6 offset3">
diff --git a/core/module/theme/view/admin/admin.php b/core/module/theme/view/admin/admin.php
index abda66ae..98829b2e 100644
--- a/core/module/theme/view/admin/admin.php
+++ b/core/module/theme/view/admin/admin.php
@@ -33,7 +33,7 @@
 	<div class="col12">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Couleurs'); ?>
+				<?php echo helper::translate('Couleurs'); ?>
 			</h4>
 			<div class="row">
 				<div class="col4">
@@ -128,7 +128,7 @@
 	<div class="col12">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Mise en forme du texte'); ?>
+				<?php echo helper::translate('Mise en forme du texte'); ?>
 			</h4>
 			<div class="row">
 				<div class="col4">
diff --git a/core/module/theme/view/body/body.php b/core/module/theme/view/body/body.php
index 518c59f8..cdacef57 100644
--- a/core/module/theme/view/body/body.php
+++ b/core/module/theme/view/body/body.php
@@ -58,7 +58,7 @@
 	<div class="col12">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Image'); ?>
+				<?php echo helper::translate('Image'); ?>
 			</h4>
 			<div class="row">
 				<div class="col12">
diff --git a/core/module/theme/view/fontAdd/fontAdd.php b/core/module/theme/view/fontAdd/fontAdd.php
index 6e3bff1c..d09b94fd 100644
--- a/core/module/theme/view/fontAdd/fontAdd.php
+++ b/core/module/theme/view/fontAdd/fontAdd.php
@@ -26,7 +26,7 @@
 	<div class="col12">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Identité de la fonte'); ?>
+				<?php echo helper::translate('Identité de la fonte'); ?>
 			</h4>
 			<div class="row">
 				<div class="col6">
diff --git a/core/module/theme/view/fontEdit/fontEdit.php b/core/module/theme/view/fontEdit/fontEdit.php
index ba82152b..2a26c0a0 100644
--- a/core/module/theme/view/fontEdit/fontEdit.php
+++ b/core/module/theme/view/fontEdit/fontEdit.php
@@ -26,7 +26,7 @@
 	<div class="col12">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Identité de la fonte'); ?>
+				<?php echo helper::translate('Identité de la fonte'); ?>
 
 			</h4>
 			<div class="row">
diff --git a/core/module/theme/view/footer/footer.php b/core/module/theme/view/footer/footer.php
index f7bc0a9c..6a321a6a 100644
--- a/core/module/theme/view/footer/footer.php
+++ b/core/module/theme/view/footer/footer.php
@@ -159,7 +159,7 @@
 <div class="row">
     <div class="col12">
         <?php echo template::textarea('themeFooterText', [
-            'label' => '<div class="titleWysiwygContent">' . template::topic('Contenu personnalisé') . '</div>',
+            'label' => '<div class="titleWysiwygContent">' . helper::translate('Contenu personnalisé') . '</div>',
             'value' => $this->getData(['theme', 'footer', 'text']),
             'class' => 'editorWysiwyg'
         ]); ?>
@@ -169,7 +169,7 @@
     <div class="col12">
         <div class="block">
             <h4>
-                <?php echo template::topic('Mise en forme du texte'); ?>
+                <?php echo helper::translate('Mise en forme du texte'); ?>
             </h4>
             <div class="row">
                 <div class="col3">
@@ -206,7 +206,7 @@
     <div class="col12">
         <div class="block">
             <h4>
-                <?php echo template::topic('Disposition'); ?>
+                <?php echo helper::translate('Disposition'); ?>
             </h4>
             <div class="row">
                 <div class="col4">
@@ -221,7 +221,7 @@
                 <div class="col4">
                     <p>
                         <strong>
-                            <?php echo template::topic('Contenu personnalisé'); ?>
+                            <?php echo helper::translate('Contenu personnalisé'); ?>
                         </strong>
                     </p>
                     <div class="row">
@@ -245,7 +245,7 @@
                 <div class="col4">
                     <p>
                         <strong>
-                            <?php echo template::topic('Réseaux sociaux'); ?>
+                            <?php echo helper::translate('Réseaux sociaux'); ?>
                         </strong>
                     </p>
                     <div class="row">
@@ -269,7 +269,7 @@
                 <div class="col4">
                     <p>
                         <strong>
-                            <?php echo template::topic('Informations'); ?>
+                            <?php echo helper::translate('Informations'); ?>
                         </strong>
                     </p>
                     <div class="row">
diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php
index 06c08722..ed25c600 100644
--- a/core/module/theme/view/header/header.php
+++ b/core/module/theme/view/header/header.php
@@ -23,7 +23,7 @@
     <div class="col12">
         <div class="block">
             <h4>
-                <?php echo template::topic('Paramètres'); ?>
+                <?php echo helper::translate('Paramètres'); ?>
             </h4>
             <div class="row">
                 <div class="col4">
@@ -76,7 +76,7 @@
     <div class="col12">
         <div class="block">
             <h4>
-                <?php echo template::topic('Couleurs'); ?>
+                <?php echo helper::translate('Couleurs'); ?>
             </h4>
             <div class="row">
                 <div class="col6">
@@ -103,7 +103,7 @@
     <div class="col12">
         <div class="block">
             <h4>
-                <?php echo template::topic('Mise en forme du titre'); ?>
+                <?php echo helper::translate('Mise en forme du titre'); ?>
             </h4>
             <div class="row">
                 <div class="col4">
@@ -154,7 +154,7 @@
     <div class="col12">
         <div class="block">
             <h4>
-                <?php echo template::topic('Papier peint'); ?>
+                <?php echo helper::translate('Papier peint'); ?>
             </h4>
             <div class="row">
                 <div class="col12">
@@ -167,11 +167,11 @@
                         'value' => $imageFile
                     ]); ?>
                     <span class="themeHeaderImageOptions displayNone" id="themeHeaderImageInfo">
-                        <?php echo template::topic('Largeur de l\'image :'); ?> <span id="themeHeaderImageWidth"></span> ( <?php echo template::topic('largeur de site :'); ?> <?php echo $this->getData(['theme', 'site', 'width']); ?>)
+                        <?php echo helper::translate('Largeur de l\'image :'); ?> <span id="themeHeaderImageWidth"></span> ( <?php echo helper::translate('largeur de site :'); ?> <?php echo $this->getData(['theme', 'site', 'width']); ?>)
                         -
-                        <?php echo template::topic('Hargeur de l\'image :'); ?> <span id="themeHeaderImageHeight"></span>
+                        <?php echo helper::translate('Hargeur de l\'image :'); ?> <span id="themeHeaderImageHeight"></span>
                         -
-                        <?php echo template::topic('Ratio :'); ?> <span id="themeHeaderImageRatio"></span>
+                        <?php echo helper::translate('Ratio :'); ?> <span id="themeHeaderImageRatio"></span>
                     </span>
                 </div>
             </div>
@@ -213,7 +213,7 @@
         <div class="row">
             <div class="col12">
                 <?php echo template::textarea('themeHeaderText', [
-                    'label' => '<div class="titleWysiwygContent">' . template::topic('Contenu personnalisé') . '</div>',
+                    'label' => '<div class="titleWysiwygContent">' . helper::translate('Contenu personnalisé') . '</div>',
                     'class' => 'editorWysiwyg',
                     'value' => $this->getData(['theme', 'header', 'featureContent'])
                 ]); ?>
diff --git a/core/module/theme/view/manage/manage.php b/core/module/theme/view/manage/manage.php
index 5898b657..01745a41 100644
--- a/core/module/theme/view/manage/manage.php
+++ b/core/module/theme/view/manage/manage.php
@@ -25,7 +25,7 @@
 	<div class="col12">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Installer un thème archivé (site ou administration)'); ?>
+				<?php echo helper::translate('Installer un thème archivé (site ou administration)'); ?>
 			</h4>
 			<div class="row">
 				<div class="col6 offset3">
@@ -42,9 +42,9 @@
 	<div class="col6">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Sauvegarde du thème dans le'); ?>
+				<?php echo helper::translate('Sauvegarde du thème dans le'); ?>
 				<a href="<?php echo helper::baseUrl(false); ?>core/vendor/filemanager/dialog.php?fldr=theme&type=0&akey=<?php echo md5_file(self::DATA_DIR . 'core.json'); ?>" data-lity>
-					<?php echo template::topic('gestionnaire de fichiers'); ?>
+					<?php echo helper::translate('gestionnaire de fichiers'); ?>
 				</a>
 			</h4>
 			<div class="row">
@@ -69,7 +69,7 @@
 	<div class="col6">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Télécharger le thème'); ?>
+				<?php echo helper::translate('Télécharger le thème'); ?>
 			</h4>
 			<div class="row">
 				<div class="col6">
diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php
index 7e023583..64281d03 100644
--- a/core/module/theme/view/menu/menu.php
+++ b/core/module/theme/view/menu/menu.php
@@ -23,7 +23,7 @@
     <div class="col12">
         <div class="block">
             <h4>
-                <?php echo template::topic(' Paramètres'); ?>
+                <?php echo helper::translate(' Paramètres'); ?>
             </h4>
             <div class="row">
                 <div class="col6">
@@ -86,7 +86,7 @@
     <div class="col12">
         <div class="block">
             <h4>
-                <?php echo template::topic('Contenu'); ?>
+                <?php echo helper::translate('Contenu'); ?>
             </h4>
             <div class="row">
                 <div class="col3">
@@ -128,7 +128,7 @@
     <div class="col12">
         <div class="block">
             <h4>
-                <?php echo template::topic('Couleurs'); ?>
+                <?php echo helper::translate('Couleurs'); ?>
             </h4>
             <div class="row">
                 <div class="col4">
@@ -188,7 +188,7 @@
     <div class="col12">
         <div class="block">
             <h4>
-                <?php echo template::topic('Mise en forme du texte'); ?>
+                <?php echo helper::translate('Mise en forme du texte'); ?>
             </h4>
             <div class="row">
                 <div class="col6">
diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php
index 9e529201..4a87e6d3 100644
--- a/core/module/theme/view/site/site.php
+++ b/core/module/theme/view/site/site.php
@@ -23,7 +23,7 @@
 	<div class="col12">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Paramètres'); ?>
+				<?php echo helper::translate('Paramètres'); ?>
 			</h4>
 			<div class="row">
 				<div class="col4">
@@ -59,7 +59,7 @@
 	<div class="col12">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Couleurs'); ?>
+				<?php echo helper::translate('Couleurs'); ?>
 			</h4>
 			<div class="row">
 				<div class="col8">
@@ -161,7 +161,7 @@
 	<div class="col6">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Mise en forme du texte'); ?>
+				<?php echo helper::translate('Mise en forme du texte'); ?>
 			</h4>
 			<div class="row">
 				<div class="col6">
@@ -185,7 +185,7 @@
 	<div class="col6">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Mise en forme des titres'); ?>
+				<?php echo helper::translate('Mise en forme des titres'); ?>
 			</h4>
 			<div class="row">
 				<div class="col4">
diff --git a/core/module/translate/view/add/add.php b/core/module/translate/view/add/add.php
index 9660721c..64665f6f 100644
--- a/core/module/translate/view/add/add.php
+++ b/core/module/translate/view/add/add.php
@@ -15,7 +15,7 @@
     <div class="col12">
         <div class="block">
             <h4>
-                <?php echo template::topic('Ajout d\'une longue de contenu'); ?>
+                <?php echo helper::translate('Ajout d\'une longue de contenu'); ?>
             </h4>
             <div class="row">
                 <div class="col4 offset4">
diff --git a/core/module/translate/view/copy/copy.php b/core/module/translate/view/copy/copy.php
index e1c3eb33..824bbe7b 100644
--- a/core/module/translate/view/copy/copy.php
+++ b/core/module/translate/view/copy/copy.php
@@ -17,7 +17,7 @@
     <div class="col12">
         <div class="block">
             <h4>
-                <?php echo template::topic('Copie des traductions rédigées'); ?>
+                <?php echo helper::translate('Copie des traductions rédigées'); ?>
             </h4>
             <div class="row">
                 <div class="col6">
diff --git a/core/module/translate/view/index/index.js.php b/core/module/translate/view/index/index.js.php
index c7e5423d..17064efd 100644
--- a/core/module/translate/view/index/index.js.php
+++ b/core/module/translate/view/index/index.js.php
@@ -47,7 +47,7 @@ $("#translateContentButton").on("click", function () {
  */
  $(".translateDelete").on("click", function() {
 	var _this = $(this);
-    var message_delete = "<?php echo template::topic('Confirmer la suppression de cette traduction du site'); ?>";
+    var message_delete = "<?php echo helper::translate('Confirmer la suppression de cette traduction du site'); ?>";
 	return core.confirm(message_delete, function() {
 		$(location).attr("href", _this.attr("href"));
 	});
diff --git a/core/module/translate/view/index/index.php b/core/module/translate/view/index/index.php
index 0b86ecdd..9badd51a 100644
--- a/core/module/translate/view/index/index.php
+++ b/core/module/translate/view/index/index.php
@@ -54,7 +54,7 @@
 		<div class="col12">
 			<div class="block">
 				<h4>
-					<?php echo template::topic('Langue de l\'administration'); ?>
+					<?php echo helper::translate('Langue de l\'administration'); ?>
 				</h4>
 				<div class="row">
 					<div class="col4 offset4">
diff --git a/core/module/user/view/add/add.php b/core/module/user/view/add/add.php
index b5360087..df28b008 100644
--- a/core/module/user/view/add/add.php
+++ b/core/module/user/view/add/add.php
@@ -15,7 +15,7 @@
 	<div class="col6">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Identité'); ?>
+				<?php echo helper::translate('Identité'); ?>
 			</h4>
 			<div class="row">
 				<div class="col6">
@@ -54,25 +54,25 @@
 				]); ?>
 			</div>
 			<div id="userAddLabelAuth">
-				<?php echo template::topic('Permissions :'); ?>
+				<?php echo helper::translate('Permissions :'); ?>
 			</div>
 			<ul id="userAddGroupDescription<?php echo self::GROUP_MEMBER; ?>" class="userAddGroupDescription displayNone">
-				<li><?php echo template::topic('Accès aux pages privées'); ?></li>
+				<li><?php echo helper::translate('Accès aux pages privées'); ?></li>
 			</ul>
 			<ul id="userAddGroupDescription<?php echo self::GROUP_MODERATOR; ?>" class="userAddGroupDescription displayNone">
-				<li><?php echo template::topic('Accès aux pages privées'); ?></li>
-				<li><?php echo template::topic('Ajout / Édition / Suppression de pages'); ?></li>
-				<li><?php echo template::topic('Ajout / Édition / Suppression de fichiers'); ?></li>
+				<li><?php echo helper::translate('Accès aux pages privées'); ?></li>
+				<li><?php echo helper::translate('Ajout / Édition / Suppression de pages'); ?></li>
+				<li><?php echo helper::translate('Ajout / Édition / Suppression de fichiers'); ?></li>
 			</ul>
 			<ul id="userAddGroupDescription<?php echo self::GROUP_ADMIN; ?>" class="userAddGroupDescription displayNone">
-				<li><?php echo template::topic('Administration complète du site'); ?></li>
+				<li><?php echo helper::translate('Administration complète du site'); ?></li>
 			</ul>
 		</div>
 	</div>
 	<div class="col6">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Authentification'); ?>
+				<?php echo helper::translate('Authentification'); ?>
 			</h4>
 			<?php echo template::text('userAddId', [
 				'autocomplete' => 'off',
diff --git a/core/module/user/view/edit/edit.php b/core/module/user/view/edit/edit.php
index 58bf7670..74756723 100644
--- a/core/module/user/view/edit/edit.php
+++ b/core/module/user/view/edit/edit.php
@@ -23,7 +23,7 @@
 	<div class="col6">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Identité'); ?>
+				<?php echo helper::translate('Identité'); ?>
 			</h4>
 			<div class="row">
 				<div class="col6">
@@ -71,18 +71,18 @@
 					]); ?>
 				</div>
 				<div id="userEditLabelAuth">
-					<?php echo template::topic('Permissions :'); ?>
+					<?php echo helper::translate('Permissions :'); ?>
 				</div>
 				<ul id="userEditGroupDescription<?php echo self::GROUP_MEMBER; ?>" class="userEditGroupDescription displayNone">
-					<li><?php echo template::topic('Accès aux pages privées'); ?></li>
+					<li><?php echo helper::translate('Accès aux pages privées'); ?></li>
 				</ul>
 				<ul id="userEditGroupDescription<?php echo self::GROUP_MODERATOR; ?>" class="userEditGroupDescription displayNone">
-					<li><?php echo template::topic('Accès aux pages privées'); ?></li>
-					<li><?php echo template::topic('Ajout / Édition / Suppression de pages'); ?></li>
-					<li><?php echo template::topic('Ajout / Édition / Suppression de fichiers'); ?></li>
+					<li><?php echo helper::translate('Accès aux pages privées'); ?></li>
+					<li><?php echo helper::translate('Ajout / Édition / Suppression de pages'); ?></li>
+					<li><?php echo helper::translate('Ajout / Édition / Suppression de fichiers'); ?></li>
 				</ul>
 				<ul id="userEditGroupDescription<?php echo self::GROUP_ADMIN; ?>" class="userEditGroupDescription displayNone">
-					<li><?php echo template::topic('Administration complète du site'); ?></li>
+					<li><?php echo helper::translate('Administration complète du site'); ?></li>
 				</ul>
 			<?php endif; ?>
 		</div>
@@ -90,7 +90,7 @@
 	<div class="col6">
 		<div class="block">
 			<h4>
-				<?php echo template::topic('Authentification'); ?>
+				<?php echo helper::translate('Authentification'); ?>
 			</h4>
 			<?php echo template::text('userEditId', [
 				'autocomplete' => 'off',
diff --git a/core/module/user/view/import/import.php b/core/module/user/view/import/import.php
index 60b2ff3f..069f4d08 100644
--- a/core/module/user/view/import/import.php
+++ b/core/module/user/view/import/import.php
@@ -26,7 +26,7 @@
     <div class="col12">
         <div class="block">
             <h4>
-                <?php echo template::topic('Importation de fichier plat CSV'); ?>
+                <?php echo helper::translate('Importation de fichier plat CSV'); ?>
             </h4>
             <div class="row">
                 <div class="col10">
diff --git a/core/module/user/view/index/index.js.php b/core/module/user/view/index/index.js.php
index 96c9f3b4..909bf994 100644
--- a/core/module/user/view/index/index.js.php
+++ b/core/module/user/view/index/index.js.php
@@ -16,7 +16,7 @@
  */
 $(".userDelete").on("click", function() {
 	var _this = $(this);
-	message = "<?php echo template::topic('Confirmer  la suppression de cet utilisateur');?>";
+	message = "<?php echo helper::translate('Confirmer  la suppression de cet utilisateur');?>";
 	return core.confirm(message, function() {
 		$(location).attr("href", _this.attr("href"));
 	});