Merge pull request #9516 from grandoc/new_branch_15_09_2018

New branch 15 09 2018
Dolibarr · Sep 15, 2018 · 6ba2127 · 6ba2127
2 parents 856b1e7 + 5c3a24a
commit 6ba2127
Show file tree

Hide file tree

Showing 12 changed files with 157 additions and 216 deletions.
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
@@ -41,8 +41,8 @@
 
 if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
 
-$langs->load("main");
-$langs->load("agenda");
+// Load translation files required by the page
+$langs->loadLangs(array("agenda","main"));
 
 $right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
 $left=($langs->trans("DIRECTION")=='rtl'?'right':'left');

diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -35,10 +35,10 @@
  */
 class doc_generic_user_odt extends ModelePDFUser
 {
-	var $emetteur;	// Objet societe qui emet
+	public $emetteur;	// Objet societe qui emet
 
-	var $phpmin = array(5,2,0);	// Minimum version of PHP required by module
-	var $version = 'dolibarr';
+	public $phpmin = array(5,4,0);	// Minimum version of PHP required by module
+	public $version = 'dolibarr';
 
 
 	/**
@@ -50,8 +50,8 @@ function __construct($db)
 	{
 		global $conf,$langs,$mysoc;
 
-		$langs->load("main");
-		$langs->load("companies");
+		// Load translation files required by the page
+        $langs->loadLangs(array("main","companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";

diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -97,8 +97,8 @@ function info($langs)
 	{
 		global $conf,$langs;
 
-		$langs->load("companies");
-		$langs->load("errors");
+		// Load translation files required by the page
+        $langs->loadLangs(array("errors","companies"));
 
 		$form = new Form($this->db);
 

diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
@@ -28,8 +28,8 @@
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
-$langs->load("products");
-$langs->load("other");
+// Load translation files required by the page
+$langs->loadLangs(array("products","other"));
 
 $id=GETPOST('id','int');
 $action=GETPOST('action','alpha');

diff --git a/htdocs/core/tools.php b/htdocs/core/tools.php
@@ -24,8 +24,8 @@
 
 require '../main.inc.php';
 
-$langs->load("companies");
-$langs->load("other");
+// Load translation files required by the page
+$langs->loadLangs(array("companies","other"));
 
 // Security check
 $socid=0;

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -114,13 +114,12 @@ public function getVersion()
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		// Put here code you want to execute when a Dolibarr business events occurs.
+		// Put here code you want to execute when a Dolibarr business event occurs.
 		// Data and type of action are stored into $object and $action
 		global $langs, $db, $conf;
-		$langs->load("members");
-		$langs->load("users");
-		$langs->load("mails");
-		$langs->load('other');
+
+		// Load translation files required by the page
+        $langs->loadLangs(array("members","other","users","mails"));
 
 		require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 		$stripe = new Stripe($db);

diff --git a/htdocs/don/document.php b/htdocs/don/document.php
@@ -40,9 +40,8 @@
     require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
-$langs->load("other");
-$langs->load("donations");
-$langs->load("companies");
+// Load translation files required by the page
+$langs->loadLangs(array("other","donations","companies"));
 
 $id = GETPOST('id','int');
 $ref = GETPOST('ref', 'alpha');

diff --git a/htdocs/don/list.php b/htdocs/don/list.php
@@ -28,8 +28,8 @@
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-$langs->load("companies");
-$langs->load("donations");
+// Load translation files required by the page
+$langs->loadLangs(array("donations","companies"));
 
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');

diff --git a/htdocs/don/note.php b/htdocs/don/note.php
@@ -35,9 +35,8 @@
     require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
-$langs->load("companies");
-$langs->load("bills");
-$langs->load("donations");
+// Load translation files required by the page
+$langs->loadLangs(array("bills","donations","companies"));
 
 $id=(GETPOST('id','int')?GETPOST('id','int'):GETPOST('facid','int'));  // For backward compatibility
 $ref=GETPOST('ref','alpha');

diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
@@ -28,9 +28,8 @@
 require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 if (! empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-$langs->load('bills');
-$langs->load('banks');
-$langs->load('companies');
+// Load translation files required by the page
+$langs->loadLangs(array("bills","banks","companies"));
 
 // Security check
 $id=GETPOST('rowid')?GETPOST('rowid','int'):GETPOST('id','int');

diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
@@ -47,9 +47,8 @@
 $startyear=$year-1;
 $endyear=$year;
 
-$langs->load("sendings");
-$langs->load("other");
-$langs->load("companies");
+// Load translation files required by the page
+$langs->loadLangs(array("sendings","other","companies"));
 
 
 /*