Skip to content

Commit 1a984e1

Browse files
cedric-annecedric-anne
committed
Merge branch 'release/2.2.2'
2 parents f0ecf67 + 4397f39 commit 1a984e1

39 files changed

+106
-87
lines changed

‎inc/tag.class.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public static function install(Migration $migration) {
120120
`type_menu` text collate utf8_unicode_ci,
121121
PRIMARY KEY (`id`),
122122
KEY `name` (`name`)
123-
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci")
123+
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci")
124124
or die($DB->error());
125125
}
126126

@@ -137,7 +137,7 @@ public static function install(Migration $migration) {
137137
$migration->dropKey($table, 'type_menu');
138138
$migration->migrationOneTable($table);
139139

140-
$datas = getAllDatasFromTable($table, "`type_menu` IS NOT NULL");
140+
$datas = getAllDatasFromTable($table, ['NOT' => ['type_menu' => null]]);
141141
if (!empty($datas)) {
142142
foreach ($datas as $data) {
143143
$itemtypes = PluginTagTagItem::getItemtypes($data['type_menu']);

‎inc/tagitem.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static function install(Migration $migration) {
3131
UNIQUE INDEX `unicity` (`itemtype`, `items_id`, `plugin_tag_tags_id`)
3232
)
3333
COLLATE='utf8_unicode_ci'
34-
ENGINE=MyISAM";
34+
ENGINE=InnoDB";
3535
$DB->query($query) or die($DB->error());
3636
}
3737

‎locales/cs_CZ.mo‎

0 Bytes
Binary file not shown.

‎locales/cs_CZ.po‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgid ""
99
msgstr ""
1010
"Project-Id-Version: GLPI Plugin - Tag\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2018-06-26 09:20+0000\n"
12+
"POT-Creation-Date: 2018-08-24 14:42+0000\n"
1313
"PO-Revision-Date: 2018-06-07 13:06+0000\n"
1414
"Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
1515
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-plugin-tag/language/cs_CZ/)\n"
@@ -27,19 +27,19 @@ msgstr "Přidat štítky"
2727
msgid "Remove tags"
2828
msgstr "Odebrat štítky"
2929

30-
#: inc/tag.class.php:10 inc/tag.class.php:410
30+
#: inc/tag.class.php:10 inc/tag.class.php:411
3131
msgid "Tag"
3232
msgid_plural "Tags"
3333
msgstr[0] "Štítek"
3434
msgstr[1] "Štítky"
3535
msgstr[2] "Štítků"
3636
msgstr[3] "Štítky"
3737

38-
#: inc/tag.class.php:66 inc/tag.class.php:305
38+
#: inc/tag.class.php:67 inc/tag.class.php:306
3939
msgid "HTML color"
4040
msgstr "Barva v HTML zápisu"
4141

42-
#: inc/tag.class.php:534
42+
#: inc/tag.class.php:535
4343
msgid "View all tags"
4444
msgstr "Zobrazit všechny štítky"
4545

‎locales/en_GB.mo‎

0 Bytes
Binary file not shown.

‎locales/en_GB.po‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
# This file is distributed under the same license as the PACKAGE package.
44
#
55
# Translators:
6-
# Alexandre Delaunay <delaunay.alexandre@gmail.com>, 2017
6+
# alexandre delaunay <delaunay.alexandre@gmail.com>, 2017
77
# Davide Foschi (Argaar TantaRes) <argaar@gmail.com>, 2016
88
# Jérémy MOREAU <jmoreau@teclib.com>, 2014
99
msgid ""
1010
msgstr ""
1111
"Project-Id-Version: GLPI Plugin - Tag\n"
1212
"Report-Msgid-Bugs-To: \n"
13-
"POT-Creation-Date: 2018-06-26 09:20+0000\n"
13+
"POT-Creation-Date: 2018-08-24 14:42+0000\n"
1414
"PO-Revision-Date: 2017-09-22 15:17+0000\n"
15-
"Last-Translator: Alexandre Delaunay <delaunay.alexandre@gmail.com>\n"
15+
"Last-Translator: alexandre delaunay <delaunay.alexandre@gmail.com>\n"
1616
"Language-Team: English (United Kingdom) (http://www.transifex.com/teclib/glpi-plugin-tag/language/en_GB/)\n"
1717
"MIME-Version: 1.0\n"
1818
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,17 +28,17 @@ msgstr "Add tags"
2828
msgid "Remove tags"
2929
msgstr "Remove tags"
3030

31-
#: inc/tag.class.php:10 inc/tag.class.php:410
31+
#: inc/tag.class.php:10 inc/tag.class.php:411
3232
msgid "Tag"
3333
msgid_plural "Tags"
3434
msgstr[0] "Tag"
3535
msgstr[1] "Tags"
3636

37-
#: inc/tag.class.php:66 inc/tag.class.php:305
37+
#: inc/tag.class.php:67 inc/tag.class.php:306
3838
msgid "HTML color"
3939
msgstr "HTML color"
4040

41-
#: inc/tag.class.php:534
41+
#: inc/tag.class.php:535
4242
msgid "View all tags"
4343
msgstr "View all tags"
4444

‎locales/en_US.mo‎

0 Bytes
Binary file not shown.

‎locales/en_US.po‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
# This file is distributed under the same license as the PACKAGE package.
44
#
55
# Translators:
6-
# Alexandre Delaunay <delaunay.alexandre@gmail.com>, 2017
6+
# alexandre delaunay <delaunay.alexandre@gmail.com>, 2017
77
# Davide Foschi (Argaar TantaRes) <argaar@gmail.com>, 2016
88
msgid ""
99
msgstr ""
1010
"Project-Id-Version: GLPI Plugin - Tag\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2018-06-26 09:20+0000\n"
12+
"POT-Creation-Date: 2018-08-24 14:42+0000\n"
1313
"PO-Revision-Date: 2017-09-22 15:17+0000\n"
14-
"Last-Translator: Alexandre Delaunay <delaunay.alexandre@gmail.com>\n"
14+
"Last-Translator: alexandre delaunay <delaunay.alexandre@gmail.com>\n"
1515
"Language-Team: English (United States) (http://www.transifex.com/teclib/glpi-plugin-tag/language/en_US/)\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
@@ -27,17 +27,17 @@ msgstr "Add tags"
2727
msgid "Remove tags"
2828
msgstr "Remove tags"
2929

30-
#: inc/tag.class.php:10 inc/tag.class.php:410
30+
#: inc/tag.class.php:10 inc/tag.class.php:411
3131
msgid "Tag"
3232
msgid_plural "Tags"
3333
msgstr[0] "Tag"
3434
msgstr[1] "Tags"
3535

36-
#: inc/tag.class.php:66 inc/tag.class.php:305
36+
#: inc/tag.class.php:67 inc/tag.class.php:306
3737
msgid "HTML color"
3838
msgstr "HTML color"
3939

40-
#: inc/tag.class.php:534
40+
#: inc/tag.class.php:535
4141
msgid "View all tags"
4242
msgstr "View all tags"
4343

‎locales/es_419.mo‎

0 Bytes
Binary file not shown.

‎locales/es_419.po‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - Tag\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-06-26 09:20+0000\n"
11+
"POT-Creation-Date: 2018-08-24 14:42+0000\n"
1212
"PO-Revision-Date: 2017-09-23 10:39+0000\n"
1313
"Last-Translator: Alexander Salas Bastidas <alexander.salas@gmail.com>\n"
1414
"Language-Team: Spanish (Latin America) (http://www.transifex.com/teclib/glpi-plugin-tag/language/es_419/)\n"
@@ -26,17 +26,17 @@ msgstr "Agregar etiquetas"
2626
msgid "Remove tags"
2727
msgstr "Eliminar etiquetas"
2828

29-
#: inc/tag.class.php:10 inc/tag.class.php:410
29+
#: inc/tag.class.php:10 inc/tag.class.php:411
3030
msgid "Tag"
3131
msgid_plural "Tags"
3232
msgstr[0] "Etiqueta"
3333
msgstr[1] "Etiquetas"
3434

35-
#: inc/tag.class.php:66 inc/tag.class.php:305
35+
#: inc/tag.class.php:67 inc/tag.class.php:306
3636
msgid "HTML color"
3737
msgstr "Color HTML"
3838

39-
#: inc/tag.class.php:534
39+
#: inc/tag.class.php:535
4040
msgid "View all tags"
4141
msgstr "Ver todas las etiquetas"
4242

0 commit comments

Comments
 (0)