From b78f85b9597e62c653c4e5c5991f01a912637d3b Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Mon, 19 Apr 2021 18:08:36 +0200 Subject: [PATCH 1/2] Update document.php $title / $help_url " " => ' ' add DE:Modul_Projekte --- htdocs/projet/document.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index a069e7bf162..e9a088537b1 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -37,7 +37,7 @@ $action = GETPOST('action', 'alpha'); $confirm = GETPOST('confirm', 'alpha'); $id = GETPOST('id', 'int'); $ref = GETPOST('ref', 'alpha'); -$mine = (GETPOST('mode', 'alpha') == 'mine' ? 1 : 0); +$mine = (GETPOST('mode', 'alpha') == 'mine' ? 1 : 0); //if (! $user->rights->projet->all->lire) $mine=1; // Special for projects // Security check @@ -57,10 +57,10 @@ if ($id > 0 || !empty($ref)) { } // Get parameters -$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; -$sortfield = GETPOST("sortfield", 'alpha'); -$sortorder = GETPOST("sortorder", 'alpha'); -$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); +$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; +$sortfield = GETPOST("sortfield", 'alpha'); +$sortorder = GETPOST("sortorder", 'alpha'); +$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1 @@ -95,11 +95,13 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; * View */ -$title = $langs->trans("Project").' - '.$langs->trans("Document").' - '.$object->ref.' '.$object->name; -if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) { - $title = $object->ref.' '.$object->name.' - '.$langs->trans("Document"); +$title = $langs->trans('Project').' - '.$langs->trans('Document').' - '.$object->ref.' '.$object->name; +if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) +{ + $title = $object->ref.' '.$object->name.' - '.$langs->trans('Document'); } -$help_url = "EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos"; + +$help_url = 'EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos|DE:Modul_Projekte'; llxHeader('', $title, $help_url); From 8db9b5bb22d739ec1f6d2a3f3d6ba326a4f7db21 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Mon, 19 Apr 2021 16:10:55 +0000 Subject: [PATCH 2/2] Fixing style errors. --- htdocs/projet/document.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index e9a088537b1..3f9ec04d437 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -96,8 +96,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; */ $title = $langs->trans('Project').' - '.$langs->trans('Document').' - '.$object->ref.' '.$object->name; -if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) -{ +if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) { $title = $object->ref.' '.$object->name.' - '.$langs->trans('Document'); }