From 26c0b7778dac2812f6f7dd0f6abef0f34ab7bc40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 5 Feb 2025 18:46:47 +0100 Subject: [PATCH 1/3] fix missing translations --- dev/translation/ignore_translation_keys.lst | 2 -- htdocs/langs/en_US/trips.lang | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst index a75b4fa5975..b30a09e3af5 100644 --- a/dev/translation/ignore_translation_keys.lst +++ b/dev/translation/ignore_translation_keys.lst @@ -418,8 +418,6 @@ FailedToExecutCommandJob FailedToGetCostPrice FailedToOpenFile FailedToReadFile -FailedToSetPaid -FailedToSetToCancel FailedToUncompressFile FailedToUpdatePrice FailedtoSetToApprove diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index 6af362c5091..8d0b02c7bb2 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -157,3 +157,5 @@ TF_PEAGE=Toll TF_TAXI=Taxi TF_TRAIN=Train TF_TRIP=Transportation +FailedToSetPaid=Failed to set as paid +FailedToSetToCancel=Failed to cancel From 16b861b1d71ecdbf10663aff06fedd336e227e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 5 Feb 2025 18:52:38 +0100 Subject: [PATCH 2/3] fix missing translations --- htdocs/compta/index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 2a0f0d1bcb3..acc8803a7f1 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -9,7 +9,7 @@ * Copyright (C) 2019 Nicolas ZABOURI * Copyright (C) 2020 Tobias Sekan * Copyright (C) 2020 Josep Lluís Amador - * Copyright (C) 2021-2024 Frédéric France + * Copyright (C) 2021-2025 Frédéric France * Copyright (C) 2024 Rafael San José * Copyright (C) 2024 MDW * @@ -484,6 +484,7 @@ if (isModEnabled('don') && $user->hasRight('don', 'lire')) { $donationstatic->statut = $obj->status; $donationstatic->status = $obj->status; + $label = ''; if (!empty($obj->socid)) { $companystatic = new Societe($db); $ret = $companystatic->fetch($obj->socid); From 42c64af5786f50f6c182acd6694136cc6eac4ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 5 Feb 2025 19:01:42 +0100 Subject: [PATCH 3/3] fix missing translations --- dev/translation/ignore_translation_keys.lst | 1 - htdocs/compta/index.php | 26 ++++++++++----------- htdocs/hrm/compare.php | 4 ++-- htdocs/langs/en_US/hrm.lang | 1 + 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst index b30a09e3af5..3945b5a4f8b 100644 --- a/dev/translation/ignore_translation_keys.lst +++ b/dev/translation/ignore_translation_keys.lst @@ -123,7 +123,6 @@ AmountOfTicketsByMonthHT AmountOfinterventions AmountOfinterventionsByMonthHT AnObjectWithThisClassNameAlreadyExists -Anciennete AnnualByAccountDueDebtMode AnnualByAccountInputOutputMode Anonymous diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index acc8803a7f1..31c98fef78c 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -1,17 +1,17 @@ - * Copyright (C) 2004-2022 Laurent Destailleur - * Copyright (C) 2005-2015 Regis Houssin - * Copyright (C) 2015-2020 Juanjo Menent - * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2015 Raphaël Doursenaud - * Copyright (C) 2016 Marcos García - * Copyright (C) 2019 Nicolas ZABOURI - * Copyright (C) 2020 Tobias Sekan - * Copyright (C) 2020 Josep Lluís Amador - * Copyright (C) 2021-2025 Frédéric France - * Copyright (C) 2024 Rafael San José - * Copyright (C) 2024 MDW +/* Copyright (C) 2001-2005 Rodolphe Quiedeville + * Copyright (C) 2004-2022 Laurent Destailleur + * Copyright (C) 2005-2015 Regis Houssin + * Copyright (C) 2015-2020 Juanjo Menent + * Copyright (C) 2015 Jean-François Ferry + * Copyright (C) 2015 Raphaël Doursenaud + * Copyright (C) 2016 Marcos García + * Copyright (C) 2019 Nicolas ZABOURI + * Copyright (C) 2020 Tobias Sekan + * Copyright (C) 2020 Josep Lluís Amador + * Copyright (C) 2021-2025 Frédéric France + * Copyright (C) 2024 Rafael San José + * Copyright (C) 2024 MDW * * 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 diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php index 3a06e903ab2..30f1a09c664 100644 --- a/htdocs/hrm/compare.php +++ b/htdocs/hrm/compare.php @@ -4,7 +4,7 @@ * Copyright (C) 2021 Greg Rastklan * Copyright (C) 2021 Jean-Pascal BOUDET * Copyright (C) 2021 Grégory BLEMAND - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024-2025 MDW * Copyright (C) 2024 Alexandre Spangaro * @@ -491,7 +491,7 @@ function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list } if (!empty($user->array_options['options_DDA'])) { - $desc .= '
' . $langs->trans('Anciennete') . ' : ' . dol_print_date(strtotime($user->array_options['options_DDA'])); + $desc .= '
' . $langs->trans('Seniority') . ' : ' . dol_print_date(strtotime($user->array_options['options_DDA'])); } $out .= '
  • diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang index 55669d08b4f..283cec1e7ee 100644 --- a/htdocs/langs/en_US/hrm.lang +++ b/htdocs/langs/en_US/hrm.lang @@ -81,6 +81,7 @@ TypeHowToBe=How to be TypeKnowledge=Knowledge AbandonmentComment=Abandonment comment DateLastEval=Date last evaluation +Seniority=Seniority NoEval=No evaluation done for this employee HowManyUserWithThisMaxNote=Number of users with this rank HighestRank=Highest rank