Merge pull request #32 from Net-Logic/langs

rename getCache
Net-Logic · Mar 28, 2023 · 084d569 · 084d569
2 parents 20a38f9 + b1f65d3
commit 084d569
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/admin/setup.php b/admin/setup.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2023  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -172,7 +172,7 @@
 	print '<td>' . $langs->trans("Value") . '</td></tr>';
 
 	foreach ($arrayofparameters as $key => $val) {
-		print '<tr class="oddeven"><td>';
+		print '<tr class="oddeven"><td class="nowrap">';
 		$tooltiphelp = (($langs->trans($key . 'Tooltip') != $key . 'Tooltip') ? $langs->trans($key . 'Tooltip') : '');
 		print $form->textwithpicto($langs->trans($key), $tooltiphelp);
 		print '</td><td>';
@@ -200,7 +200,7 @@
 	// Modules
 	foreach ($modules as $const => $desc) {
 		print '<tr class="oddeven">';
-		print '<td>' . $langs->trans($desc) . '</td>';
+		print '<td class="nowrap">' . $langs->trans($desc) . '</td>';
 		print '<td class="center centpercent">';
 		$constante = 'PRUNE_' . $const;
 		$value = (isset($conf->global->$constante) ? $conf->global->$constante : 0);

diff --git a/core/modules/modPrune.class.php b/core/modules/modPrune.class.php
@@ -70,7 +70,7 @@ public function __construct($db)
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr',
 		// 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = '1.1.2';
+		$this->version = '1.2.0';
 
 		// Url to the file with your last numberversion of this module
 		$url = 'https://wiki.netlogic.fr/versionmodule.php?module=' . strtolower($this->name) . '&number=' . $this->numero . '&version=' . $this->version . '&dolversion=' . DOL_VERSION;

diff --git a/langs/fr_FR/prune.lang b/langs/fr_FR/prune.lang
@@ -5,3 +5,4 @@ PrunePHPVersion=Version PHP
 PruneNamespace=Espace de nom
 PruneSourceUrl=Url
 PruneHomepage=Homepage
+PruneEnableDevelopperMode=Activer le mode développeur
diff --git a/lib/prune.lib.php b/lib/prune.lib.php
@@ -86,15 +86,15 @@ function pruneAdminPrepareHead()
 }
 
 /**
- * getcache
+ * getPruneCache
  *
  * @param string $namespace     a string prefixed to the keys of the items stored in this cache
  * @param int $defaultLifetime  the default lifetime (in seconds) for cache items that do not define their
  *                              own lifetime, with a value 0 causing items to be stored indefinitely (i.e.
  *                              until the files are deleted)
  * @return Symfony\Component\Cache\Adapter\AbstractAdapter
  */
-function getCache($namespace = '', $defaultLifetime = 0)
+function getPruneCache($namespace = '', $defaultLifetime = 0)
 {
 	$typeCache = getDolGlobalInt('PRUNE_CACHE_TYPE');
 	if ($typeCache == 2) {