From 19e4e8647634bd94338fdd486ecf7514837a6ca2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 3 Feb 2024 11:43:54 +0100 Subject: [PATCH] Fix duplicate translation key --- htdocs/imports/import.php | 2 +- htdocs/langs/en_US/blockedlog.lang | 2 -- htdocs/langs/en_US/datapolicy.lang | 1 - htdocs/langs/en_US/exports.lang | 1 - htdocs/langs/en_US/ticket.lang | 2 +- htdocs/langs/en_US/website.lang | 2 ++ htdocs/public/webportal/tpl/menu.tpl.php | 4 ++-- htdocs/ticket/class/ticket.class.php | 2 +- 8 files changed, 7 insertions(+), 9 deletions(-) diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 4eb466dbf76..1f20107db80 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/import.lib.php'; // Load translation files required by the page -$langs->loadLangs(array('exports', 'compta', 'errors')); +$langs->loadLangs(array('exports', 'compta', 'errors', 'admin')); // Security check $result = restrictedArea($user, 'import'); diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang index cb66945f888..06ccc6b6b37 100644 --- a/htdocs/langs/en_US/blockedlog.lang +++ b/htdocs/langs/en_US/blockedlog.lang @@ -1,5 +1,4 @@ BlockedLog=Unalterable Logs -Field=Field BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525). Fingerprints=Archived events and fingerprints FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed). @@ -13,7 +12,6 @@ OkCheckFingerprintValidity=Archived log record is valid. The data on this line w OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously. AddedByAuthority=Stored into remote authority NotAddedByAuthorityYet=Not yet stored into remote authority -ShowDetails=Show stored details BlockedLogBillDownload=Customer invoice download BlockedLogBillPreview=Customer invoice preview BlockedlogInfoDialog=Log Details diff --git a/htdocs/langs/en_US/datapolicy.lang b/htdocs/langs/en_US/datapolicy.lang index 6b4413f812b..0597a45db88 100644 --- a/htdocs/langs/en_US/datapolicy.lang +++ b/htdocs/langs/en_US/datapolicy.lang @@ -84,6 +84,5 @@ DATAPOLICY_SEND = Send GDPR email MailSent = Email has been sent # ERROR -ErrorSubjectIsRequired = Error : The subject of email is required. Indicate it in the module setup =Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to send us your choice. NUMBER_MONTH_BEFORE_DELETION = Number of month before deletion diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang index 94ca852beca..29311b3b466 100644 --- a/htdocs/langs/en_US/exports.lang +++ b/htdocs/langs/en_US/exports.lang @@ -62,7 +62,6 @@ ChooseFileToImport=Upload file then click on the %s icon to select file as sourc SourceFileFormat=Source file format FieldsInSourceFile=Fields in source file FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory) -Field=Field NoFields=No fields MoveField=Move field column number %s ExampleOfImportFile=Example_of_import_file diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang index e1493e9c14b..f0e29804344 100644 --- a/htdocs/langs/en_US/ticket.lang +++ b/htdocs/langs/en_US/ticket.lang @@ -69,7 +69,7 @@ Read=Read Assigned=Assigned NeedMoreInformation=Waiting for reporter feedback NeedMoreInformationShort=Waiting for feedback -Answered=Answered +TicketAnswered=Answered Waiting=Waiting SolvedClosed=Solved Deleted=Deleted diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang index fda6c9c16b5..45cb1781e5c 100644 --- a/htdocs/langs/en_US/website.lang +++ b/htdocs/langs/en_US/website.lang @@ -233,3 +233,5 @@ WebPortalMember=Membership WebPortalOrder=Sale Order WebPortalPartnership=Partnership WebPortalPropal=Proposal +WebPortalGroupMenuAdmin=Administration +WebPortalGroupMenuTechnical=System \ No newline at end of file diff --git a/htdocs/public/webportal/tpl/menu.tpl.php b/htdocs/public/webportal/tpl/menu.tpl.php index 5496b14b213..a3226003109 100644 --- a/htdocs/public/webportal/tpl/menu.tpl.php +++ b/htdocs/public/webportal/tpl/menu.tpl.php @@ -92,14 +92,14 @@ $navGroupMenu = array( 'id' => 'administrative', 'rank' => -1, // negative value for undefined, it will be set by the min item rank for this group 'url' => '', - 'name' => $langs->trans('GroupMenuAdministrative'), + 'name' => $langs->trans('WebPortalGroupMenuAdmin'), 'children' => array() ), 'technical' => array( 'id' => 'technical', 'rank' => -1, // negative value for undefined, it will be set by the min item rank for this group 'url' => '', - 'name' => $langs->trans('GroupMenuTechnical'), + 'name' => $langs->trans('WebPortalGroupMenuTechnical'), 'children' => array() ), ); diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php index b17e0f26286..802583e7ac2 100644 --- a/htdocs/ticket/class/ticket.class.php +++ b/htdocs/ticket/class/ticket.class.php @@ -344,7 +344,7 @@ class Ticket extends CommonObject 'email_date' => array('type'=>'datetime', 'label'=>'EmailDate', 'visible'=>-2, 'enabled'=>1, 'position'=>541), 'progress' => array('type'=>'integer', 'label'=>'Progression', 'visible'=>-1, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'css'=>'right', 'help'=>"", 'isameasure'=>2, 'csslist'=>'width50'), 'resolution' => array('type'=>'integer', 'label'=>'Resolution', 'visible'=>-1, 'enabled'=>'getDolGlobalString("TICKET_ENABLE_RESOLUTION")', 'position'=>550, 'notnull'=>1), - 'fk_statut' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>600, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array(0 => 'Unread', 1 => 'Read', 3 => 'Answered', 4 => 'Assigned', 5 => 'InProgress', 6 => 'Waiting', 8 => 'SolvedClosed', 9 => 'Deleted')), + 'fk_statut' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>600, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array(0 => 'Unread', 1 => 'Read', 3 => 'TicketAnswered', 4 => 'Assigned', 5 => 'InProgress', 6 => 'Waiting', 8 => 'SolvedClosed', 9 => 'Deleted')), 'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900), ); // END MODULEBUILDER PROPERTIES