Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

fix usage of recipient translation (#35437)

Browse Source 
* fix usage of recipient translation

* fix usage of recipient translation

* fix usage of recipient translation
This commit is contained in:
Frédéric FRANCE
2025-09-22 20:30:23 +02:00
committed by GitHub
parent 17d3a35a51
commit a7cebb70a9
7 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/admin/mails.php
View File

@@ -4,7 +4,7 @@
* Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2016 Jonathan TISSEAU <jonathan.tisseau@86dev.fr> * Copyright (C) 2016 Jonathan TISSEAU <jonathan.tisseau@86dev.fr>
* Copyright (C) 2023 Anthony Berton <anthony.berton@bb2a.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> * Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 '__SENDEREMAIL_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''), // Done into actions_sendmails
//'__ID__' => 'RecipientID', //'__ID__' => 'RecipientID',
//'__EMAIL__' => 'RecipientEMail', // Done into actions_sendmails //'__EMAIL__' => 'RecipientEMail', // Done into actions_sendmails
'__LASTNAME__' => $langs->trans("Lastname").' ('.$langs->trans("Recipient").')', '__LASTNAME__' => $langs->trans("Lastname").' ('.$langs->trans("MailRecipient").')',
'__FIRSTNAME__' => $langs->trans("Firstname").' ('.$langs->trans("Recipient").')', '__FIRSTNAME__' => $langs->trans("Firstname").' ('.$langs->trans("MailRecipient").')',
//'__ADDRESS__'=> $langs->trans("Address").' ('.$langs->trans("Recipient").')', //'__ADDRESS__'=> $langs->trans("Address").' ('.$langs->trans("MailRecipient").')',
//'__ZIP__'=> $langs->trans("Zip").' ('.$langs->trans("Recipient").')', //'__ZIP__'=> $langs->trans("Zip").' ('.$langs->trans("MailRecipient").')',
//'__TOWN_'=> $langs->trans("Town").' ('.$langs->trans("Recipient").')', //'__TOWN_'=> $langs->trans("Town").' ('.$langs->trans("MailRecipient").')',
//'__COUNTRY__'=> $langs->trans("Country").' ('.$langs->trans("Recipient").')', //'__COUNTRY__'=> $langs->trans("Country").' ('.$langs->trans("MailRecipient").')',
'__DOL_MAIN_URL_ROOT__' => DOL_MAIN_URL_ROOT, '__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" />', '__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" />',
); );

2
htdocs/core/actions_massactions.inc.php
View File

@@ -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 if (!trim(GETPOST('sendto', 'alphawithlgt')) && count($receiver) == 0 && count($listofobjectthirdparties) == 1) { // if only one recipient, receiver is mandatory
$error++; $error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Recipient")), null, 'warnings'); setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MailRecipient")), null, 'warnings');
$massaction = 'presend'; $massaction = 'presend';
} }

6
htdocs/core/class/conf.class.php
View File

@@ -346,6 +346,12 @@ class Conf extends stdClass
* @var stdClass * @var stdClass
*/ */
public $productbatch; public $productbatch;
/**
* @var stdClass
*/
public $api;
/** /**
* @var ?stdClass * @var ?stdClass
* @deprecated Use project * @deprecated Use project

1
htdocs/core/lib/functions.lib.php
View File

@@ -15011,6 +15011,7 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '', $us
$className = $element_prop['classname']; $className = $element_prop['classname'];
$objecttmp = new $className($db); $objecttmp = new $className($db);
'@phan-var-force CommonObject $objecttmp'; '@phan-var-force CommonObject $objecttmp';
/** @var CommonObject $objecttmp */
if ($element_id > 0 || !empty($element_ref)) { if ($element_id > 0 || !empty($element_ref)) {
$ret = $objecttmp->fetch($element_id, $element_ref); $ret = $objecttmp->fetch($element_id, $element_ref);

1
htdocs/core/menus/standard/eldy.lib.php
View File

@@ -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: // 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'; '@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 // Show menu

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

@@ -100,7 +100,7 @@ ToAndDate=To___________________________________ on ____/_____/__________
GoodStatusDeclaration=Have received the goods above in good condition, GoodStatusDeclaration=Have received the goods above in good condition,
Deliverer=Deliverer: Deliverer=Deliverer:
Sender=Sender Sender=Sender
Recipient=Recipient Recipient=Delivery recipient
ErrorStockIsNotEnough=There's not enough stock ErrorStockIsNotEnough=There's not enough stock
Shippable=Shippable Shippable=Shippable
NonShippable=Not Shippable NonShippable=Not Shippable

2
htdocs/langs/fr_FR/sendings.lang
View File

@@ -99,7 +99,7 @@ ToAndDate=A___________________________________ le ____/_____/__________
GoodStatusDeclaration=Déclare avoir reçu les marchandises ci-dessus en bon état, GoodStatusDeclaration=Déclare avoir reçu les marchandises ci-dessus en bon état,
Deliverer=Livreur(s) : Deliverer=Livreur(s) :
Sender=Émetteur Sender=Émetteur
Recipient=Email fixe cible destinataires Recipient=Destinataire
ErrorStockIsNotEnough=Le stock est insuffisant ErrorStockIsNotEnough=Le stock est insuffisant
Shippable=Expédiable Shippable=Expédiable
NonShippable=Non expédiable NonShippable=Non expédiable