From a88e1ac60541a73ea1e37b3259601c94d2fbc934 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 28 Jan 2020 21:35:03 +0100 Subject: [PATCH] Better translation --- htdocs/adherents/class/adherent.class.php | 4 ++-- htdocs/index.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index dd4706b068e..02ae4af0ff9 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -2305,9 +2305,9 @@ class Adherent extends CommonObject } elseif ($mode == 'shift') { $warning_delay = $conf->adherent->subscription->warning_delay/60/60/24; - $url = DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&statut=-1&filter=outofdate'; + $url = DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&statut=-1'; $label = $langs->trans("MembersListToValid"); - $labelShort = $langs->trans("MemberStatusDraft"); + $labelShort = $langs->trans("ToValidate"); } $response = new WorkboardResponse(); diff --git a/htdocs/index.php b/htdocs/index.php index 228b5870868..c73dbf25ea8 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -458,8 +458,8 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire && !$user->socid) { include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php'; $board = new Adherent($db); - $dashboardlines[$board->element . '_expired'] = $board->load_board($user, 'expired'); $dashboardlines[$board->element . '_shift'] = $board->load_board($user, 'shift'); + $dashboardlines[$board->element . '_expired'] = $board->load_board($user, 'expired'); } // Number of expense reports to approve @@ -565,7 +565,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { 'groupName' => 'Members', 'globalStatsKey' => 'members', 'stats' => - array('member_expired', 'member_shift'), + array('member_shift', 'member_expired'), ), 'ExpenseReport' => array(