Skip to content

Commit

Permalink
Merge pull request #21 from ticgal/develop
Browse files Browse the repository at this point in the history
Update GLPI 10 branch (v 3.0.1)
  • Loading branch information
inesmv authored Jul 27, 2022
2 parents 5ae9e7a + e9d9a61 commit d9d1c32
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 30 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions locales/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
localazy.keys.json
localazy.jar
10 changes: 5 additions & 5 deletions locales/costs.pot
Original file line number Diff line number Diff line change
@@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
Expand All @@ -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 ""
6 changes: 3 additions & 3 deletions locales/en_GB.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
28 changes: 7 additions & 21 deletions locales/es_ES.po
Original file line number Diff line number Diff line change
@@ -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: 2021-05-20 14:43+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:116
msgid "Billable"
msgstr "Facturable"

msgid "Costs"
msgstr "Costes"
19 changes: 19 additions & 0 deletions locales/localazy.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
2 changes: 1 addition & 1 deletion setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d9d1c32

Please sign in to comment.