Skip to content

Commit e728d20

Browse files
cedric-annecedric-anne
committed
Merge branch 'release/2.11.0'
2 parents 40cf008 + 15d1dc7 commit e728d20

39 files changed

+309
-173
lines changed

‎composer.lock

+77-77
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎genericobject.xml

+5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
<author>Walid Nouh</author>
2525
</authors>
2626
<versions>
27+
<version>
28+
<num>2.11.0</num>
29+
<compatibility>~9.5.0</compatibility>
30+
<download_url>https://github.com/pluginsGLPI/genericobject/releases/download/2.11.0/glpi-genericobject-2.11.0.tar.bz2</download_url>
31+
</version>
2732
<version>
2833
<num>2.10.1</num>
2934
<compatibility>~9.5.0</compatibility>

‎inc/type.class.php

+12
Original file line numberDiff line numberDiff line change
@@ -1725,6 +1725,18 @@ static function getTypesByFamily($all = false) {
17251725
}
17261726
}
17271727

1728+
static function getTypesForFormcreator($param) {
1729+
$families = PluginGenericobjectTypeFamily::getFamilies();
1730+
$familyFk = PluginGenericobjectTypeFamily::getForeignKeyField();
1731+
foreach(self::getTypes() as $type => $typeData) {
1732+
$familyName = isset($families[$typeData[$familyFk]])
1733+
? $families[$typeData[$familyFk]]
1734+
: _n('Other', 'Others', Session::getPluralNumber(), 'genericobject');
1735+
$param[$familyName][$type] = $typeData['name'];
1736+
}
1737+
return $param;
1738+
}
1739+
17281740
/**
17291741
* Register all variables for a type
17301742
* @param type the type's attributes

‎locales/cs_CZ.mo

-27 Bytes
Binary file not shown.

‎locales/cs_CZ.po

+14-6
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ msgid ""
99
msgstr ""
1010
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2021-02-15 14:07+0000\n"
13-
"PO-Revision-Date: 2019-11-09 06:06+0000\n"
14-
"Last-Translator: Pavel Borecki <[email protected]>\n"
12+
"POT-Creation-Date: 2021-05-28 10:21+0000\n"
13+
"PO-Revision-Date: 2021-05-28 10:22+0000\n"
14+
"Last-Translator: Cédric Anne\n"
1515
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/cs_CZ/)\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
2121

2222
#: index.php:58 front/familylist.php:33 front/familylist.php:41
2323
#: front/type.form.php:73 inc/profile.class.php:39 inc/type.class.php:292
24-
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:223
24+
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:227
2525
msgid "Objects management"
2626
msgstr "Správa objektů"
2727

@@ -128,14 +128,22 @@ msgstr "Znovu vytvořit soubory"
128128
msgid "Link to other objects"
129129
msgstr "Propojit s ostatními objekty"
130130

131+
#: inc/type.class.php:1734
132+
msgid "Other"
133+
msgid_plural "Others"
134+
msgstr[0] ""
135+
msgstr[1] ""
136+
msgstr[2] ""
137+
msgstr[3] ""
138+
131139
#. TRANS: %1$s is itemtype name
132-
#: inc/type.class.php:2089
140+
#: inc/type.class.php:2101
133141
#, php-format
134142
msgid "Unable to load the class %1$s."
135143
msgstr "Nedaří se načíst třídu %1$s."
136144

137145
#. TRANS: %1$s is itemtype name
138-
#: inc/type.class.php:2091
146+
#: inc/type.class.php:2103
139147
#, php-format
140148
msgid ""
141149
"You probably have garbage data in your database for this plugin and missing "

‎locales/en_GB.mo

42 Bytes
Binary file not shown.

‎locales/en_GB.po

+11-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2021-02-15 14:07+0000\n"
11-
"PO-Revision-Date: 2021-02-15 14:07+0000\n"
10+
"POT-Creation-Date: 2021-05-28 10:21+0000\n"
11+
"PO-Revision-Date: 2021-05-28 10:21+0000\n"
1212
"Last-Translator: Automatically generated\n"
1313
"Language-Team: none\n"
1414
"Language: en_GB\n"
@@ -19,7 +19,7 @@ msgstr ""
1919

2020
#: index.php:58 front/familylist.php:33 front/familylist.php:41
2121
#: front/type.form.php:73 inc/profile.class.php:39 inc/type.class.php:292
22-
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:223
22+
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:227
2323
msgid "Objects management"
2424
msgstr "Objects management"
2525

@@ -127,14 +127,20 @@ msgstr "Regenerate files"
127127
msgid "Link to other objects"
128128
msgstr "Link to other objects"
129129

130+
#: inc/type.class.php:1734
131+
msgid "Other"
132+
msgid_plural "Others"
133+
msgstr[0] "Other"
134+
msgstr[1] "Others"
135+
130136
#. TRANS: %1$s is itemtype name
131-
#: inc/type.class.php:2089
137+
#: inc/type.class.php:2101
132138
#, php-format
133139
msgid "Unable to load the class %1$s."
134140
msgstr "Unable to load the class %1$s."
135141

136142
#. TRANS: %1$s is itemtype name
137-
#: inc/type.class.php:2091
143+
#: inc/type.class.php:2103
138144
#, php-format
139145
msgid ""
140146
"You probably have garbage data in your database for this plugin and missing "

‎locales/es_ES.mo

0 Bytes
Binary file not shown.

‎locales/es_ES.po

+11-5
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2021-02-15 14:07+0000\n"
12-
"PO-Revision-Date: 2019-11-08 14:59+0000\n"
11+
"POT-Creation-Date: 2021-05-28 10:21+0000\n"
12+
"PO-Revision-Date: 2021-05-28 10:22+0000\n"
1313
"Last-Translator: Cédric Anne\n"
1414
"Language-Team: Spanish (Spain) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/es_ES/)\n"
1515
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
2020

2121
#: index.php:58 front/familylist.php:33 front/familylist.php:41
2222
#: front/type.form.php:73 inc/profile.class.php:39 inc/type.class.php:292
23-
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:223
23+
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:227
2424
msgid "Objects management"
2525
msgstr "Gestión de objetos"
2626

@@ -127,14 +127,20 @@ msgstr "Generar de nuevo los ficheros"
127127
msgid "Link to other objects"
128128
msgstr "Enlace con otros objetos"
129129

130+
#: inc/type.class.php:1734
131+
msgid "Other"
132+
msgid_plural "Others"
133+
msgstr[0] ""
134+
msgstr[1] ""
135+
130136
#. TRANS: %1$s is itemtype name
131-
#: inc/type.class.php:2089
137+
#: inc/type.class.php:2101
132138
#, php-format
133139
msgid "Unable to load the class %1$s."
134140
msgstr ""
135141

136142
#. TRANS: %1$s is itemtype name
137-
#: inc/type.class.php:2091
143+
#: inc/type.class.php:2103
138144
#, php-format
139145
msgid ""
140146
"You probably have garbage data in your database for this plugin and missing "

‎locales/fi_FI.mo

0 Bytes
Binary file not shown.

‎locales/fi_FI.po

+11-5
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2021-02-15 14:07+0000\n"
12-
"PO-Revision-Date: 2019-11-08 14:59+0000\n"
11+
"POT-Creation-Date: 2021-05-28 10:21+0000\n"
12+
"PO-Revision-Date: 2021-05-28 10:22+0000\n"
1313
"Last-Translator: Cédric Anne\n"
1414
"Language-Team: Finnish (Finland) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/fi_FI/)\n"
1515
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
2020

2121
#: index.php:58 front/familylist.php:33 front/familylist.php:41
2222
#: front/type.form.php:73 inc/profile.class.php:39 inc/type.class.php:292
23-
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:223
23+
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:227
2424
msgid "Objects management"
2525
msgstr "Kohteiden hallinta"
2626

@@ -127,14 +127,20 @@ msgstr "Luo tiedostot uudelleen"
127127
msgid "Link to other objects"
128128
msgstr "Linkki muihin kohteisiin"
129129

130+
#: inc/type.class.php:1734
131+
msgid "Other"
132+
msgid_plural "Others"
133+
msgstr[0] ""
134+
msgstr[1] ""
135+
130136
#. TRANS: %1$s is itemtype name
131-
#: inc/type.class.php:2089
137+
#: inc/type.class.php:2101
132138
#, php-format
133139
msgid "Unable to load the class %1$s."
134140
msgstr "Ei voida ladata luokkaa %1$s."
135141

136142
#. TRANS: %1$s is itemtype name
137-
#: inc/type.class.php:2091
143+
#: inc/type.class.php:2103
138144
#, php-format
139145
msgid ""
140146
"You probably have garbage data in your database for this plugin and missing "

‎locales/fr_CA.mo

1 Byte
Binary file not shown.

‎locales/fr_CA.po

+13-7
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
# This file is distributed under the same license as the PACKAGE package.
44
#
55
# Translators:
6-
# Tiago Graca, 2020
6+
# Tiago Graça, 2020
77
msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2021-02-15 14:07+0000\n"
12-
"PO-Revision-Date: 2020-06-09 02:45+0000\n"
13-
"Last-Translator: Tiago Graca\n"
11+
"POT-Creation-Date: 2021-05-28 10:21+0000\n"
12+
"PO-Revision-Date: 2021-05-28 10:22+0000\n"
13+
"Last-Translator: Cédric Anne\n"
1414
"Language-Team: French (Canada) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/fr_CA/)\n"
1515
"MIME-Version: 1.0\n"
1616
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
2020

2121
#: index.php:58 front/familylist.php:33 front/familylist.php:41
2222
#: front/type.form.php:73 inc/profile.class.php:39 inc/type.class.php:292
23-
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:223
23+
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:227
2424
msgid "Objects management"
2525
msgstr "Gestion d'objets"
2626

@@ -127,14 +127,20 @@ msgstr "Regénérer les fichiers"
127127
msgid "Link to other objects"
128128
msgstr "Liaison avec d'autres objets"
129129

130+
#: inc/type.class.php:1734
131+
msgid "Other"
132+
msgid_plural "Others"
133+
msgstr[0] ""
134+
msgstr[1] ""
135+
130136
#. TRANS: %1$s is itemtype name
131-
#: inc/type.class.php:2089
137+
#: inc/type.class.php:2101
132138
#, php-format
133139
msgid "Unable to load the class %1$s."
134140
msgstr "Impossible de charger la classe %1$s"
135141

136142
#. TRANS: %1$s is itemtype name
137-
#: inc/type.class.php:2091
143+
#: inc/type.class.php:2103
138144
#, php-format
139145
msgid ""
140146
"You probably have garbage data in your database for this plugin and missing "

‎locales/fr_FR.mo

0 Bytes
Binary file not shown.

‎locales/fr_FR.po

+11-5
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ msgid ""
1313
msgstr ""
1414
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1515
"Report-Msgid-Bugs-To: \n"
16-
"POT-Creation-Date: 2021-02-15 14:07+0000\n"
17-
"PO-Revision-Date: 2019-11-08 14:59+0000\n"
16+
"POT-Creation-Date: 2021-05-28 10:21+0000\n"
17+
"PO-Revision-Date: 2021-05-28 10:22+0000\n"
1818
"Last-Translator: Cédric Anne\n"
1919
"Language-Team: French (France) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/fr_FR/)\n"
2020
"MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
2525

2626
#: index.php:58 front/familylist.php:33 front/familylist.php:41
2727
#: front/type.form.php:73 inc/profile.class.php:39 inc/type.class.php:292
28-
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:223
28+
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:227
2929
msgid "Objects management"
3030
msgstr "Gestion d'objets"
3131

@@ -132,14 +132,20 @@ msgstr "Regénérer les fichiers"
132132
msgid "Link to other objects"
133133
msgstr "Liaison avec d'autres objets"
134134

135+
#: inc/type.class.php:1734
136+
msgid "Other"
137+
msgid_plural "Others"
138+
msgstr[0] ""
139+
msgstr[1] ""
140+
135141
#. TRANS: %1$s is itemtype name
136-
#: inc/type.class.php:2089
142+
#: inc/type.class.php:2101
137143
#, php-format
138144
msgid "Unable to load the class %1$s."
139145
msgstr "Impossible de charger la classe %1$s"
140146

141147
#. TRANS: %1$s is itemtype name
142-
#: inc/type.class.php:2091
148+
#: inc/type.class.php:2103
143149
#, php-format
144150
msgid ""
145151
"You probably have garbage data in your database for this plugin and missing "

‎locales/genericobject.pot

+11-4
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2021-02-15 14:07+0000\n"
11+
"POT-Creation-Date: 2021-05-28 10:21+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
1515
"Language: \n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=CHARSET\n"
1818
"Content-Transfer-Encoding: 8bit\n"
19+
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
1920

2021
#: index.php:58 front/familylist.php:33 front/familylist.php:41
2122
#: front/type.form.php:73 inc/profile.class.php:39 inc/type.class.php:292
22-
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:223
23+
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:227
2324
msgid "Objects management"
2425
msgstr ""
2526

@@ -126,14 +127,20 @@ msgstr ""
126127
msgid "Link to other objects"
127128
msgstr ""
128129

130+
#: inc/type.class.php:1734
131+
msgid "Other"
132+
msgid_plural "Others"
133+
msgstr[0] ""
134+
msgstr[1] ""
135+
129136
#. TRANS: %1$s is itemtype name
130-
#: inc/type.class.php:2089
137+
#: inc/type.class.php:2101
131138
#, php-format
132139
msgid "Unable to load the class %1$s."
133140
msgstr ""
134141

135142
#. TRANS: %1$s is itemtype name
136-
#: inc/type.class.php:2091
143+
#: inc/type.class.php:2103
137144
#, php-format
138145
msgid ""
139146
"You probably have garbage data in your database for this plugin and missing "

‎locales/hr_HR.mo

-15 Bytes
Binary file not shown.

‎locales/hr_HR.po

+13-6
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2021-02-15 14:07+0000\n"
12-
"PO-Revision-Date: 2020-02-12 13:54+0000\n"
13-
"Last-Translator: milotype <[email protected]>\n"
11+
"POT-Creation-Date: 2021-05-28 10:21+0000\n"
12+
"PO-Revision-Date: 2021-05-28 10:22+0000\n"
13+
"Last-Translator: Cédric Anne\n"
1414
"Language-Team: Croatian (Croatia) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/hr_HR/)\n"
1515
"MIME-Version: 1.0\n"
1616
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
2020

2121
#: index.php:58 front/familylist.php:33 front/familylist.php:41
2222
#: front/type.form.php:73 inc/profile.class.php:39 inc/type.class.php:292
23-
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:223
23+
#: inc/type.class.php:427 inc/object_item.class.php:109 setup.php:227
2424
msgid "Objects management"
2525
msgstr "Upravljanje objektima"
2626

@@ -127,14 +127,21 @@ msgstr "Ponovo generiraj datoteke"
127127
msgid "Link to other objects"
128128
msgstr "Poveži s drugim objektima"
129129

130+
#: inc/type.class.php:1734
131+
msgid "Other"
132+
msgid_plural "Others"
133+
msgstr[0] ""
134+
msgstr[1] ""
135+
msgstr[2] ""
136+
130137
#. TRANS: %1$s is itemtype name
131-
#: inc/type.class.php:2089
138+
#: inc/type.class.php:2101
132139
#, php-format
133140
msgid "Unable to load the class %1$s."
134141
msgstr "Nije moguće učitati klasu %1$s."
135142

136143
#. TRANS: %1$s is itemtype name
137-
#: inc/type.class.php:2091
144+
#: inc/type.class.php:2103
138145
#, php-format
139146
msgid ""
140147
"You probably have garbage data in your database for this plugin and missing "

‎locales/it_IT.mo

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)