From a2ae9b9cfc415390f3697c2eb0eda6f41eabd702 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 21 Dec 2015 00:47:44 +0100 Subject: [PATCH] Fix forget password page must have a different title then login page Fix Missing translations --- htdocs/comm/propal/stats/index.php | 1 + htdocs/compta/deplacement/stats/index.php | 1 + htdocs/core/tpl/passwordforgotten.tpl.php | 2 +- htdocs/don/stats/index.php | 1 + htdocs/expedition/stats/index.php | 1 + htdocs/expensereport/stats/index.php | 1 + htdocs/projet/stats/index.php | 7 +++++++ 7 files changed, 13 insertions(+), 1 deletion(-) diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index f757a224266..04529dd2d9e 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -62,6 +62,7 @@ $formpropal=new FormPropal($db); $langs->load('propal'); $langs->load('other'); +$langs->load("companies"); llxHeader('', $langs->trans("ProposalsStatistics")); diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php index 531c05401ab..9ffbe111ea7 100644 --- a/htdocs/compta/deplacement/stats/index.php +++ b/htdocs/compta/deplacement/stats/index.php @@ -28,6 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacementstats.class.php'; $langs->load("trips"); +$langs->load("companies"); $WIDTH=DolGraph::getDefaultGraphSizeForStats('width'); $HEIGHT=DolGraph::getDefaultGraphSizeForStats('height'); diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index 2b201ae2f68..ea03749e0c3 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -28,7 +28,7 @@ if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1; // If we force to use jmobile, then we reenable javascript if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1; -print top_htmlhead('',$langs->trans('Login').' '.$title); +print top_htmlhead('',$langs->trans('SendNewPassword')); ?> diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php index bf773fcab62..8cff8a88d09 100644 --- a/htdocs/don/stats/index.php +++ b/htdocs/don/stats/index.php @@ -49,6 +49,7 @@ $endyear=$year; $langs->load("sendings"); $langs->load("other"); +$langs->load("companies"); /* diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php index f0f5198bee5..983517e7ea2 100644 --- a/htdocs/expedition/stats/index.php +++ b/htdocs/expedition/stats/index.php @@ -48,6 +48,7 @@ $endyear=$year; $langs->load("sendings"); $langs->load("other"); +$langs->load("companies"); /* diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php index 80965deebfa..7eb05c65b67 100644 --- a/htdocs/expensereport/stats/index.php +++ b/htdocs/expensereport/stats/index.php @@ -28,6 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereportstats.class.php'; $langs->load("trips"); +$langs->load("companies"); $WIDTH=DolGraph::getDefaultGraphSizeForStats('width'); $HEIGHT=DolGraph::getDefaultGraphSizeForStats('height'); diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php index d28d7d6f14a..d57baeab088 100644 --- a/htdocs/projet/stats/index.php +++ b/htdocs/projet/stats/index.php @@ -16,6 +16,12 @@ * along with this program. If not, see . */ +/** + * \file htdocs/projet/stats/index.php + * \ingroup project + * \brief Page for project statistics + */ + require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; @@ -43,6 +49,7 @@ $year = GETPOST('year')>0?GETPOST('year'):$nowyear; $startyear=$year-1; $endyear=$year; +$langs->load('companies'); $langs->load('projects');