Restore lang files into global lang directory. Usage of lang into modules directory must be used only for external modules to be self-dependent but must be kept for dolibarr core feature into unique htdocs/langs directory as this make working on translation a big headache and break a lot of automated translation tools.

This commit is contained in:
Laurent Destailleur 2010-05-02 17:05:07 +00:00
parent 64cc3f70e6
commit 9db9f23d71
62 changed files with 5727 additions and 5727 deletions

View File

@ -31,7 +31,7 @@ require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("members@adherents"); $langs->load("members");
if (!$user->admin) if (!$user->admin)
accessforbidden(); accessforbidden();

View File

@ -35,7 +35,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("bills"); $langs->load("bills");
$langs->load("members@adherents"); $langs->load("members");
$langs->load("users"); $langs->load("users");
$langs->load("mails"); $langs->load("mails");

View File

@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");
$langs->load("members@adherents"); $langs->load("members");
$sortorder=$_GET["sortorder"]; $sortorder=$_GET["sortorder"];
$sortfield=$_GET["sortfield"]; $sortfield=$_GET["sortfield"];

View File

@ -39,7 +39,7 @@ require_once(DOL_DOCUMENT_ROOT."/html.formcompany.class.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("bills"); $langs->load("bills");
$langs->load("members@adherents"); $langs->load("members");
$langs->load("users"); $langs->load("users");
// If socid provided by ajax company selector // If socid provided by ajax company selector

View File

@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("bills"); $langs->load("bills");
$langs->load("members@adherents"); $langs->load("members");
$langs->load("users"); $langs->load("users");
$adh = new Adherent($db); $adh = new Adherent($db);

View File

@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("members@adherents"); $langs->load("members");
/* /*

View File

@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("bills"); $langs->load("bills");
$langs->load("members@adherents"); $langs->load("members");
$langs->load("users"); $langs->load("users");
if (!$user->rights->adherent->lire) if (!$user->rights->adherent->lire)

View File

@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("bills"); $langs->load("bills");
$langs->load("members@adherents"); $langs->load("members");
$langs->load("users"); $langs->load("users");
if (!$user->rights->adherent->lire) if (!$user->rights->adherent->lire)

View File

@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
$langs->load("companies"); $langs->load("companies");
$langs->load("members@adherents"); $langs->load("members");
$langs->load("ldap"); $langs->load("ldap");
$langs->load("admin"); $langs->load("admin");

View File

@ -29,7 +29,7 @@ require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
$langs->load("members@adherents"); $langs->load("members");
$langs->load("companies"); $langs->load("companies");
$sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"]; $sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];

View File

@ -32,7 +32,7 @@ $action=isset($_GET["action"])?$_GET["action"]:(isset($_POST["action"])?$_POST["
$id=isset($_GET["id"])?$_GET["id"]:(isset($_POST["id"])?$_POST["id"]:""); $id=isset($_GET["id"])?$_GET["id"]:(isset($_POST["id"])?$_POST["id"]:"");
$langs->load("companies"); $langs->load("companies");
$langs->load("members@adherents"); $langs->load("members");
$langs->load("bills"); $langs->load("bills");
if (!$user->rights->adherent->lire) if (!$user->rights->adherent->lire)

View File

@ -28,7 +28,7 @@
require("../main.inc.php"); require("../main.inc.php");
require(DOL_DOCUMENT_ROOT."/adherents/class/adherent_options.class.php"); require(DOL_DOCUMENT_ROOT."/adherents/class/adherent_options.class.php");
$langs->load("members@adherents"); $langs->load("members");
$adho = new AdherentOptions($db); $adho = new AdherentOptions($db);
$form = new Form($db); $form = new Form($db);

View File

@ -29,7 +29,7 @@ require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
$langs->load("members@adherents"); $langs->load("members");
$rowid=isset($_GET["rowid"])?$_GET["rowid"]:$_POST["rowid"]; $rowid=isset($_GET["rowid"])?$_GET["rowid"]:$_POST["rowid"];

View File

@ -70,7 +70,7 @@ class modAdherent extends DolibarrModules
//------------ //------------
$this->depends = array(); $this->depends = array();
$this->requiredby = array(); $this->requiredby = array();
$this->langfiles = array("members@adherents","companies"); $this->langfiles = array("members","companies");
// Constantes // Constantes
//----------- //-----------

View File

@ -73,7 +73,7 @@ class modProduct extends DolibarrModules
// Config pages // Config pages
$this->config_page_url = array("produit.php@product"); $this->config_page_url = array("produit.php@product");
$this->langfiles = array("products@product","companies","stocks","bills"); $this->langfiles = array("products","companies","stocks","bills");
// Constants // Constants
$this->const = array(); $this->const = array();

View File

@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php");
$langs->load("admin"); $langs->load("admin");
$langs->load("propal"); $langs->load("propal");
$langs->load("products@product"); $langs->load("products");
// Security check // Security check
if (!$user->admin) if (!$user->admin)

View File

@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php"); require_once(DOL_DOCUMENT_ROOT."/includes/barcode/html.formbarcode.class.php");
$langs->load("products@product"); $langs->load("products");
$langs->load("bills"); $langs->load("bills");
// Security check // Security check

View File

@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
$langs->load("other"); $langs->load("other");
$langs->load("products@product"); $langs->load("products");
$action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action']; $action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action'];

View File

@ -40,7 +40,7 @@ require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
$langs->load("bills"); $langs->load("bills");
$langs->load("other"); $langs->load("other");
$langs->load("stocks"); $langs->load("stocks");
$langs->load("products@product"); $langs->load("products");
// Security check // Security check
if (isset($_GET["id"]) || isset($_GET["ref"])) if (isset($_GET["id"]) || isset($_GET["ref"]))

View File

@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php"; require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.product.class.php";
$langs->load("products@product"); $langs->load("products");
$langs->load("suppliers"); $langs->load("suppliers");
$langs->load("bills"); $langs->load("bills");

View File

@ -39,7 +39,7 @@ else $result=restrictedArea($user,'produit|service',$id,'service','','',$fieldid
$product_static = new Product($db); $product_static = new Product($db);
$langs->load("products@product"); $langs->load("products");
/* /*

View File

@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
require_once(DOL_DOCUMENT_ROOT."/html.formother.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formother.class.php");
if ($conf->categorie->enabled) require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); if ($conf->categorie->enabled) require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php");
$langs->load("products@product"); $langs->load("products");
$type=trim(isset($_GET["type"])?$_GET["type"]:$_POST["type"]); $type=trim(isset($_GET["type"])?$_GET["type"]:$_POST["type"]);

View File

@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
$langs->load("products@product"); $langs->load("products");
$langs->load("bills"); $langs->load("bills");
// Security check // Security check

View File

@ -31,7 +31,7 @@ require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
$langs->load("products@product"); $langs->load("products");
$langs->load("bills"); $langs->load("bills");
// Security check // Security check

View File

@ -29,7 +29,7 @@ require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php'); require_once(DOL_DOCUMENT_ROOT.'/product/class/product.class.php');
require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php"); require_once(DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php");
$langs->load("products@product"); $langs->load("products");
$langs->load("stocks"); $langs->load("stocks");
// Security check // Security check

View File

@ -32,7 +32,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formadmin.class.php");
$langs->load("products@product"); $langs->load("products");
$langs->load("languages"); $langs->load("languages");
// Security check // Security check