fix usage of recipient translation (#35437)
* fix usage of recipient translation * fix usage of recipient translation * fix usage of recipient translation
This commit is contained in:
parent
17d3a35a51
commit
a7cebb70a9
7 changed files with 18 additions and 10 deletions
|
|
@ -4,7 +4,7 @@
|
|||
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es>
|
||||
* Copyright (C) 2016 Jonathan TISSEAU <jonathan.tisseau@86dev.fr>
|
||||
* Copyright (C) 2023 Anthony Berton <anthony.berton@bb2a.fr>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
|
||||
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -68,12 +68,12 @@ $substitutionarrayfortest = array(
|
|||
'__SENDEREMAIL_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''), // Done into actions_sendmails
|
||||
//'__ID__' => 'RecipientID',
|
||||
//'__EMAIL__' => 'RecipientEMail', // Done into actions_sendmails
|
||||
'__LASTNAME__' => $langs->trans("Lastname").' ('.$langs->trans("Recipient").')',
|
||||
'__FIRSTNAME__' => $langs->trans("Firstname").' ('.$langs->trans("Recipient").')',
|
||||
//'__ADDRESS__'=> $langs->trans("Address").' ('.$langs->trans("Recipient").')',
|
||||
//'__ZIP__'=> $langs->trans("Zip").' ('.$langs->trans("Recipient").')',
|
||||
//'__TOWN_'=> $langs->trans("Town").' ('.$langs->trans("Recipient").')',
|
||||
//'__COUNTRY__'=> $langs->trans("Country").' ('.$langs->trans("Recipient").')',
|
||||
'__LASTNAME__' => $langs->trans("Lastname").' ('.$langs->trans("MailRecipient").')',
|
||||
'__FIRSTNAME__' => $langs->trans("Firstname").' ('.$langs->trans("MailRecipient").')',
|
||||
//'__ADDRESS__'=> $langs->trans("Address").' ('.$langs->trans("MailRecipient").')',
|
||||
//'__ZIP__'=> $langs->trans("Zip").' ('.$langs->trans("MailRecipient").')',
|
||||
//'__TOWN_'=> $langs->trans("Town").' ('.$langs->trans("MailRecipient").')',
|
||||
//'__COUNTRY__'=> $langs->trans("Country").' ('.$langs->trans("MailRecipient").')',
|
||||
'__DOL_MAIN_URL_ROOT__' => DOL_MAIN_URL_ROOT,
|
||||
'__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag=undefinedtag&securitykey='.dol_hash(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')."-undefinedtag", 'md5').'" width="1" height="1" style="width:1px;height:1px" border="0" />',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -248,7 +248,7 @@ if (!$error && $massaction == 'confirm_presend') {
|
|||
}
|
||||
if (!trim(GETPOST('sendto', 'alphawithlgt')) && count($receiver) == 0 && count($listofobjectthirdparties) == 1) { // if only one recipient, receiver is mandatory
|
||||
$error++;
|
||||
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Recipient")), null, 'warnings');
|
||||
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MailRecipient")), null, 'warnings');
|
||||
$massaction = 'presend';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -346,6 +346,12 @@ class Conf extends stdClass
|
|||
* @var stdClass
|
||||
*/
|
||||
public $productbatch;
|
||||
|
||||
/**
|
||||
* @var stdClass
|
||||
*/
|
||||
public $api;
|
||||
|
||||
/**
|
||||
* @var ?stdClass
|
||||
* @deprecated Use project
|
||||
|
|
|
|||
|
|
@ -15011,6 +15011,7 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '', $us
|
|||
$className = $element_prop['classname'];
|
||||
$objecttmp = new $className($db);
|
||||
'@phan-var-force CommonObject $objecttmp';
|
||||
/** @var CommonObject $objecttmp */
|
||||
|
||||
if ($element_id > 0 || !empty($element_ref)) {
|
||||
$ret = $objecttmp->fetch($element_id, $element_ref);
|
||||
|
|
|
|||
|
|
@ -967,6 +967,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
|
|||
|
||||
// Force the typing at this point to get useful analysis below:
|
||||
'@phan-var-force array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,positionfull:int|string,showtopmenuinframe:int,level?:int,prefix:string}> $menu_array';
|
||||
/** @var array<array{rowid:string,fk_menu:string,langs:string,enabled:int<0,2>,type:string,fk_mainmenu:string,fk_leftmenu:string,url:string,titre:string,perms:string,target:string,mainmenu:string,leftmenu:string,position:int,positionfull:int|string,showtopmenuinframe:int,level?:int,prefix:string}> $menu_array */
|
||||
|
||||
|
||||
// Show menu
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ ToAndDate=To___________________________________ on ____/_____/__________
|
|||
GoodStatusDeclaration=Have received the goods above in good condition,
|
||||
Deliverer=Deliverer:
|
||||
Sender=Sender
|
||||
Recipient=Recipient
|
||||
Recipient=Delivery recipient
|
||||
ErrorStockIsNotEnough=There's not enough stock
|
||||
Shippable=Shippable
|
||||
NonShippable=Not Shippable
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ ToAndDate=A___________________________________ le ____/_____/__________
|
|||
GoodStatusDeclaration=Déclare avoir reçu les marchandises ci-dessus en bon état,
|
||||
Deliverer=Livreur(s) :
|
||||
Sender=Émetteur
|
||||
Recipient=Email fixe cible destinataires
|
||||
Recipient=Destinataire
|
||||
ErrorStockIsNotEnough=Le stock est insuffisant
|
||||
Shippable=Expédiable
|
||||
NonShippable=Non expédiable
|
||||
|
|
|
|||
Loading…
Reference in a new issue