Merge pull request #4654 from aspangaro/3.9-p12

Fixed: Members - Problem of tab & missing language file
Dolibarr · Feb 20, 2016 · 12e6b52 · 12e6b52
2 parents 0faebc2 + d77a8bd
commit 12e6b52
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2002-2003	Jean-Louis Bergamo		<jlb@j1b.org>
  * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2015       Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015-2016  Alexandre Spangaro      <aspangaro.dolibarr@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@
 $langs->load("members");
 $langs->load("users");
 $langs->load("mails");
-
+$langs->load('other');
 
 $action=GETPOST('action','alpha');
 $confirm=GETPOST('confirm','alpha');

diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2006-2015  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2015       Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
+ * Copyright (C) 2015-2016  Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -91,7 +91,7 @@ function member_prepare_head(Adherent $object)
     $head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id;
     $head[$h][1] = $langs->trans('Documents');
     if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
-    $head[$h][2] = 'documents';
+    $head[$h][2] = 'document';
     $h++;
 
     $head[$h][0] = DOL_URL_ROOT.'/adherents/info.php?id='.$object->id;