lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: restore logout and logged translation key

Browse Source
This commit is contained in:
Laurent Destailleur 2016-07-27 17:00:14 +02:00
parent eb06f56164
commit 4d1885eb59
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/translation/sanity_check_en_langfiles.php
View File

@ -343,7 +343,7 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a
} }
//$search = '\'trans("'.$value.'")\''; //$search = '\'trans("'.$value.'")\'';
$search = '-e "\''.$value.'\'" -e \'"'.$value.'"\' -e "('.$value.')"'; $search = '-e "\''.$value.'\'" -e \'"'.$value.'"\' -e "('.$value.')" -e "('.$value.',"';
$string = 'grep -R -m 1 -F --exclude=includes/* --include=*.php '.$search.' '.$htdocs.'* '.$scripts.'*'; $string = 'grep -R -m 1 -F --exclude=includes/* --include=*.php '.$search.' '.$htdocs.'* '.$scripts.'*';
//print $string."<br>\n"; //print $string."<br>\n";
exec($string,$output); exec($string,$output);

4
htdocs/core/triggers/interface_20_all_Logevents.class.php
View File

@ -63,7 +63,8 @@ class InterfaceLogevents extends DolibarrTriggers
if ($action == 'USER_LOGIN') if ($action == 'USER_LOGIN')
{ {
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$langs->load("users");
// Initialisation donnees (date,duree,texte,desc) // Initialisation donnees (date,duree,texte,desc)
$text="(UserLogged,".$object->login.")"; $text="(UserLogged,".$object->login.")";
$text.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg); $text.=(empty($object->trigger_mesg)?'':' - '.$object->trigger_mesg);
@ -82,6 +83,7 @@ class InterfaceLogevents extends DolibarrTriggers
{ {
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$langs->load("users");
// Initialisation donnees (date,duree,texte,desc) // Initialisation donnees (date,duree,texte,desc)
$text="(UserLogoff,".$object->login.")"; $text="(UserLogoff,".$object->login.")";
$desc="(UserLogoff,".$object->login.")"; $desc="(UserLogoff,".$object->login.")";

1
htdocs/langs/en_US/ldap.lang
View File

@ -15,6 +15,7 @@ LDAPFieldFirstSubscriptionDate=First subscription date
LDAPFieldFirstSubscriptionAmount=First subscription amount LDAPFieldFirstSubscriptionAmount=First subscription amount
LDAPFieldLastSubscriptionDate=Last subscription date LDAPFieldLastSubscriptionDate=Last subscription date
LDAPFieldLastSubscriptionAmount=Last subscription amount LDAPFieldLastSubscriptionAmount=Last subscription amount
LDAPFieldSkype=Skype id
UserSynchronized=User synchronized UserSynchronized=User synchronized
GroupSynchronized=Group synchronized GroupSynchronized=Group synchronized
MemberSynchronized=Member synchronized MemberSynchronized=Member synchronized

2
htdocs/langs/en_US/users.lang
View File

@ -100,3 +100,5 @@ WeeklyHours=Weekly hours
ColorUser=Color of the user ColorUser=Color of the user
DisabledInMonoUserMode=Disabled in maintenance mode DisabledInMonoUserMode=Disabled in maintenance mode
UserAccountancyCode=User accountancy code UserAccountancyCode=User accountancy code
UserLogoff=User logout
UserLogged=User logged