Shop - Bad language file ("boutique" instead of "shop") & add languag…

…e key
Dolibarr · Jun 17, 2014 · 736561e · 736561e
1 parent a974fa4
commit 736561e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php
@@ -23,11 +23,11 @@
  */
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
 
-$langs->load("boutique");
+$langs->load("shop");
 $langs->load("orders");
 
+require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
 
 llxHeader("",$langs->trans("OSCommerceShop"),"");
 

diff --git a/htdocs/boutique/osc_master.inc.php b/htdocs/boutique/osc_master.inc.php
@@ -31,7 +31,7 @@
     dol_syslog($dbosc,"host=".$conf->global->OSC_DB_HOST.", user=".$conf->global->OSC_DB_USER.", databasename=".$conf->global->OSC_DB_NAME.", ".$db->error,LOG_ERR);
 
 	llxHeader("",$langs->trans("OSCommerceShop"),"");
-	print '<div class="error">Failed to connect to oscommerce database. Check your module setup</div>';
+	print '<div class="error">'.$langs->trans('FailedConnectDBCheckModuleSetup').'</div>';
 	llxFooter();
 	exit;
 }

diff --git a/htdocs/langs/en_US/shop.lang b/htdocs/langs/en_US/shop.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - shop
+FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
 Shop=Shop
 ShopWeb=Web Shop
 LastOrders=Last orders

diff --git a/htdocs/langs/fr_FR/shop.lang b/htdocs/langs/fr_FR/shop.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - shop
+FailedConnectDBCheckModuleSetup=Erreur de connexion à la base de données oscommerce. Vérifier la configuration du module
 Shop=Boutique
 ShopWeb=Boutique Web
 LastOrders=Dernières commandes