From 43321ccf23300b8f16a537cb0ef0affeb4f72f8c Mon Sep 17 00:00:00 2001 From: inesmv Date: Wed, 27 Jul 2022 12:09:21 +0200 Subject: [PATCH 1/4] Localazy files added --- inc/task.class.php | 1 + locales/.gitignore | 2 ++ locales/localazy.json | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 locales/.gitignore create mode 100644 locales/localazy.json diff --git a/inc/task.class.php b/inc/task.class.php index 5e3ae36..7eafd66 100644 --- a/inc/task.class.php +++ b/inc/task.class.php @@ -53,6 +53,7 @@ static function taskAdd(TicketTask $task){ 'actiontime'=>$task->fields['actiontime'], 'cost_time'=>$cost_time, 'cost_fixed'=>$cost_fixed, + 'budgets_id'=>$config->fields["budgets_id"], 'entities_id'=>$ticket->fields['entities_id'], ]); diff --git a/locales/.gitignore b/locales/.gitignore new file mode 100644 index 0000000..7948160 --- /dev/null +++ b/locales/.gitignore @@ -0,0 +1,2 @@ +localazy.keys.json +localazy.jar \ No newline at end of file diff --git a/locales/localazy.json b/locales/localazy.json new file mode 100644 index 0000000..36d36bc --- /dev/null +++ b/locales/localazy.json @@ -0,0 +1,19 @@ +{ + "upload": { + "type": "pot", + "deprecate": "project", + "files": [ + "costs.pot", + { + "group": "existing", + "file": "costs.pot", + "pattern": "./*.po", + "type": "po", + "lang": "${autodetectLang}" + } + ] + }, + "download": { + "files": "${languageCode}_${regionCode}.po" + } +} \ No newline at end of file From 39737f16b87bc2e5c1ceb2de78d43dd1e1a6d765 Mon Sep 17 00:00:00 2001 From: inesmv Date: Wed, 27 Jul 2022 12:11:20 +0200 Subject: [PATCH 2/4] Generate locales script executed --- locales/costs.pot | 10 +++++----- locales/en_GB.po | 6 +++--- locales/es_ES.po | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/locales/costs.pot b/locales/costs.pot index 6c73a01..2debb67 100644 --- a/locales/costs.pot +++ b/locales/costs.pot @@ -1,15 +1,15 @@ # Cost Glpi Plugin. -# Copyright (C) 2021 TICgal +# Copyright (C) 2022 TICgal # This file is distributed under the same license as the PACKAGE package. -# TICgal, 2021 +# TICgal, 2022 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 14:43+0200\n" -"PO-Revision-Date: 2021-MO-DA HO:MI+ZONE\n" +"POT-Creation-Date: 2022-07-27 12:10+0200\n" +"PO-Revision-Date: 2022-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -26,6 +26,6 @@ msgstr "" msgid "Add task description on cost" msgstr "" -#: inc/ticket.class.php:53 inc/ticket.class.php:116 +#: inc/ticket.class.php:53 inc/ticket.class.php:119 msgid "Billable" msgstr "" diff --git a/locales/en_GB.po b/locales/en_GB.po index 969b8ee..d7e7b35 100644 --- a/locales/en_GB.po +++ b/locales/en_GB.po @@ -2,12 +2,12 @@ # Copyright (C) 2020 TICgal # This file is distributed under the same license as the PACKAGE package. # TICgal, 2020 -# +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 14:43+0200\n" +"POT-Creation-Date: 2022-07-27 12:10+0200\n" "PO-Revision-Date: 2021-05-20 14:43+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -27,6 +27,6 @@ msgstr "Costs" msgid "Add task description on cost" msgstr "Add task description on cost" -#: inc/ticket.class.php:53 inc/ticket.class.php:116 +#: inc/ticket.class.php:53 inc/ticket.class.php:119 msgid "Billable" msgstr "Billable" diff --git a/locales/es_ES.po b/locales/es_ES.po index 1fed871..14b80f6 100644 --- a/locales/es_ES.po +++ b/locales/es_ES.po @@ -2,12 +2,12 @@ # Copyright (C) 2020 TICgal # This file is distributed under the same license as the PACKAGE package. # TICgal, 2020 -# +# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 14:43+0200\n" +"POT-Creation-Date: 2022-07-27 12:10+0200\n" "PO-Revision-Date: 2021-05-20 14:44+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -27,6 +27,6 @@ msgstr "Costes" msgid "Add task description on cost" msgstr "Añadir la descripción de la tarea en el coste" -#: inc/ticket.class.php:53 inc/ticket.class.php:116 +#: inc/ticket.class.php:53 inc/ticket.class.php:119 msgid "Billable" msgstr "Facturable" From 989f9fe02c68d02d7494968d2e065c04e11dba1c Mon Sep 17 00:00:00 2001 From: inesmv Date: Wed, 27 Jul 2022 12:17:35 +0200 Subject: [PATCH 3/4] Localazy strings updated --- inc/task.class.php | 1 - locales/es_ES.po | 28 +++++++--------------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/inc/task.class.php b/inc/task.class.php index 7eafd66..5e3ae36 100644 --- a/inc/task.class.php +++ b/inc/task.class.php @@ -53,7 +53,6 @@ static function taskAdd(TicketTask $task){ 'actiontime'=>$task->fields['actiontime'], 'cost_time'=>$cost_time, 'cost_fixed'=>$cost_fixed, - 'budgets_id'=>$config->fields["budgets_id"], 'entities_id'=>$ticket->fields['entities_id'], ]); diff --git a/locales/es_ES.po b/locales/es_ES.po index 14b80f6..2cf5ae1 100644 --- a/locales/es_ES.po +++ b/locales/es_ES.po @@ -1,32 +1,18 @@ -# Cost Glpi Plugin. -# Copyright (C) 2020 TICgal -# This file is distributed under the same license as the PACKAGE package. -# TICgal, 2020 -# msgid "" msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-27 12:10+0200\n" -"PO-Revision-Date: 2021-05-20 14:44+0200\n" -"Last-Translator: \n" -"Language-Team: \n" -"Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.6\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: inc/config.class.php:46 inc/config.class.php:102 inc/entity.class.php:46 -#: inc/task.class.php:7 inc/ticket.class.php:41 -msgid "Costs" -msgstr "Costes" +"X-Generator: Localazy (https://localazy.com)\n" +"Project-Id-Version: Costs\n" +"Language: es_ES\n" +"Plural-Forms: nplurals=2; plural=(n==1) ? 0 : 1;\n" -#: inc/config.class.php:89 msgid "Add task description on cost" msgstr "Añadir la descripción de la tarea en el coste" -#: inc/ticket.class.php:53 inc/ticket.class.php:119 msgid "Billable" msgstr "Facturable" + +msgid "Costs" +msgstr "Costes" From 048e1832fe4c054d9388fb5401d6af09b88ecfb8 Mon Sep 17 00:00:00 2001 From: inesmv Date: Wed, 27 Jul 2022 12:20:29 +0200 Subject: [PATCH 4/4] New version 3.0.1 and CHANGELOG updated --- CHANGELOG.md | 4 ++++ setup.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd465e3..c4c6f5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Costs The cost plugin for GLPI +## 3.0.1 - 2022-07-27 +## Features +- Localazy integration #10666 + ## 3.0.0 - 2022-07-07 ### Features - GLPI 10 compatibility #10398 diff --git a/setup.php b/setup.php index 122fe30..f963b93 100755 --- a/setup.php +++ b/setup.php @@ -32,7 +32,7 @@ @link https://tic.gal @since 2018 ---------------------------------------------------------------------- */ -define ('PLUGIN_COSTS_VERSION', '3.0.0'); +define ('PLUGIN_COSTS_VERSION', '3.0.1'); // Minimal GLPI version, inclusive define("PLUGIN_COSTS_MIN_GLPI", "10.0"); // Maximum GLPI version, exclusive