From fa491bbc3f680addd0b7f02ec192e4ecda2a88b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Tue, 24 Jul 2018 16:30:29 +0200 Subject: [PATCH 1/9] Removed deprecated usage of Html::scriptStart() and Html::scriptEnd() --- inc/field.class.php | 25 ++++++++++-------- inc/labeltranslation.class.php | 47 +++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/inc/field.class.php b/inc/field.class.php index a700fa30..5d315f12 100644 --- a/inc/field.class.php +++ b/inc/field.class.php @@ -275,16 +275,21 @@ function showSummary($container) { $rand = mt_rand(); echo "
"; - Html::scriptStart(); - echo "viewAddField$cID$rand = function() {"; - Ajax::updateItemJsCode("viewField" . $cID . "$rand", - $CFG_GLPI["root_doc"]."/ajax/viewsubitem.php", - ['type' => __CLASS__, - 'parenttype' => 'PluginFieldsContainer', - 'plugin_fields_containers_id' => $cID, - 'id' => -1]); - echo "};"; - echo Html::scriptEnd(); + + echo Html::scriptBlock(' + viewAddField' . $cID . $rand . ' = function() { + $("#viewField' . $cID . $rand . '").load( + "' . $CFG_GLPI['root_doc'] . '/ajax/viewsubitem.php", + ' . json_encode([ + 'type' => __CLASS__, + 'parenttype' => PluginFieldsContainer::class, + 'plugin_fields_containers_id' => $cID, + 'id' => -1 + ]) . ' + ); + }; + '); + echo "
". ""; echo __("Add a new field", "fields")."

"; diff --git a/inc/labeltranslation.class.php b/inc/labeltranslation.class.php index 9469a88c..ad6645d4 100644 --- a/inc/labeltranslation.class.php +++ b/inc/labeltranslation.class.php @@ -89,16 +89,20 @@ static function showTranslations(CommonDBTM $item) { $rand = mt_rand(); if ($canedit) { echo "
"; - Html::scriptStart(); - echo "addTranslation".$item->getID()."$rand = function() {"; - Ajax::updateItemJsCode("viewtranslation" . $item->getID() . "$rand", - $CFG_GLPI["root_doc"]."/plugins/fields/ajax/viewtranslations.php", - ['type' => __CLASS__, - 'itemtype' => $item::getType(), - 'items_id' => $item->fields['id'], - 'id' => -1]); - echo "};"; - echo Html::scriptEnd(); + + echo Html::scriptBlock(' + addTranslation' . $item->getID() . $rand . ' = function() { + $("#viewtranslation' . $item->getID() . $rand . '").load( + "' . $CFG_GLPI['root_doc'] . '/plugins/fields/ajax/viewtranslations.php", + ' . json_encode([ + 'type' => __CLASS__, + 'itemtype' => $item::getType(), + 'items_id' => $item->fields['id'], + 'id' => -1 + ]) . ' + ); + }; + '); echo "
". "". @@ -138,16 +142,19 @@ static function showTranslations(CommonDBTM $item) { } echo ""; if ($canedit) { - Html::scriptStart(); - echo "viewEditTranslation". $data["id"]."$rand = function() {"; - Ajax::updateItemJsCode("viewtranslation" . $item->getID() . "$rand", - $CFG_GLPI["root_doc"]."/plugins/fields/ajax/viewtranslations.php", - ['type' => __CLASS__, - 'itemtype' => $item::getType(), - 'items_id' => $item->getID(), - 'id' => $data["id"]]); - echo "};"; - echo Html::scriptEnd(); + echo Html::scriptBlock(' + viewEditTranslation' . $data['id'] . $rand . ' = function() { + $("#viewtranslation' . $item->getID() . $rand . '").load( + "' . $CFG_GLPI['root_doc'] . '/plugins/fields/ajax/viewtranslations.php", + ' . json_encode([ + 'type' => __CLASS__, + 'itemtype' => $item::getType(), + 'items_id' => $item->getID(), + 'id' => $data['id'] + ]) . ' + ); + }; + '); } echo Dropdown::getLanguageName($data['language']); echo ""; From d787dd0e465a06b4e42d5932559106d2b5d9cf90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Thu, 26 Jul 2018 16:55:43 +0200 Subject: [PATCH 2/9] Remove usage of deprecated Html::checkAllAsCheckbox() --- inc/labeltranslation.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/labeltranslation.class.php b/inc/labeltranslation.class.php index ad6645d4..8d7ce92e 100644 --- a/inc/labeltranslation.class.php +++ b/inc/labeltranslation.class.php @@ -127,7 +127,7 @@ static function showTranslations(CommonDBTM $item) { echo "".__("List of translations").""; if ($canedit) { echo ""; - Html::checkAllAsCheckbox('mass'.__CLASS__.$rand); + echo Html::getCheckAllAsCheckbox('mass'.__CLASS__.$rand); echo ""; } echo "".__("Language", "fields").""; From f245532c1211ec10f85e535b87e67a2c906f95c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Tue, 7 Aug 2018 14:27:44 +0200 Subject: [PATCH 3/9] Fix item types filtering on container form; fixes #269 (#270) --- inc/container.class.php | 144 ++++++++++++++++++++-------------------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/inc/container.class.php b/inc/container.class.php index 409fbae2..50970d92 100644 --- a/inc/container.class.php +++ b/inc/container.class.php @@ -694,66 +694,47 @@ static function getItemtypes($is_domtab) { $tabs = []; - $assets = ['Computer' => Computer::getTypeName(2)]; - if (!$is_domtab) { - $assets += [ - 'Monitor' => Monitor::getTypeName(2), - 'Software' => Software::getTypeName(2), - 'NetworkEquipment' => NetworkEquipment::getTypeName(2), - 'Peripheral' => Peripheral::getTypeName(2), - 'Printer' => Printer::getTypeName(2), - 'CartridgeItem' => CartridgeItem::getTypeName(2), - 'ConsumableItem' => ConsumableItem::getTypeName(2), - 'Phone' => Phone::getTypeName(2) - ]; - } - $tabs[__('Assets')] = $assets; + $tabs[__('Assets')] = [ + 'Computer' => Computer::getTypeName(2), + 'Monitor' => Monitor::getTypeName(2), + 'Software' => Software::getTypeName(2), + 'NetworkEquipment' => NetworkEquipment::getTypeName(2), + 'Peripheral' => Peripheral::getTypeName(2), + 'Printer' => Printer::getTypeName(2), + 'CartridgeItem' => CartridgeItem::getTypeName(2), + 'ConsumableItem' => ConsumableItem::getTypeName(2), + 'Phone' => Phone::getTypeName(2) + ]; - $assistance = [ - 'Ticket' => Ticket::getTypeName(2), - 'Problem' => Problem::getTypeName(2), - 'Change' => Change::getTypeName(2), + $tabs[__('Assistance')] = [ + 'Ticket' => Ticket::getTypeName(2), + 'Problem' => Problem::getTypeName(2), + 'Change' => Change::getTypeName(2), + 'TicketRecurrent' => TicketRecurrent::getTypeName(2), ]; - if (!$is_domtab) { - $assistance += [ - 'TicketRecurrent' => TicketRecurrent::getTypeName(2) - ]; - } - $tabs[__('Assistance')] = $assistance; - - if (!$is_domtab) { - $tabs += [ - __("Management") => [ - 'SoftwareLicense' => SoftwareLicense::getTypeName(2), - 'Budget' => Budget::getTypeName(2), - 'Supplier' => Supplier::getTypeName(2), - 'Contact' => Contact::getTypeName(2), - 'Contract' => Contract::getTypeName(2), - 'Document' => Document::getTypeName(2) - ], - __("Tools") => [ - 'Project' => Project::getTypeName(2), - 'ProjectTask' => ProjectTask::getTypeName(2), - 'Reminder' => Reminder::getTypeName(2), - 'RSSFeed' => RSSFeed::getTypeName(2), - ] - ]; - } - $administration = []; - if (!$is_domtab) { - $administration += [ - 'User' => User::getTypeName(2), - 'Group' => Group::getTypeName(2) - ]; - } - $administration['Entity'] = Entity::getTypeName(2); - if (!$is_domtab) { - $administration += [ - 'Profile' => Profile::getTypeName(2) - ]; - } - $tabs[__('Administration')] = $administration; + $tabs[__('Management')] = [ + 'SoftwareLicense' => SoftwareLicense::getTypeName(2), + 'Budget' => Budget::getTypeName(2), + 'Supplier' => Supplier::getTypeName(2), + 'Contact' => Contact::getTypeName(2), + 'Contract' => Contract::getTypeName(2), + 'Document' => Document::getTypeName(2) + ]; + + $tabs[__('Tools')] = [ + 'Project' => Project::getTypeName(2), + 'ProjectTask' => ProjectTask::getTypeName(2), + 'Reminder' => Reminder::getTypeName(2), + 'RSSFeed' => RSSFeed::getTypeName(2), + ]; + + $tabs[__('Administration')] = [ + 'User' => User::getTypeName(2), + 'Group' => Group::getTypeName(2), + 'Entity' => Entity::getTypeName(2), + 'Profile' => Profile::getTypeName(2) + ]; foreach ($PLUGIN_HOOKS['plugin_fields'] as $itemtype) { $isPlugin = isPluginItemType($itemtype); @@ -764,20 +745,39 @@ static function getItemtypes($is_domtab) { } } - if (!$is_domtab) { - $dropdowns = []; - // flatten dropdows - $raw_dropdowns = Dropdown::getStandardDropdownItemTypes(); - array_walk_recursive($raw_dropdowns, function($val, $key) use (&$dropdowns) { - $dropdowns[$key] = $val; - }); - $tabs[__('Dropdowns')] = $dropdowns; - - $tabs[__('Other')] = [ - 'NetworkPort' => NetworkPort::getTypeName(2), - 'Notification' => Notification::getTypeName(2), - 'NotificationTemplate' => NotificationTemplate::getTypeName(2), - ]; + $dropdowns = []; + // flatten dropdows + $raw_dropdowns = Dropdown::getStandardDropdownItemTypes(); + array_walk_recursive($raw_dropdowns, function($val, $key) use (&$dropdowns) { + $dropdowns[$key] = $val; + }); + $tabs[__('Dropdowns')] = $dropdowns; + + $tabs[__('Other')] = [ + 'NetworkPort' => NetworkPort::getTypeName(2), + 'Notification' => Notification::getTypeName(2), + 'NotificationTemplate' => NotificationTemplate::getTypeName(2), + ]; + + if ($is_domtab) { + // Filter items that do not have tab handled + foreach ($tabs as $group => $items) { + $tabs[$group] = array_filter( + $items, + function ($item) { + return count(self::getSubtypes($item)) > 0; + }, + ARRAY_FILTER_USE_KEY + ); + } + + // Filter groupts that do not have items handled + $tabs = array_filter( + $tabs, + function ($items) { + return count($items) > 0; + } + ); } return $tabs; @@ -1511,7 +1511,7 @@ private static function getSubtypes($item) { ]; break; default: - Toolbox::logDebug('Item type ' . $item::getType() . ' does not have any preconfigured subtypes!'); + //Toolbox::logDebug('Item type ' . $item::getType() . ' does not have any preconfigured subtypes!'); /* For debug purposes $tabs = $item->defineTabs(); list($id, ) = each($tabs); From 0c413f8b9afb9ba343d040b775d4d9eb6659869b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 17 Aug 2018 11:46:15 +0200 Subject: [PATCH 4/9] Fix usages deprecated in 9.3.1 (#273) --- inc/field.class.php | 2 +- inc/labeltranslation.class.php | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/inc/field.class.php b/inc/field.class.php index 5d315f12..f6aa0c87 100644 --- a/inc/field.class.php +++ b/inc/field.class.php @@ -240,7 +240,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { return self::createTabEntry(__("Fields", "fields"), countElementsInTable(self::getTable(), - "`plugin_fields_containers_id` = '".$item->getID()."'")); + ['plugin_fields_containers_id' => $item->getID()])); } static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtemplate = 0) { diff --git a/inc/labeltranslation.class.php b/inc/labeltranslation.class.php index 8d7ce92e..59180ced 100644 --- a/inc/labeltranslation.class.php +++ b/inc/labeltranslation.class.php @@ -64,9 +64,13 @@ static function createForItem(CommonDBTM $item) { } function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { - $nb = countElementsInTable(self::getTable(), - "`plugin_fields_itemtype` = '{$item::getType()}' AND - `plugin_fields_items_id` = '{$item->getID()}'"); + $nb = countElementsInTable( + self::getTable(), + [ + 'plugin_fields_itemtype' => $item::getType(), + 'plugin_fields_items_id' => $item->getID(), + ] + ); return self::createTabEntry(self::getTypeName($nb), $nb); } From 9dc8a32a7d41ac712382abeea271c1477f08f438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Tue, 21 Aug 2018 10:52:20 +0200 Subject: [PATCH 5/9] Use InnoDB as DB table engine --- inc/container.class.php | 2 +- inc/field.class.php | 2 +- inc/labeltranslation.class.php | 2 +- inc/profile.class.php | 2 +- templates/container.class.tpl | 2 +- templates/dropdown.class.tpl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/inc/container.class.php b/inc/container.class.php index 50970d92..1b52dc51 100644 --- a/inc/container.class.php +++ b/inc/container.class.php @@ -40,7 +40,7 @@ static function install(Migration $migration, $version) { `is_active` TINYINT(1) NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `entities_id` (`entities_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"; + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"; $DB->query($query) or die ($DB->error()); } diff --git a/inc/field.class.php b/inc/field.class.php index f6aa0c87..951e26f7 100644 --- a/inc/field.class.php +++ b/inc/field.class.php @@ -38,7 +38,7 @@ static function install(Migration $migration, $version) { KEY `plugin_fields_containers_id` (`plugin_fields_containers_id`), KEY `is_active` (`is_active`), KEY `is_readonly` (`is_readonly`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"; + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"; $DB->query($query) or die ($DB->error()); } diff --git a/inc/labeltranslation.class.php b/inc/labeltranslation.class.php index 59180ced..57011284 100644 --- a/inc/labeltranslation.class.php +++ b/inc/labeltranslation.class.php @@ -30,7 +30,7 @@ static function install(Migration $migration, $version) { KEY `plugin_fields_items_id` (`plugin_fields_items_id`), KEY `language` (`language`), UNIQUE KEY `unicity` (`plugin_fields_itemtype`, `plugin_fields_items_id`, `language`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"; + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"; $DB->query($query) or die ($DB->error()); } diff --git a/inc/profile.class.php b/inc/profile.class.php index d7cb308f..f1e8baaf 100644 --- a/inc/profile.class.php +++ b/inc/profile.class.php @@ -18,7 +18,7 @@ static function install(Migration $migration) { PRIMARY KEY (`id`), KEY `profiles_id` (`profiles_id`), KEY `plugin_fields_containers_id` (`plugin_fields_containers_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"; + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"; $DB->query($query) or die ($DB->error()); } diff --git a/templates/container.class.tpl b/templates/container.class.tpl index 89fa3c90..c9e29576 100644 --- a/templates/container.class.tpl +++ b/templates/container.class.tpl @@ -20,7 +20,7 @@ class %%CLASSNAME%% extends CommonDBTM PRIMARY KEY (`id`), UNIQUE INDEX `itemtype_item_container` (`itemtype`, `items_id`, `plugin_fields_containers_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"; + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"; $DB->query($query) or die ($DB->error()); } diff --git a/templates/dropdown.class.tpl b/templates/dropdown.class.tpl index 32a37ff7..392de0c6 100644 --- a/templates/dropdown.class.tpl +++ b/templates/dropdown.class.tpl @@ -37,7 +37,7 @@ class %%CLASSNAME%% extends CommonTreeDropdown { KEY `is_recursive` (`is_recursive`), KEY `plugin_fields_%%FIELDNAME%%dropdowns_id` (`plugin_fields_%%FIELDNAME%%dropdowns_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"; + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;"; $DB->query($query) or die ($DB->error()); } } From bc20e4695c5663be9315df9bff9a917be2efa6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Tue, 21 Aug 2018 16:45:41 +0200 Subject: [PATCH 6/9] Update locales --- locales/cs_CZ.po | 36 ++++++++++++++++++------------------ locales/en_GB.po | 38 +++++++++++++++++++------------------- locales/en_US.po | 36 ++++++++++++++++++------------------ locales/es_ES.po | 36 ++++++++++++++++++------------------ locales/fields.pot | 36 ++++++++++++++++++------------------ locales/fr_FR.po | 40 ++++++++++++++++++++-------------------- locales/pl_PL.po | 36 ++++++++++++++++++------------------ locales/pt_BR.po | 36 ++++++++++++++++++------------------ locales/ro_RO.po | 36 ++++++++++++++++++------------------ locales/ru_RU.po | 36 ++++++++++++++++++------------------ locales/tr_TR.po | 46 +++++++++++++++++++++++----------------------- locales/zh_CN.po | 40 ++++++++++++++++++++-------------------- 12 files changed, 226 insertions(+), 226 deletions(-) diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po index 988e8a19..7cffec15 100644 --- a/locales/cs_CZ.po +++ b/locales/cs_CZ.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"POT-Creation-Date: 2018-08-21 14:44+0000\n" "PO-Revision-Date: 2018-06-28 12:37+0000\n" "Last-Translator: Pavel Borecki \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/cs_CZ/)\n" @@ -45,63 +45,63 @@ msgstr "Kolonka" msgid "Fields" msgstr "Kolonky" -#: inc/field.class.php:290 +#: inc/field.class.php:295 msgid "Add a new field" msgstr "Přidat novou kolonku" -#: inc/field.class.php:294 +#: inc/field.class.php:299 msgid "No field for this block" msgstr "Žádná kolonka pro tento blok" -#: inc/field.class.php:306 inc/field.class.php:419 +#: inc/field.class.php:311 inc/field.class.php:424 msgid "Read only" msgstr "Pouze pro čtení" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure" msgstr "Nastavit" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure fields values" msgstr "Nastavit hodnoty kolonek" -#: inc/field.class.php:712 +#: inc/field.class.php:717 msgid "show" msgstr "zobrazit" -#: inc/field.class.php:858 +#: inc/field.class.php:863 msgid "Header" msgstr "Hlavička" -#: inc/field.class.php:859 +#: inc/field.class.php:864 msgid "Text (single line)" msgstr "Text (jednořádkový)" -#: inc/field.class.php:860 +#: inc/field.class.php:865 msgid "Text (multiples lines)" msgstr "Text (víceřádkový)" -#: inc/field.class.php:861 +#: inc/field.class.php:866 msgid "Number" msgstr "Číslo" -#: inc/field.class.php:862 +#: inc/field.class.php:867 msgid "URL" msgstr "URL adresa" -#: inc/field.class.php:863 +#: inc/field.class.php:868 msgid "Dropdown" msgstr "Rozbalovací" -#: inc/field.class.php:864 +#: inc/field.class.php:869 msgid "Yes/No" msgstr "Ano/Ne" -#: inc/field.class.php:865 +#: inc/field.class.php:870 msgid "Date" msgstr "Datum" -#: inc/field.class.php:866 +#: inc/field.class.php:871 msgid "Date & time" msgstr "Datum a čas" @@ -165,11 +165,11 @@ msgstr "Některé číselné kolonky obsahují nečíselné hodnoty" msgid "Some URL fields contains invalid links" msgstr "Některé URL kolonky obsahují neplatné odkazy" -#: inc/labeltranslation.class.php:129 +#: inc/labeltranslation.class.php:137 msgid "Language" msgstr "Jazyk" -#: inc/labeltranslation.class.php:130 +#: inc/labeltranslation.class.php:138 msgid "Label" msgstr "Štítek" diff --git a/locales/en_GB.po b/locales/en_GB.po index 7b429612..f91af392 100644 --- a/locales/en_GB.po +++ b/locales/en_GB.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-28 08:22+0000\n" -"PO-Revision-Date: 2018-06-28 08:22+0000\n" +"POT-Creation-Date: 2018-08-21 14:44+0000\n" +"PO-Revision-Date: 2018-08-21 14:44+0000\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en_GB\n" @@ -42,63 +42,63 @@ msgstr "Field" msgid "Fields" msgstr "Fields" -#: inc/field.class.php:290 +#: inc/field.class.php:295 msgid "Add a new field" msgstr "Add a new field" -#: inc/field.class.php:294 +#: inc/field.class.php:299 msgid "No field for this block" msgstr "No field for this block" -#: inc/field.class.php:306 inc/field.class.php:419 +#: inc/field.class.php:311 inc/field.class.php:424 msgid "Read only" msgstr "Read only" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure" msgstr "Configure" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure fields values" msgstr "Configure fields values" -#: inc/field.class.php:712 +#: inc/field.class.php:717 msgid "show" msgstr "show" -#: inc/field.class.php:858 +#: inc/field.class.php:863 msgid "Header" msgstr "Header" -#: inc/field.class.php:859 +#: inc/field.class.php:864 msgid "Text (single line)" msgstr "Text (single line)" -#: inc/field.class.php:860 +#: inc/field.class.php:865 msgid "Text (multiples lines)" msgstr "Text (multiples lines)" -#: inc/field.class.php:861 +#: inc/field.class.php:866 msgid "Number" msgstr "Number" -#: inc/field.class.php:862 +#: inc/field.class.php:867 msgid "URL" msgstr "URL" -#: inc/field.class.php:863 +#: inc/field.class.php:868 msgid "Dropdown" msgstr "Dropdown" -#: inc/field.class.php:864 +#: inc/field.class.php:869 msgid "Yes/No" msgstr "Yes/No" -#: inc/field.class.php:865 +#: inc/field.class.php:870 msgid "Date" msgstr "Date" -#: inc/field.class.php:866 +#: inc/field.class.php:871 msgid "Date & time" msgstr "Date & time" @@ -166,11 +166,11 @@ msgstr "Some numeric fields contains non numeric values" msgid "Some URL fields contains invalid links" msgstr "Some URL fields contains invalid links" -#: inc/labeltranslation.class.php:129 +#: inc/labeltranslation.class.php:137 msgid "Language" msgstr "Language" -#: inc/labeltranslation.class.php:130 +#: inc/labeltranslation.class.php:138 msgid "Label" msgstr "Label" diff --git a/locales/en_US.po b/locales/en_US.po index cfcfc6d0..56955671 100644 --- a/locales/en_US.po +++ b/locales/en_US.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"POT-Creation-Date: 2018-08-21 14:44+0000\n" "PO-Revision-Date: 2018-07-06 09:27+0000\n" "Last-Translator: Cédric Anne\n" "Language-Team: English (United States) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/en_US/)\n" @@ -44,63 +44,63 @@ msgstr "Field" msgid "Fields" msgstr "Fields" -#: inc/field.class.php:290 +#: inc/field.class.php:295 msgid "Add a new field" msgstr "Add a New Field" -#: inc/field.class.php:294 +#: inc/field.class.php:299 msgid "No field for this block" msgstr "No Field for this Block" -#: inc/field.class.php:306 inc/field.class.php:419 +#: inc/field.class.php:311 inc/field.class.php:424 msgid "Read only" msgstr "Read Only" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure" msgstr "Configure" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure fields values" msgstr "Configure Fields Values" -#: inc/field.class.php:712 +#: inc/field.class.php:717 msgid "show" msgstr "show" -#: inc/field.class.php:858 +#: inc/field.class.php:863 msgid "Header" msgstr "Header" -#: inc/field.class.php:859 +#: inc/field.class.php:864 msgid "Text (single line)" msgstr "Text (single line)" -#: inc/field.class.php:860 +#: inc/field.class.php:865 msgid "Text (multiples lines)" msgstr "Text (multiples lines)" -#: inc/field.class.php:861 +#: inc/field.class.php:866 msgid "Number" msgstr "Number" -#: inc/field.class.php:862 +#: inc/field.class.php:867 msgid "URL" msgstr "URL" -#: inc/field.class.php:863 +#: inc/field.class.php:868 msgid "Dropdown" msgstr "Dropdown" -#: inc/field.class.php:864 +#: inc/field.class.php:869 msgid "Yes/No" msgstr "Yes/No" -#: inc/field.class.php:865 +#: inc/field.class.php:870 msgid "Date" msgstr "Date" -#: inc/field.class.php:866 +#: inc/field.class.php:871 msgid "Date & time" msgstr "Date & Time" @@ -164,11 +164,11 @@ msgstr "Some numeric fields contains non-numeric values" msgid "Some URL fields contains invalid links" msgstr "Some URL fields contains invalid links" -#: inc/labeltranslation.class.php:129 +#: inc/labeltranslation.class.php:137 msgid "Language" msgstr "Language" -#: inc/labeltranslation.class.php:130 +#: inc/labeltranslation.class.php:138 msgid "Label" msgstr "Label" diff --git a/locales/es_ES.po b/locales/es_ES.po index a4d67d57..5ac1c48a 100644 --- a/locales/es_ES.po +++ b/locales/es_ES.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"POT-Creation-Date: 2018-08-21 14:44+0000\n" "PO-Revision-Date: 2018-06-28 08:23+0000\n" "Last-Translator: Cédric Anne\n" "Language-Team: Spanish (Spain) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/es_ES/)\n" @@ -44,63 +44,63 @@ msgstr "Campo" msgid "Fields" msgstr "Campos" -#: inc/field.class.php:290 +#: inc/field.class.php:295 msgid "Add a new field" msgstr "Agregar nuevo campo" -#: inc/field.class.php:294 +#: inc/field.class.php:299 msgid "No field for this block" msgstr "" -#: inc/field.class.php:306 inc/field.class.php:419 +#: inc/field.class.php:311 inc/field.class.php:424 msgid "Read only" msgstr "Solo lectura" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure" msgstr "Configurar" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure fields values" msgstr "Configure valores de los campos" -#: inc/field.class.php:712 +#: inc/field.class.php:717 msgid "show" msgstr "" -#: inc/field.class.php:858 +#: inc/field.class.php:863 msgid "Header" msgstr "Encabezamiento" -#: inc/field.class.php:859 +#: inc/field.class.php:864 msgid "Text (single line)" msgstr "Texto (línea simple)" -#: inc/field.class.php:860 +#: inc/field.class.php:865 msgid "Text (multiples lines)" msgstr "Texto (multiples líneas)" -#: inc/field.class.php:861 +#: inc/field.class.php:866 msgid "Number" msgstr "Número" -#: inc/field.class.php:862 +#: inc/field.class.php:867 msgid "URL" msgstr "" -#: inc/field.class.php:863 +#: inc/field.class.php:868 msgid "Dropdown" msgstr "Menú desplegable" -#: inc/field.class.php:864 +#: inc/field.class.php:869 msgid "Yes/No" msgstr "Si/No" -#: inc/field.class.php:865 +#: inc/field.class.php:870 msgid "Date" msgstr "Fecha" -#: inc/field.class.php:866 +#: inc/field.class.php:871 msgid "Date & time" msgstr "Fecha & Hora" @@ -164,11 +164,11 @@ msgstr "Algunos campos numéricos contienen valores no numéricos" msgid "Some URL fields contains invalid links" msgstr "" -#: inc/labeltranslation.class.php:129 +#: inc/labeltranslation.class.php:137 msgid "Language" msgstr "" -#: inc/labeltranslation.class.php:130 +#: inc/labeltranslation.class.php:138 msgid "Label" msgstr "" diff --git a/locales/fields.pot b/locales/fields.pot index 11154522..99765a50 100644 --- a/locales/fields.pot +++ b/locales/fields.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"POT-Creation-Date: 2018-08-21 14:44+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -42,63 +42,63 @@ msgstr "" msgid "Fields" msgstr "" -#: inc/field.class.php:290 +#: inc/field.class.php:295 msgid "Add a new field" msgstr "" -#: inc/field.class.php:294 +#: inc/field.class.php:299 msgid "No field for this block" msgstr "" -#: inc/field.class.php:306 inc/field.class.php:419 +#: inc/field.class.php:311 inc/field.class.php:424 msgid "Read only" msgstr "" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure" msgstr "" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure fields values" msgstr "" -#: inc/field.class.php:712 +#: inc/field.class.php:717 msgid "show" msgstr "" -#: inc/field.class.php:858 +#: inc/field.class.php:863 msgid "Header" msgstr "" -#: inc/field.class.php:859 +#: inc/field.class.php:864 msgid "Text (single line)" msgstr "" -#: inc/field.class.php:860 +#: inc/field.class.php:865 msgid "Text (multiples lines)" msgstr "" -#: inc/field.class.php:861 +#: inc/field.class.php:866 msgid "Number" msgstr "" -#: inc/field.class.php:862 +#: inc/field.class.php:867 msgid "URL" msgstr "" -#: inc/field.class.php:863 +#: inc/field.class.php:868 msgid "Dropdown" msgstr "" -#: inc/field.class.php:864 +#: inc/field.class.php:869 msgid "Yes/No" msgstr "" -#: inc/field.class.php:865 +#: inc/field.class.php:870 msgid "Date" msgstr "" -#: inc/field.class.php:866 +#: inc/field.class.php:871 msgid "Date & time" msgstr "" @@ -162,11 +162,11 @@ msgstr "" msgid "Some URL fields contains invalid links" msgstr "" -#: inc/labeltranslation.class.php:129 +#: inc/labeltranslation.class.php:137 msgid "Language" msgstr "" -#: inc/labeltranslation.class.php:130 +#: inc/labeltranslation.class.php:138 msgid "Label" msgstr "" diff --git a/locales/fr_FR.po b/locales/fr_FR.po index 7b6a4670..3cc0bea4 100644 --- a/locales/fr_FR.po +++ b/locales/fr_FR.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Alexandre Delaunay , 2016 -# Alexandre Delaunay , 2016 +# alexandre delaunay , 2016 +# alexandre delaunay , 2016 # Cédric Anne, 2018 # Johan Cwiklinski , 2016-2017 msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"POT-Creation-Date: 2018-08-21 14:44+0000\n" "PO-Revision-Date: 2018-07-06 09:26+0000\n" "Last-Translator: Cédric Anne\n" "Language-Team: French (France) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/fr_FR/)\n" @@ -46,63 +46,63 @@ msgstr "Champ" msgid "Fields" msgstr "Champs" -#: inc/field.class.php:290 +#: inc/field.class.php:295 msgid "Add a new field" msgstr "Ajouter un nouveau champ" -#: inc/field.class.php:294 +#: inc/field.class.php:299 msgid "No field for this block" msgstr "Aucun champ pour ce bloc" -#: inc/field.class.php:306 inc/field.class.php:419 +#: inc/field.class.php:311 inc/field.class.php:424 msgid "Read only" msgstr "Lecture seule" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure" msgstr "Configuration" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure fields values" msgstr "Configurer les valeurs du champ" -#: inc/field.class.php:712 +#: inc/field.class.php:717 msgid "show" msgstr "afficher" -#: inc/field.class.php:858 +#: inc/field.class.php:863 msgid "Header" msgstr "Entête" -#: inc/field.class.php:859 +#: inc/field.class.php:864 msgid "Text (single line)" msgstr "Texte (ligne simple)" -#: inc/field.class.php:860 +#: inc/field.class.php:865 msgid "Text (multiples lines)" msgstr "Texte (lignes multiples)" -#: inc/field.class.php:861 +#: inc/field.class.php:866 msgid "Number" msgstr "Nombre" -#: inc/field.class.php:862 +#: inc/field.class.php:867 msgid "URL" msgstr "URL" -#: inc/field.class.php:863 +#: inc/field.class.php:868 msgid "Dropdown" msgstr "Liste déroulante (Intitulés)" -#: inc/field.class.php:864 +#: inc/field.class.php:869 msgid "Yes/No" msgstr "Oui/Non" -#: inc/field.class.php:865 +#: inc/field.class.php:870 msgid "Date" msgstr "Date" -#: inc/field.class.php:866 +#: inc/field.class.php:871 msgid "Date & time" msgstr "Date & heure" @@ -166,11 +166,11 @@ msgstr "Des champs numériques contiennent des données non numériques" msgid "Some URL fields contains invalid links" msgstr "Des champs URL contiennent des liens invalides" -#: inc/labeltranslation.class.php:129 +#: inc/labeltranslation.class.php:137 msgid "Language" msgstr "Langue" -#: inc/labeltranslation.class.php:130 +#: inc/labeltranslation.class.php:138 msgid "Label" msgstr "Libellé" diff --git a/locales/pl_PL.po b/locales/pl_PL.po index eb87504e..c1a5f3c1 100644 --- a/locales/pl_PL.po +++ b/locales/pl_PL.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"POT-Creation-Date: 2018-08-21 14:44+0000\n" "PO-Revision-Date: 2018-06-28 08:23+0000\n" "Last-Translator: Cédric Anne\n" "Language-Team: Polish (Poland) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/pl_PL/)\n" @@ -44,63 +44,63 @@ msgstr "Pole" msgid "Fields" msgstr "Pola" -#: inc/field.class.php:290 +#: inc/field.class.php:295 msgid "Add a new field" msgstr "Dodaj nowe pole" -#: inc/field.class.php:294 +#: inc/field.class.php:299 msgid "No field for this block" msgstr "Brak pola dla tego bloku" -#: inc/field.class.php:306 inc/field.class.php:419 +#: inc/field.class.php:311 inc/field.class.php:424 msgid "Read only" msgstr "Tylko do odczytu" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure" msgstr "Konfiguruj" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure fields values" msgstr "Konfiguruj wartości pól" -#: inc/field.class.php:712 +#: inc/field.class.php:717 msgid "show" msgstr "pokaż" -#: inc/field.class.php:858 +#: inc/field.class.php:863 msgid "Header" msgstr "Nagłówek" -#: inc/field.class.php:859 +#: inc/field.class.php:864 msgid "Text (single line)" msgstr "Tekst (pojedyncza linia)" -#: inc/field.class.php:860 +#: inc/field.class.php:865 msgid "Text (multiples lines)" msgstr "Tekst (wiele linii)" -#: inc/field.class.php:861 +#: inc/field.class.php:866 msgid "Number" msgstr "Liczba" -#: inc/field.class.php:862 +#: inc/field.class.php:867 msgid "URL" msgstr "URL" -#: inc/field.class.php:863 +#: inc/field.class.php:868 msgid "Dropdown" msgstr "Lista rozwijana" -#: inc/field.class.php:864 +#: inc/field.class.php:869 msgid "Yes/No" msgstr "Tak/Nie" -#: inc/field.class.php:865 +#: inc/field.class.php:870 msgid "Date" msgstr "Data" -#: inc/field.class.php:866 +#: inc/field.class.php:871 msgid "Date & time" msgstr "Data & czas" @@ -164,11 +164,11 @@ msgstr "Niektóre pola numeryczne zawierają wartości inne niż liczby" msgid "Some URL fields contains invalid links" msgstr "Niektóre pola zawierają nieprawidłowe linki URL" -#: inc/labeltranslation.class.php:129 +#: inc/labeltranslation.class.php:137 msgid "Language" msgstr "Język" -#: inc/labeltranslation.class.php:130 +#: inc/labeltranslation.class.php:138 msgid "Label" msgstr "Etykieta" diff --git a/locales/pt_BR.po b/locales/pt_BR.po index c7aa46cd..26927ea3 100644 --- a/locales/pt_BR.po +++ b/locales/pt_BR.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"POT-Creation-Date: 2018-08-21 14:44+0000\n" "PO-Revision-Date: 2018-06-28 08:23+0000\n" "Last-Translator: Cédric Anne\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/pt_BR/)\n" @@ -45,63 +45,63 @@ msgstr "Campo" msgid "Fields" msgstr "Campos" -#: inc/field.class.php:290 +#: inc/field.class.php:295 msgid "Add a new field" msgstr "Adicionar um novo campo" -#: inc/field.class.php:294 +#: inc/field.class.php:299 msgid "No field for this block" msgstr "Nenhum campo para este bloco" -#: inc/field.class.php:306 inc/field.class.php:419 +#: inc/field.class.php:311 inc/field.class.php:424 msgid "Read only" msgstr "Somente leitura" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure" msgstr "Configurar" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure fields values" msgstr "Configurar valores dos campos" -#: inc/field.class.php:712 +#: inc/field.class.php:717 msgid "show" msgstr "Exibir" -#: inc/field.class.php:858 +#: inc/field.class.php:863 msgid "Header" msgstr "Cabeçalho" -#: inc/field.class.php:859 +#: inc/field.class.php:864 msgid "Text (single line)" msgstr "Texto (linha simples)" -#: inc/field.class.php:860 +#: inc/field.class.php:865 msgid "Text (multiples lines)" msgstr "Texto (Multiplas linhas)" -#: inc/field.class.php:861 +#: inc/field.class.php:866 msgid "Number" msgstr "Número" -#: inc/field.class.php:862 +#: inc/field.class.php:867 msgid "URL" msgstr "URL" -#: inc/field.class.php:863 +#: inc/field.class.php:868 msgid "Dropdown" msgstr "Suspenso" -#: inc/field.class.php:864 +#: inc/field.class.php:869 msgid "Yes/No" msgstr "Sim/Não" -#: inc/field.class.php:865 +#: inc/field.class.php:870 msgid "Date" msgstr "Data" -#: inc/field.class.php:866 +#: inc/field.class.php:871 msgid "Date & time" msgstr "Datar & Hora" @@ -165,11 +165,11 @@ msgstr "Alguns campos numéricos contém valores não numéricos" msgid "Some URL fields contains invalid links" msgstr "Alguns campos de URL contém links inválidos" -#: inc/labeltranslation.class.php:129 +#: inc/labeltranslation.class.php:137 msgid "Language" msgstr "Idioma" -#: inc/labeltranslation.class.php:130 +#: inc/labeltranslation.class.php:138 msgid "Label" msgstr "Rótulo" diff --git a/locales/ro_RO.po b/locales/ro_RO.po index fd418327..04d71fb0 100644 --- a/locales/ro_RO.po +++ b/locales/ro_RO.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"POT-Creation-Date: 2018-08-21 14:44+0000\n" "PO-Revision-Date: 2018-06-28 08:23+0000\n" "Last-Translator: Cédric Anne\n" "Language-Team: Romanian (Romania) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/ro_RO/)\n" @@ -44,63 +44,63 @@ msgstr "Camp" msgid "Fields" msgstr "Campuri" -#: inc/field.class.php:290 +#: inc/field.class.php:295 msgid "Add a new field" msgstr "Add un camp nou" -#: inc/field.class.php:294 +#: inc/field.class.php:299 msgid "No field for this block" msgstr "" -#: inc/field.class.php:306 inc/field.class.php:419 +#: inc/field.class.php:311 inc/field.class.php:424 msgid "Read only" msgstr "" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure" msgstr "Configurare" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure fields values" msgstr "Configurare valori campuri" -#: inc/field.class.php:712 +#: inc/field.class.php:717 msgid "show" msgstr "" -#: inc/field.class.php:858 +#: inc/field.class.php:863 msgid "Header" msgstr "Header" -#: inc/field.class.php:859 +#: inc/field.class.php:864 msgid "Text (single line)" msgstr "Text (singura linie)" -#: inc/field.class.php:860 +#: inc/field.class.php:865 msgid "Text (multiples lines)" msgstr "Text (multiple linii)" -#: inc/field.class.php:861 +#: inc/field.class.php:866 msgid "Number" msgstr "Numar" -#: inc/field.class.php:862 +#: inc/field.class.php:867 msgid "URL" msgstr "" -#: inc/field.class.php:863 +#: inc/field.class.php:868 msgid "Dropdown" msgstr "Dropdown" -#: inc/field.class.php:864 +#: inc/field.class.php:869 msgid "Yes/No" msgstr "Da/Nu" -#: inc/field.class.php:865 +#: inc/field.class.php:870 msgid "Date" msgstr "Data" -#: inc/field.class.php:866 +#: inc/field.class.php:871 msgid "Date & time" msgstr "Data & time" @@ -164,11 +164,11 @@ msgstr "" msgid "Some URL fields contains invalid links" msgstr "" -#: inc/labeltranslation.class.php:129 +#: inc/labeltranslation.class.php:137 msgid "Language" msgstr "" -#: inc/labeltranslation.class.php:130 +#: inc/labeltranslation.class.php:138 msgid "Label" msgstr "" diff --git a/locales/ru_RU.po b/locales/ru_RU.po index d171647c..0c75767c 100644 --- a/locales/ru_RU.po +++ b/locales/ru_RU.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"POT-Creation-Date: 2018-08-21 14:44+0000\n" "PO-Revision-Date: 2018-06-28 08:23+0000\n" "Last-Translator: Cédric Anne\n" "Language-Team: Russian (Russia) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/ru_RU/)\n" @@ -45,63 +45,63 @@ msgstr "Поле" msgid "Fields" msgstr "Поля" -#: inc/field.class.php:290 +#: inc/field.class.php:295 msgid "Add a new field" msgstr "Добавить новое поле" -#: inc/field.class.php:294 +#: inc/field.class.php:299 msgid "No field for this block" msgstr "Нет поля для этого блока" -#: inc/field.class.php:306 inc/field.class.php:419 +#: inc/field.class.php:311 inc/field.class.php:424 msgid "Read only" msgstr "Только чтение" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure" msgstr "Настройка" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure fields values" msgstr "Настрить поля значений" -#: inc/field.class.php:712 +#: inc/field.class.php:717 msgid "show" msgstr "показать" -#: inc/field.class.php:858 +#: inc/field.class.php:863 msgid "Header" msgstr "Заголовок" -#: inc/field.class.php:859 +#: inc/field.class.php:864 msgid "Text (single line)" msgstr "Тест (одна строка)" -#: inc/field.class.php:860 +#: inc/field.class.php:865 msgid "Text (multiples lines)" msgstr "Текст (многострочный)" -#: inc/field.class.php:861 +#: inc/field.class.php:866 msgid "Number" msgstr "Номер" -#: inc/field.class.php:862 +#: inc/field.class.php:867 msgid "URL" msgstr "URL" -#: inc/field.class.php:863 +#: inc/field.class.php:868 msgid "Dropdown" msgstr "Выпадающий список" -#: inc/field.class.php:864 +#: inc/field.class.php:869 msgid "Yes/No" msgstr "Да/Нет" -#: inc/field.class.php:865 +#: inc/field.class.php:870 msgid "Date" msgstr "Дата" -#: inc/field.class.php:866 +#: inc/field.class.php:871 msgid "Date & time" msgstr "Дата и время" @@ -165,11 +165,11 @@ msgstr "Некоторые числовые поля содержат не то msgid "Some URL fields contains invalid links" msgstr "Некоторый URL полей содержат недействительные ссылки" -#: inc/labeltranslation.class.php:129 +#: inc/labeltranslation.class.php:137 msgid "Language" msgstr "Язык" -#: inc/labeltranslation.class.php:130 +#: inc/labeltranslation.class.php:138 msgid "Label" msgstr "Метка" diff --git a/locales/tr_TR.po b/locales/tr_TR.po index 55f69a08..128c71f2 100644 --- a/locales/tr_TR.po +++ b/locales/tr_TR.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Kaya Zeren , 2015-2017 +# Kaya Zeren , 2015-2018 msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-28 08:22+0000\n" -"PO-Revision-Date: 2018-06-28 08:23+0000\n" -"Last-Translator: Cédric Anne\n" +"POT-Creation-Date: 2018-08-21 14:44+0000\n" +"PO-Revision-Date: 2018-07-12 13:37+0000\n" +"Last-Translator: Kaya Zeren \n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/tr_TR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,63 +43,63 @@ msgstr "Alan" msgid "Fields" msgstr "Alanlar" -#: inc/field.class.php:290 +#: inc/field.class.php:295 msgid "Add a new field" msgstr "Alan ekle" -#: inc/field.class.php:294 +#: inc/field.class.php:299 msgid "No field for this block" msgstr "Bu blokta henüz bir alan yok" -#: inc/field.class.php:306 inc/field.class.php:419 +#: inc/field.class.php:311 inc/field.class.php:424 msgid "Read only" msgstr "Salt okunur" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure" msgstr "Ayarlar" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure fields values" msgstr "Alan değerleri ayarları" -#: inc/field.class.php:712 +#: inc/field.class.php:717 msgid "show" msgstr "görüntüle" -#: inc/field.class.php:858 +#: inc/field.class.php:863 msgid "Header" msgstr "Üst Bilgi" -#: inc/field.class.php:859 +#: inc/field.class.php:864 msgid "Text (single line)" msgstr "Metin (tek satır)" -#: inc/field.class.php:860 +#: inc/field.class.php:865 msgid "Text (multiples lines)" msgstr "Metin (birden çok satır)" -#: inc/field.class.php:861 +#: inc/field.class.php:866 msgid "Number" msgstr "Sayı" -#: inc/field.class.php:862 +#: inc/field.class.php:867 msgid "URL" msgstr "İnternet Adresi" -#: inc/field.class.php:863 +#: inc/field.class.php:868 msgid "Dropdown" msgstr "Açılan Kutu" -#: inc/field.class.php:864 +#: inc/field.class.php:869 msgid "Yes/No" msgstr "Evet/Hayır" -#: inc/field.class.php:865 +#: inc/field.class.php:870 msgid "Date" msgstr "Tarih" -#: inc/field.class.php:866 +#: inc/field.class.php:871 msgid "Date & time" msgstr "Tarih ve Saat" @@ -119,13 +119,13 @@ msgstr "İlişkilendirilmiş bir bileşen tipi olmadan bir blok eklenemez" msgid "" "You cannot add several blocks with type 'Insertion in the form' on same " "object" -msgstr "Aynı nesne üzerine 'forma eklensin' türünde bir kaç blok eklenemez" +msgstr "Aynı nesne üzerine 'Forma eklensin' türünde bir kaç blok eklenemez" #: inc/container.class.php:350 msgid "" "You cannot add several blocks with type 'Insertion in the form of a specific" " tab' on same object tab" -msgstr "" +msgstr "Aynı nesne sekmesi üzerine 'Forma sekme olarak eklensin' türünde bir kaç blok eklenemez" #: inc/container.class.php:372 msgid "You cannot add several blocs with identical name on same object" @@ -163,11 +163,11 @@ msgstr "Bazı sayısal alanlarda sayısal olmayan değerler var" msgid "Some URL fields contains invalid links" msgstr "Bazı İnternet adresi alanlarında geçersiz bağlantılar var" -#: inc/labeltranslation.class.php:129 +#: inc/labeltranslation.class.php:137 msgid "Language" msgstr "Dil" -#: inc/labeltranslation.class.php:130 +#: inc/labeltranslation.class.php:138 msgid "Label" msgstr "Etiket" diff --git a/locales/zh_CN.po b/locales/zh_CN.po index cb7a599b..67b4b41c 100644 --- a/locales/zh_CN.po +++ b/locales/zh_CN.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# 杜哥 , 2018 +# liAnGjiA , 2018 msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"POT-Creation-Date: 2018-08-21 14:44+0000\n" "PO-Revision-Date: 2018-07-01 15:42+0000\n" -"Last-Translator: 杜哥 \n" +"Last-Translator: liAnGjiA \n" "Language-Team: Chinese (China) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,63 +43,63 @@ msgstr "字段" msgid "Fields" msgstr "字段" -#: inc/field.class.php:290 +#: inc/field.class.php:295 msgid "Add a new field" msgstr "添加新字段" -#: inc/field.class.php:294 +#: inc/field.class.php:299 msgid "No field for this block" msgstr "此区域无字段" -#: inc/field.class.php:306 inc/field.class.php:419 +#: inc/field.class.php:311 inc/field.class.php:424 msgid "Read only" msgstr "只读" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure" msgstr "设置" -#: inc/field.class.php:396 +#: inc/field.class.php:401 msgid "Configure fields values" msgstr "设置字段值" -#: inc/field.class.php:712 +#: inc/field.class.php:717 msgid "show" msgstr "显示" -#: inc/field.class.php:858 +#: inc/field.class.php:863 msgid "Header" msgstr "头部" -#: inc/field.class.php:859 +#: inc/field.class.php:864 msgid "Text (single line)" msgstr "文本（单行）" -#: inc/field.class.php:860 +#: inc/field.class.php:865 msgid "Text (multiples lines)" msgstr "文本（多行）" -#: inc/field.class.php:861 +#: inc/field.class.php:866 msgid "Number" msgstr "整数" -#: inc/field.class.php:862 +#: inc/field.class.php:867 msgid "URL" msgstr "网址" -#: inc/field.class.php:863 +#: inc/field.class.php:868 msgid "Dropdown" msgstr "拖动" -#: inc/field.class.php:864 +#: inc/field.class.php:869 msgid "Yes/No" msgstr "是/否" -#: inc/field.class.php:865 +#: inc/field.class.php:870 msgid "Date" msgstr "日期" -#: inc/field.class.php:866 +#: inc/field.class.php:871 msgid "Date & time" msgstr "时间&日期" @@ -163,11 +163,11 @@ msgstr "一些数值字段包含非数值" msgid "Some URL fields contains invalid links" msgstr "有些URL字段包含无效链接" -#: inc/labeltranslation.class.php:129 +#: inc/labeltranslation.class.php:137 msgid "Language" msgstr "语言" -#: inc/labeltranslation.class.php:130 +#: inc/labeltranslation.class.php:138 msgid "Label" msgstr "标签" From 4267c99591eec0ee9ebc03c4601072fb10e01b5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Tue, 21 Aug 2018 16:45:41 +0200 Subject: [PATCH 7/9] Update locales --- locales/cs_CZ.mo | Bin 3579 -> 3579 bytes locales/en_GB.mo | Bin 3172 -> 3172 bytes locales/en_US.mo | Bin 3254 -> 3254 bytes locales/es_ES.mo | Bin 2195 -> 2195 bytes locales/fr_FR.mo | Bin 3554 -> 3554 bytes locales/pl_PL.mo | Bin 3321 -> 3321 bytes locales/pt_BR.mo | Bin 3232 -> 3232 bytes locales/ro_RO.mo | Bin 1483 -> 1483 bytes locales/ru_RU.mo | Bin 4048 -> 4048 bytes locales/tr_TR.mo | Bin 3140 -> 3370 bytes locales/zh_CN.mo | Bin 3155 -> 3157 bytes 11 files changed, 0 insertions(+), 0 deletions(-) diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo index ea64a45239d8f9ca08491ff7533d42602337ac06..ad456a72fd541017280e30afa37503ebf580c097 100644 GIT binary patch delta 23 ecmew@{aboN4?CBIu92aFp^24=$>wS7scZmZiU%YB delta 23 ecmew@{aboN4?CBcu91a;frXWk(dKFFscZmZzy~M* diff --git a/locales/en_GB.mo b/locales/en_GB.mo index 9586c46f1da4aeccf99704d5e8301270311a94eb..ef30b97e8eef36341435d7725b13b0008385389a 100644 GIT binary patch delta 38 lcmaDN@kC-nJ3E(!u92aFp^24=$>fRba!B0GJK0yW007!03X}i< delta 38 lcmaDN@kC-nJ3E(|u91a;frXWk(d3Eja!B0GJK0yW007#}3Y-7{ diff --git a/locales/en_US.mo b/locales/en_US.mo index a8a5f386fbdaee7957a380cd1e537dfe76ab2d26..60a95d89d2be8c535c978092a2910d5ad33e3c3c 100644 GIT binary patch delta 23 ecmdlcxlM9I4?CBIu92aFp^24=$>wS73akKC&jwHc delta 23 ecmdlcxlM9I4?CBcu91a;frXWk(dKFF3akKD1qM_A diff --git a/locales/es_ES.mo b/locales/es_ES.mo index 5f19c5aedc11f3971a9371024a7988041e6af844..c25802b175256418f7fb79eb1ec2d5b447196eae 100644 GIT binary patch delta 23 fcmbO%I9YJR1{N+0T_ZyULlY|#lg+zWZZZP^QpX1K delta 23 fcmbO%I9YJR1{N+eT_Xzx0}Cr7qs_ZmZZZP^QvC+^ diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo index 30ffe25facea302f78e03c82d3174841e4fd6ffb..0d252513e3cb771dbe4f44cea322508fe12a922d 100644 GIT binary patch delta 23 ecmaDP{YZL44?CBIu92aFp^24=$>wS7K5PJ93|3WwFaaB delta 18 Zcmew<`BQR(IQwLKc1}j4&5GxtN=4D1hoJF diff --git a/locales/ro_RO.mo b/locales/ro_RO.mo index 8fc8a63a8ecf5121a6e4a55dbbd6e0a512a435b7..7157f5c09e97eb45adc812b7854d64b0d4169b75 100644 GIT binary patch delta 23 ecmX@jeVTiNIWw1qu92aFp^24=$!169E+zm_QU((M delta 18 ZcmX@jeVTiNIrHRrW==+<&5q1nOaMAI1xo+` diff --git a/locales/ru_RU.mo b/locales/ru_RU.mo index cd239ae712057cadcd7643215cc2e6e2721e695a..6be4635d83aca8f7f92bdabd191a0c255d7a837a 100644 GIT binary patch delta 23 ecmca0e?fkOI6Iexu92aFp^24=$!10N^&9|FRt7i# delta 18 Zcmca0e?fkOIQwLKc1}j4&5G>nIRHAa1yle4 diff --git a/locales/tr_TR.mo b/locales/tr_TR.mo index 555e8b6704e523952119aa65692d3f103dcfec17..0436460909aaf4e6676afaff54a27828f5d1dbe8 100644 GIT binary patch delta 839 zcmXZaO=uHA6u|M>P1@KbMP0;d(&!Xx7h6+J6HQG*Yd{pL7SUc558c+K#AXwk%^~e2 z=(!-ccn}mXg5beR3s&$}y?F3aLBtPGJb21g=t2BH?XbJQnaRw&nKyZJ;CZ6`%?dwI z6q~o7cg9fa6t0?lD6=7@cB6w4TtW+%u?ttR2k&DaKEg1rV+>#6E_{nJ{ylc%hyS+K zXDY*V{J;|SGFt{tp-jAj2k|;4(MJh%4`rceC>wZz3EaRT+`_}SjVCa{qJ&UWxF4s{ zQf;MNDn&Y4I|J772<;6Vz%M9){$LKfXxzdAPU91t#10ZmjgqEKvY18L*l$h|MT3SI zM;X_L5#pB!-&6UOczsRg?*{C|BU3Eac$`ws0JuB70C@QBL|3W!+yWnK7A^ z!W2rJBDUp@%2bB&GRjF>_%D^1r@e(TA;w_o-;44eIF1>d#67r#lA*hJ8ebxh>hLM! zHr~WiT&WBAFwRX#>c7*$qf#83%&EcPj+r!$29M36F%*0<7Yuu?9I``!6}I--x?a=1 zZUUn9P92x$J1jOoyiq)xnLl2sGLt{#&jlI$mT~*Qlgg}znPwCI5ofO zH0zCmzUVAF`i9$ZYr3>ZeMPEg7d)p@9i6Xx6KmDTwXo&8i=OLO^yX`Ruhd*^2g#mf P@G*AAw9g0cVk>_ERrGAr delta 737 zcmYMxODIH97{Ku}cZOkH(JZ{iGp{1A@tTG(S%@UU%0lwqOtC`h78?sGU5|ybVS&=f zG$J*dnT=T4*kEOW!pcHY{$HltI`?<(>3rXJ&UcTpq8Y}c)3&L2N*LLUZi`a&xTx{s z>9s1Af_-Sm5p?1-#^E9+;u5CgD%x-#lkgA|Fod!{jPV%#(@@t;%2>F?X8b|f=p~B; zwqYiAq6kP&dY~0*nvTmPJg40jXLM1WAtKOb6JYa zW39d*{wa4prn_KqW|Ib=8Y){wQBZp(N)1&!5zkfXV RY45k0Z+fCuI$@sZ3%}xYRucdK diff --git a/locales/zh_CN.mo b/locales/zh_CN.mo index 93e3b7c4a79a149da0923aec03f629aea967fac1..e27c82853e57f8e300138cd75f8961554227312f 100644 GIT binary patch delta 353 zcmcaCaaCeN2xI*=Mg|6Bb_NE11_p*#91ILRK>8PyX6IyJU<2|+ptLlQ2B}km@{NEr zFOY8u<-0>^KPVjvrDK4!GEiMIkTwOU(1lZly?%R<-4P{Gi|%EV;y VG>Gl0Q&ja6w=iB@8W{Vx`(dFGz6j6JQd64E_=@IfI Date: Thu, 23 Aug 2018 11:21:51 +0200 Subject: [PATCH 8/9] =?UTF-8?q?l10n=20=E2=80=93=20added=20Czech=20translat?= =?UTF-8?q?ion=20into=20xml=20data?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added short and long description as well as language code and tags in Czech language. Sorted alphabetically to correct displaying order on plugins.glpi-project.org --- plugin.xml | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/plugin.xml b/plugin.xml index 4629b9e7..d07c140a 100644 --- a/plugin.xml +++ b/plugin.xml @@ -5,12 +5,37 @@ https://raw.githubusercontent.com/pluginsGLPI/fields/master/plugin.png - The fields plugin allows you to add custom fields on glpi types : tickets, computers, users... - Le plugin 'Champs supplémentaires' (Fields) permet d’ajouter des champs personnalisés sur les différents objets gérés par GLPI : tickets, ordinateurs, utilisateurs... + Zásuvný modul kolonky umožňuje přidávat vlastní kolonky do glpi typů: požadavky, počítače, uživatelé… + The fields plugin allows you to add custom fields on glpi types : tickets, computers, users… + Le plugin 'Champs supplémentaires' (Fields) permet d’ajouter des champs personnalisés sur les différents objets gérés par GLPI : tickets, ordinateurs, utilisateurs… + +Zásuvný modul kolonky umožňuje přidávat vlastní kolonky do glpi typů: požadavky, počítače, uživatelé… + +Je možné přidat další údaje do: + +* Karty objektu +* Hlavního formuláře objektu (nad tlačítko uložit) +* Formuláře karty (varování – tato funkce je experimentální) + +MOžné typy kolonek jsou: + +* Hlavička (blok titulku) +* Text (jeden řádek) +* Text (více řádek) +* Číslo +* Rozbalovací nabídka (vždy stromová rozbalovací nabídka) +* Ano/Ne +* Datum +* Datum/hodina +* Seznam Glpi uživatelů + +Je k dispozici [skript pro migraci](https://github.com/pluginsGLPI/customfields/blob/master/scripts/migrate-to-fields.php) z modulu „customfields“. +**VAROVÁNÍ: tento skript je experimentální a potřebuje být ještě více otestován. Vřele doporučujeme před jeho použitím zálohvat data** + -The fields plugin allows you to add custom fields on glpi types : tickets, computers, users... +The fields plugin allows you to add custom fields on glpi types : tickets, computers, users… Addionnal data can be added : @@ -183,17 +208,21 @@ Il existe un [script de migration](https://github.com/pluginsGLPI/customfields/b + cs_CZ en_GB fr_FR GPL v2+ + + vlastní kolonky + custom fields - + champs personnalisés - + https://github.com/pluginsGLPI/fields/raw/0.84/bugfixes/documentation/pics/fields_bloc.png From b4c0273f66763bf968fc7622b49adb1f137d617a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Tue, 4 Sep 2018 16:29:55 +0200 Subject: [PATCH 9/9] Add 1.8.2 version definition --- plugin.xml | 4 ++++ setup.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index d07c140a..d3928972 100644 --- a/plugin.xml +++ b/plugin.xml @@ -97,6 +97,10 @@ Il existe un [script de migration](https://github.com/pluginsGLPI/customfields/b Johan Cwiklinski + + 1.8.2 + 9.3 + 1.8.1 9.3 diff --git a/setup.php b/setup.php index d4a1ccc8..117915ce 100644 --- a/setup.php +++ b/setup.php @@ -26,7 +26,7 @@ -------------------------------------------------------------------------- */ -define ('PLUGIN_FIELDS_VERSION', '1.8.1'); +define ('PLUGIN_FIELDS_VERSION', '1.8.2'); // Minimal GLPI version, inclusive define("PLUGIN_FIELDS_MIN_GLPI", "9.3");