From 952ddd748815af3653c5a5119233cd8b73c2c828 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Mon, 19 Apr 2010 16:55:32 +0000 Subject: [PATCH] create lang's file and use new tree --- htdocs/{ => externalsite}/admin/externalsite.php | 5 +++-- htdocs/externalsite/frames.php | 2 ++ htdocs/externalsite/frametop.php | 2 ++ htdocs/externalsite/langs/fr_FR/externalsite.lang | 4 ++++ htdocs/includes/modules/modExternalSite.class.php | 4 +++- 5 files changed, 14 insertions(+), 3 deletions(-) rename htdocs/{ => externalsite}/admin/externalsite.php (97%) create mode 100644 htdocs/externalsite/langs/fr_FR/externalsite.lang diff --git a/htdocs/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php similarity index 97% rename from htdocs/admin/externalsite.php rename to htdocs/externalsite/admin/externalsite.php index b9f0bc2ed2e..5f717b5d15a 100644 --- a/htdocs/admin/externalsite.php +++ b/htdocs/externalsite/admin/externalsite.php @@ -27,7 +27,7 @@ * \version $Id$ */ -require("../main.inc.php"); +require("../../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); @@ -35,8 +35,9 @@ if (!$user->admin) accessforbidden(); -$langs->load("admin"); +//$langs->load("admin"); $langs->load("other"); +$langs->load("@externalsite"); $def = array(); diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php index 321e31d1722..69c11d3e5d9 100644 --- a/htdocs/externalsite/frames.php +++ b/htdocs/externalsite/frames.php @@ -27,6 +27,8 @@ require("../main.inc.php"); +$langs->load("@externalsite"); + if (empty($conf->global->EXTERNALSITE_URL)) { llxHeader(); diff --git a/htdocs/externalsite/frametop.php b/htdocs/externalsite/frametop.php index 49bfa7ef124..5deb5d4cf64 100644 --- a/htdocs/externalsite/frametop.php +++ b/htdocs/externalsite/frametop.php @@ -25,6 +25,8 @@ require ("../main.inc.php"); +$langs->load("@externalsite"); + top_htmlhead("",""); top_menu("","","_top"); diff --git a/htdocs/externalsite/langs/fr_FR/externalsite.lang b/htdocs/externalsite/langs/fr_FR/externalsite.lang new file mode 100644 index 00000000000..ff1fb3112c1 --- /dev/null +++ b/htdocs/externalsite/langs/fr_FR/externalsite.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - fr_FR - externalsite +CHARSET=UTF-8 +ExternalSiteSetup=Configuration du lien vers le site externe +ExternalSiteURL=URL du site externe \ No newline at end of file diff --git a/htdocs/includes/modules/modExternalSite.class.php b/htdocs/includes/modules/modExternalSite.class.php index 74f7f516b19..6cc0e601952 100644 --- a/htdocs/includes/modules/modExternalSite.class.php +++ b/htdocs/includes/modules/modExternalSite.class.php @@ -66,12 +66,14 @@ class modExternalSite extends DolibarrModules $this->special = 1; // Name of png file (without png) used for this module $this->picto='bookmark'; + // Call to inside lang's file + $this->langfiles = array("@externalsite"); // Data directories to create when module is enabled $this->dirs = array(); // Config pages. Put here list of php page names stored in admmin directory used to setup module - $this->config_page_url = array("externalsite.php"); + $this->config_page_url = array("externalsite.php@externalsite"); // Dependencies $this->depends = array(); // List of modules id that must be enabled if this module is enabled