Maj du fichier de langue FR et fusion des fichiers de langues ecommer…

…ce et woocommerce
OPEN-DSI · Jul 15, 2024 · 2e46aa1 · 2e46aa1
1 parent 6bd3491
commit 2e46aa1
Show file tree

Hide file tree

Showing 17 changed files with 601 additions and 550 deletions.
diff --git a/admin/changelog.php b/admin/changelog.php
@@ -32,7 +32,7 @@
 dol_include_once('/ecommerceng/lib/opendsi_common.lib.php');
 dol_include_once('/ecommerceng/core/modules/modECommerceNg.class.php');
 
-$langs->loadLangs(array("admin", "orders", "companies", "bills", "accountancy", "banks", "oauth", "ecommerce@ecommerceng", "woocommerce@ecommerceng", "opendsi@ecommerceng"));
+$langs->loadLangs(array("admin", "orders", "companies", "bills", "accountancy", "banks", "oauth", "ecommerce@ecommerceng", "opendsi@ecommerceng"));
 
 if (!$user->admin) accessforbidden();
 

diff --git a/admin/order.php b/admin/order.php
@@ -34,7 +34,7 @@
 dol_include_once('/ecommerceng/admin/class/data/eCommerceDict.class.php');
 dol_include_once('/ecommerceng/class/data/eCommercePaymentGateways.class.php');
 
-$langs->loadLangs(array("admin", "orders", "companies", "bills", "accountancy", "banks", "oauth", "ecommerce@ecommerceng", "woocommerce@ecommerceng", "opendsi@ecommerceng"));
+$langs->loadLangs(array("admin", "orders", "companies", "bills", "accountancy", "banks", "oauth", "ecommerce@ecommerceng", "opendsi@ecommerceng"));
 
 if (!$user->admin && !$user->rights->ecommerceng->site) accessforbidden();
 

diff --git a/admin/product.php b/admin/product.php
@@ -35,7 +35,7 @@
 dol_include_once('/ecommerceng/lib/eCommerce.lib.php');
 dol_include_once('/ecommerceng/admin/class/data/eCommerceDict.class.php');
 
-$langs->loadLangs(array("admin", "companies", "bills", "accountancy", "banks", "oauth", "ecommerce@ecommerceng", "woocommerce@ecommerceng", "opendsi@ecommerceng"));
+$langs->loadLangs(array("admin", "companies", "bills", "accountancy", "banks", "oauth", "ecommerce@ecommerceng", "opendsi@ecommerceng"));
 
 if (!$user->admin && !$user->rights->ecommerceng->site) accessforbidden();
 

diff --git a/admin/setup.php b/admin/setup.php
@@ -33,7 +33,7 @@
 
 use OAuth\Common\Storage\DoliStorage;
 
-$langs->loadLangs(array("admin", "companies", "bills", "accountancy", "banks", "oauth", "ecommerce@ecommerceng", "woocommerce@ecommerceng", "opendsi@ecommerceng"));
+$langs->loadLangs(array("admin", "companies", "bills", "accountancy", "banks", "oauth", "ecommerce@ecommerceng", "opendsi@ecommerceng"));
 
 if (!$user->admin && !$user->rights->ecommerceng->site) accessforbidden();
 

diff --git a/admin/stock.php b/admin/stock.php
@@ -33,7 +33,7 @@
 dol_include_once('/ecommerceng/class/data/eCommerceRemoteWarehouses.class.php');
 dol_include_once('/ecommerceng/class/data/eCommerceRemoteShippingZoneMethods.class.php');
 
-$langs->loadLangs(array("admin", "stocks", "ecommerce@ecommerceng", "woocommerce@ecommerceng", "opendsi@ecommerceng"));
+$langs->loadLangs(array("admin", "stocks", "ecommerce@ecommerceng", "opendsi@ecommerceng"));
 
 if (!$user->admin && !$user->rights->ecommerceng->site) accessforbidden();
 

diff --git a/admin/thirdparty.php b/admin/thirdparty.php
@@ -34,7 +34,7 @@
 dol_include_once('/ecommerceng/lib/eCommerce.lib.php');
 dol_include_once('/ecommerceng/admin/class/data/eCommerceDict.class.php');
 
-$langs->loadLangs(array("admin", "companies", "bills", "accountancy", "banks", "oauth", "ecommerce@ecommerceng", "woocommerce@ecommerceng", "opendsi@ecommerceng"));
+$langs->loadLangs(array("admin", "companies", "bills", "accountancy", "banks", "oauth", "ecommerce@ecommerceng", "opendsi@ecommerceng"));
 
 if (!$user->admin && !$user->rights->ecommerceng->site && !empty($conf->societe->enabled)) accessforbidden();
 

diff --git a/class/actions_ecommerceng.class.php b/class/actions_ecommerceng.class.php
@@ -148,7 +148,6 @@ function doActions($parameters, &$object, &$action, $hookmanager)
 			if ($action == 'confirm_update_company_from_ecommerce' && $confirm == 'yes' && $this->isCompanyLinkedToECommerce($object)) {
 				$site_id = GETPOST('siteid', 'int');
 				$langs->load('ecommerceng@ecommerceng');
-				$langs->load('woocommerce@ecommerceng');
 
 				$error = 0;
 				$object->db->begin();

diff --git a/class/data/woocommerce/eCommerceRemoteAccessWoocommerce.class.php b/class/data/woocommerce/eCommerceRemoteAccessWoocommerce.class.php
@@ -174,7 +174,6 @@ function __construct($db, $site)
         global $langs;
 
         $langs->load("ecommerce@ecommerceng");
-        $langs->load("woocommerce@ecommerceng");
 
         $this->db = $db;
         $this->site = $site;
@@ -1484,7 +1483,7 @@ public function getLanguage($language)
 		if (!isset(self::$languages_cached[$language])) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($language);
-			$outputlangs->loadLangs(array('main', 'ecommerce@ecommerceng', 'woocommerce@ecommerceng'));
+			$outputlangs->loadLangs(array('main', 'ecommerce@ecommerceng'));
 
 			self::$languages_cached[$language] = $outputlangs;
 		}

diff --git a/core/modules/modECommerceNg.class.php b/core/modules/modECommerceNg.class.php
@@ -117,7 +117,7 @@ function __construct($db)
         $easya_info = json_decode(file_get_contents(__DIR__.'/../../.easya_info.json'));
         $this->phpmin = explode('.', $easya_info->php_min_version);                    // Minimum version of PHP required by module
         $this->need_dolibarr_version = explode('.', $easya_info->dlb_min_version);    // Minimum version of Dolibarr required by module
-		$this->langfiles = array("ecommerce@ecommerceng", "woocommerce@ecommerceng");
+		$this->langfiles = array("ecommerce@ecommerceng");
 
 		// Constants
 		// List of particular constants to add when module is enabled
@@ -154,7 +154,7 @@ function __construct($db)
 
 		// Dictionaries
 		$this->dictionaries = array(
-			'langs' => 'woocommerce@ecommerceng',
+			'langs' => 'ecommerce@ecommerceng',
 			'tabname' => array(
 				MAIN_DB_PREFIX . "c_ecommerceng_tax_class",
 				MAIN_DB_PREFIX . "c_ecommerceng_tax_rate",