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

Merge pull request #32319 from Treenity/patch-1

Browse Source 
NEW: Enhance i18n regex patterns to support underscores in keys
This commit is contained in:
Laurent Destailleur
2024-12-13 15:48:15 +01:00
committed by GitHub
parent 416d86bddb 14a341fb8c
commit a90d16b2a6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/translate.class.php
View File

@@ -629,17 +629,17 @@ class Translate
$newstr = $key;
$reg = array();
if (preg_match('/^Civility([0-9A-Z]+)$/i', $key, $reg)) {
if (preg_match('/^Civility([0-9A-Z_]+)$/i', $key, $reg)) {
$newstr = $this->getLabelFromKey($db, $reg[1], 'c_civility', 'code', 'label');
} elseif (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i', $key, $reg)) {
$newstr = $this->getLabelFromKey($db, $reg[1], 'c_currencies', 'code_iso', 'label');
} elseif (preg_match('/^SendingMethod([0-9A-Z]+)$/i', $key, $reg)) {
} elseif (preg_match('/^SendingMethod([0-9A-Z_]+)$/i', $key, $reg)) {
$newstr = $this->getLabelFromKey($db, $reg[1], 'c_shipment_mode', 'code', 'libelle');
} elseif (preg_match('/^PaymentType(?:Short)?([0-9A-Z]+)$/i', $key, $reg)) {
} elseif (preg_match('/^PaymentType(?:Short)?([0-9A-Z_]+)$/i', $key, $reg)) {
$newstr = $this->getLabelFromKey($db, $reg[1], 'c_paiement', 'code', 'libelle', '', 1);
} elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i', $key, $reg)) {
} elseif (preg_match('/^OppStatus([0-9A-Z_]+)$/i', $key, $reg)) {
$newstr = $this->getLabelFromKey($db, $reg[1], 'c_lead_status', 'code', 'label');
} elseif (preg_match('/^OrderSource([0-9A-Z]+)$/i', $key, $reg)) {
} elseif (preg_match('/^OrderSource([0-9A-Z_]+)$/i', $key, $reg)) {
// TODO OrderSourceX must be replaced with content of table llx_c_input_reason or llx_c_input_method
//$newstr=$this->getLabelFromKey($db,$reg[1],'llx_c_input_reason','code','label');
}