Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Qual: Fix translation keys.

Browse Source 
# Qual: Fix translation keys

Modify some translation keys so that they correspond to each other,
use an existing key or fix the contents as it's not translated yet.
This commit is contained in:
MDW 2024-01-23 23:25:15 +01:00
parent ce21af7b6c
commit 565fe09cb5
8 changed files with 71 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/admin/security.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2004-2022 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2007 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2013-2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -484,11 +485,11 @@ print '</form>';
print '<br>';
if (GETPOST('info', 'int') > 0) {
if (GETPOSTINT('info') > 0) {
if (function_exists('password_hash')) {
print $langs->trans("Note: The function password_hash exists on your PHP")."<br>\n";
} else {
print $langs->trans("Note: The function password_hash does not exists on your PHP")."<br>\n";
print $langs->trans("Note: The function password_hash does not exist on your PHP")."<br>\n";
}
print 'MAIN_SECURITY_HASH_ALGO = '.getDolGlobalString('MAIN_SECURITY_HASH_ALGO')."<br>\n";
print 'MAIN_SECURITY_SALT = '.getDolGlobalString('MAIN_SECURITY_SALT')."<br>\n";

4
htdocs/contrat/class/contrat.class.php
View File

@ -12,6 +12,7 @@
* Copyright (C) 2018-2023 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2015-2018 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2024 William Mead <william.mead@manchenumerique.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -1157,7 +1158,8 @@ class Contrat extends CommonObject
return -2;
}
} else {
$this->error = $langs->trans("UnknownError: ".$this->db->error()." -", LOG_DEBUG);
$this->error = $langs->trans("UnknownError").": ".$this->db->error();
dol_syslog(get_class($this)."::create - 10 - ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;

79
htdocs/core/class/commonobject.class.php
View File

@ -17,6 +17,7 @@
* Copyright (C) 2023 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
* Copyright (C) 2021 Grégory Blémand <gregory.blemand@atm-consulting.fr>
* Copyright (C) 2023 Lenin Rivas <lenin.rivas777@gmail.com>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -6459,12 +6460,12 @@ abstract class CommonObject
//dol_syslog("double value"." on ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
$new_array_options[$key] = $value;
break;
/*case 'select': // Not required, we chose value='0' for undefined values
if ($value=='-1')
{
$this->array_options[$key] = null;
}
break;*/
/*case 'select': // Not required, we chose value='0' for undefined values
if ($value=='-1')
{
$this->array_options[$key] = null;
}
break;*/
case 'password':
$algo = '';
if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options'])) {
@ -6877,14 +6878,14 @@ abstract class CommonObject
$this->array_options["options_".$key] = $new_array_options["options_".$key];
break;
/*case 'select': // Not required, we chose value='0' for undefined values
if ($value=='-1')
{
$new_array_options["options_".$key] = $value;
/*case 'select': // Not required, we chose value='0' for undefined values
if ($value=='-1')
{
$new_array_options["options_".$key] = $value;
$this->array_options["options_".$key] = $new_array_options["options_".$key];
}
break;*/
$this->array_options["options_".$key] = $new_array_options["options_".$key];
}
break;*/
case 'password':
$algo = '';
if ($this->array_options["options_".$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options'])) {
@ -6969,35 +6970,35 @@ abstract class CommonObject
$this->array_options["options_".$key] = $new_array_options["options_".$key];
}
break;
/*
case 'link':
$param_list = array_keys($attributeParam['options']);
// 0 : ObjectName
// 1 : classPath
$InfoFieldList = explode(":", $param_list[0]);
dol_include_once($InfoFieldList[1]);
if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))
{
if ($value == '-1') // -1 is key for no defined in combo list of objects
/*
case 'link':
$param_list = array_keys($attributeParam['options']);
// 0 : ObjectName
// 1 : classPath
$InfoFieldList = explode(":", $param_list[0]);
dol_include_once($InfoFieldList[1]);
if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))
{
$new_array_options[$key] = '';
} elseif ($value) {
$object = new $InfoFieldList[0]($this->db);
if (is_numeric($value)) $res = $object->fetch($value); // Common case
else $res = $object->fetch('', $value); // For compatibility
if ($value == '-1') // -1 is key for no defined in combo list of objects
{
$new_array_options[$key] = '';
} elseif ($value) {
$object = new $InfoFieldList[0]($this->db);
if (is_numeric($value)) $res = $object->fetch($value); // Common case
else $res = $object->fetch('', $value); // For compatibility
if ($res > 0) $new_array_options[$key] = $object->id;
else {
$this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";
$this->db->rollback();
return -1;
if ($res > 0) $new_array_options[$key] = $object->id;
else {
$this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";
$this->db->rollback();
return -1;
}
}
} else {
dol_syslog('Error bad setup of extrafield', LOG_WARNING);
}
} else {
dol_syslog('Error bad setup of extrafield', LOG_WARNING);
}
break;
*/
break;
*/
case 'checkbox':
case 'chkbxlst':
$new_array_options = array();
@ -8250,7 +8251,7 @@ abstract class CommonObject
{
global $langs;
if (empty($msg)) {
$msg = $langs->trans("UnknowError");
$msg = $langs->trans("UnknownError");
}
$this->error = $this->validateFieldsErrors[$fieldKey] = $msg;

7
htdocs/core/class/link.class.php
View File

@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -91,7 +92,7 @@ class Link extends CommonObject
// Check parameters
if (empty($this->url)) {
$this->error = $langs->trans("NoUrl");
$this->error = $langs->trans("NoURL");
return -1;
}
@ -207,11 +208,11 @@ class Link extends CommonObject
}
} else {
if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
// Doublon
// Duplicate
$this->error = $langs->trans("ErrorDuplicateField");
$result = -1;
} else {
$this->error = $langs->trans("Error sql = ".$sql);
$this->error = $langs->trans("Error sql")."= $sql";
$result = -2;
}
$this->db->rollback();

4
htdocs/core/tpl/advtarget.tpl.php
View File

@ -1,4 +1,6 @@
<?php
/* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*/
/*
*
* This program is free software; you can redistribute it and/or modify
@ -165,7 +167,7 @@ print '</td><td>'."\n";
print '</td></tr>'."\n";
// Mother Company
print '<tr><td>'.$langs->trans("Maison mère");
print '<tr><td>'.$langs->trans("ParentCompany");
if (!empty($array_query['cust_mothercompany'])) {
print img_picto($langs->trans('AdvTgtUse'), 'ok.png@advtargetemailing');
}

5
htdocs/expedition/card.php
View File

@ -14,6 +14,7 @@
* Copyright (C) 2018-2022 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2020 Lenin Rivas <lenin@leninrivas.com>
* Copyright (C) 2022 Josep Lluís Amador <joseplluis@lliuretic.cat>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -537,7 +538,7 @@ if (empty($reshook)) {
|| $action == 'settrueDepth'
|| $action == 'setshipping_method_id')
&& $user->hasRight('expedition', 'creer')
) {
) {
// Action update
$error = 0;
@ -2462,7 +2463,7 @@ if ($action == 'create') {
print '</tr>';
} else {
print '<!-- case edit 5 -->';
print '<tr><td colspan="3">'.$langs->trans("NotEnoughStock").'</td></tr>';
print '<tr><td colspan="3">'.$langs->trans("ErrorStockIsNotEnough").'</td></tr>';
}
} else {
print '<!-- case edit 6 -->';

9
htdocs/holiday/card_group.php
View File

@ -8,6 +8,7 @@
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2020-2021 Udo Tamm <dev@dolibit.de>
* Copyright (C) 2022 Anthony Berton <anthony.berton@bb2a.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -700,7 +701,7 @@ function sendMail($id, $cancreate, $now, $autoValidation)
dol_syslog("Expected validator has no email, so we redirect directly to finished page without sending email");
$objStd->error++;
$objStd->msg = $langs->trans('ErroremailTo');
$objStd->msg = $langs->trans('ErrorMailRecipientIsEmpty');
$objStd->status = 'error';
$objStd->style="warnings";
return $objStd;
@ -782,17 +783,17 @@ function sendMail($id, $cancreate, $now, $autoValidation)
if (!$result) {
$objStd->error++;
$objStd->msg = $langs->trans('ErroreSendmail');
$objStd->msg = $langs->trans('ErrorMailNotSend');
$objStd->style="warnings";
$objStd->status = 'error';
} else {
$objStd->msg = $langs->trans('mailSended');
$objStd->msg = $langs->trans('MailSent');
}
return $objStd;
} else {
$objStd->error++;
$objStd->msg = $langs->trans('ErroreVerif');
$objStd->msg = $langs->trans('ErrorVerif');
$objStd->status = 'error';
$objStd->style="errors";
return $objStd;

19
htdocs/takepos/invoice.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2018 Andreu Bisquerra <jove@bisquerra.com>
* Copyright (C) 2021 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2022-2023 Christophe Battarel <christophe.battarel@altairis.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -618,7 +619,7 @@ if (empty($reshook)) {
} // If this line is sended to printer create new line
// check if qty in stock
if (getDolGlobalString('TAKEPOS_QTY_IN_STOCK') && (($line->qty + $qty) > $prod->stock_reel)) {
$invoice->error = $langs->trans('NotEnoughInStock');
$invoice->error = $langs->trans("ErrorStockIsNotEnough");
dol_htmloutput_errors($invoice->error, $invoice->errors, 1);
$err++;
break;
@ -676,7 +677,7 @@ if (empty($reshook)) {
// check if qty in stock
if (getDolGlobalString('TAKEPOS_QTY_IN_STOCK') && $qty > $prod->stock_reel) {
$invoice->error = $langs->trans('NotEnoughInStock');
$invoice->error = $langs->trans("ErrorStockIsNotEnough");
dol_htmloutput_errors($invoice->error, $invoice->errors, 1);
$err++;
}
@ -1463,17 +1464,17 @@ $( document ).ready(function() {
<?php
if (getDolGlobalString('TAKEPOS_CUSTOMER_DISPLAY')) {
echo "function CustomerDisplay(){";
echo "var line1='".$CUSTOMER_DISPLAY_line1."'.substring(0,20);";
echo "line1=line1.padEnd(20);";
echo "var line2='".$CUSTOMER_DISPLAY_line2."'.substring(0,20);";
echo "line2=line2.padEnd(20);";
echo "$.ajax({
echo "function CustomerDisplay(){";
echo "var line1='".$CUSTOMER_DISPLAY_line1."'.substring(0,20);";
echo "line1=line1.padEnd(20);";
echo "var line2='".$CUSTOMER_DISPLAY_line2."'.substring(0,20);";
echo "line2=line2.padEnd(20);";
echo "$.ajax({
type: 'GET',
data: { text: line1+line2 },
url: '".getDolGlobalString('TAKEPOS_PRINT_SERVER')."/display/index.php',
});";
echo "}";
echo "}";
}
?>