diff --git a/dev/translation/dynamic_translation_keys.lst b/dev/translation/dynamic_translation_keys.lst index 00a01c617ca..56acbe41810 100644 --- a/dev/translation/dynamic_translation_keys.lst +++ b/dev/translation/dynamic_translation_keys.lst @@ -1020,6 +1020,8 @@ ErrorFeatureNeedJavascript ErrorFicheinterCompanyDoesNotExist ErrorFieldMustHaveXChar ErrorFileAlreadyExists +ErrorInAddAttachmentsImageBaseIsSrcData +ErrorInAddAttachmentsImageBaseOnMedia ErrorInvalidSubtype ErrorInvoiceLoadThirdParty ErrorInvoiceLoadThirdPartyKey diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 323b544c9ba..c517f9dfad4 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -2,11 +2,11 @@ /** * Copyright (C) Dan Potter * Copyright (C) Eric Seigne - * Copyright (C) 2000-2005 Rodolphe Quiedeville - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2015 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2019-2023 Frédéric France + * Copyright (C) 2000-2005 Rodolphe Quiedeville + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004-2015 Laurent Destailleur + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2019-2024 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -297,7 +297,7 @@ class CMailFile $findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias'); if ($findimg < 0) { dol_syslog("CMailFile::CMailfile: Error on findHtmlImages"); - $this->error = 'ErrorInAddAttachementsImageBaseOnMedia'; + $this->error = 'ErrorInAddAttachmentsImageBaseOnMedia'; return; } } @@ -308,7 +308,7 @@ class CMailFile $resultImageData = $this->findHtmlImagesIsSrcData($upload_dir_tmp); if ($resultImageData < 0) { dol_syslog("CMailFile::CMailfile: Error on findHtmlImagesInSrcData code=".$resultImageData." upload_dir_tmp=".$upload_dir_tmp); - $this->error = 'ErrorInAddAttachementsImageBaseOnMedia'; + $this->error = 'ErrorInAddAttachmentsImageBaseIsSrcData'; return; } $findimg += $resultImageData; diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 5d5c4f7f0a7..dec04d18cd5 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -55,6 +55,8 @@ ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (exam ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities. ErrorFieldsRequired=Some required fields have been left blank. ErrorSubjectIsRequired=The email subject is required +ErrorInAddAttachmentsImageBaseOnMedia=Error in add attachments image base in on media +ErrorInAddAttachmentsImageBaseIsSrcData=Error in add attachments image base source is in data ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter safe_mode is enabled on this PHP, check that Dolibarr php files owns to web server user (or group). ErrorNoMailDefinedForThisUser=No mail defined for this user ErrorSetupOfEmailsNotComplete=Setup of emails is not complete