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

Fix trans

Browse Source
This commit is contained in:
Laurent Destailleur 2021-12-10 12:36:51 +01:00
parent 8cdc5726a0
commit 9fbe0dee9b
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/security.lib.php
View File

@ -909,9 +909,11 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
$reshook = $hookmanager->executeHooks('getAccessForbiddenMessage', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks $reshook = $hookmanager->executeHooks('getAccessForbiddenMessage', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
print $hookmanager->resPrint; print $hookmanager->resPrint;
if (empty($reshook)) { if (empty($reshook)) {
$langs->loadLangs(array("errors"));
if ($user->login) { if ($user->login) {
print $langs->trans("CurrentLogin").': <span class="error">'.$user->login.'</span><br>'; print $langs->trans("CurrentLogin").': <span class="error">'.$user->login.'</span><br>';
print $langs->trans("ErrorForbidden2", $langs->transnoentitiesnoconv("Home"), $langs->transnoentitiesnoconv("Users")); print $langs->trans("ErrorForbidden2", $langs->transnoentitiesnoconv("Home"), $langs->transnoentitiesnoconv("Users"));
print $langs->trans("ErrorForbidden4");
} else { } else {
print $langs->trans("ErrorForbidden3"); print $langs->trans("ErrorForbidden3");
} }

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

@ -111,6 +111,7 @@ ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEX
ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user. ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s. ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...). ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display. ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
ErrorRecordAlreadyExists=Record already exists ErrorRecordAlreadyExists=Record already exists
ErrorLabelAlreadyExists=This label already exists ErrorLabelAlreadyExists=This label already exists

2
htdocs/main.inc.php
View File

@ -1166,7 +1166,7 @@ if (!defined('NOLOGIN')) {
// Check if user is active // Check if user is active
if ($user->statut < 1) { if ($user->statut < 1) {
// If not active, we refuse the user // If not active, we refuse the user
$langs->load("other"); $langs->loadLangs(array("errors", "other"));
dol_syslog("Authentication KO as login is disabled", LOG_NOTICE); dol_syslog("Authentication KO as login is disabled", LOG_NOTICE);
accessforbidden($langs->trans("ErrorLoginDisabled")); accessforbidden($langs->trans("ErrorLoginDisabled"));
exit; exit;