From 21ab730717e41f3d8cc84da994ff7a2f08ee0835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 11 May 2018 17:10:26 +0200 Subject: [PATCH 1/5] Use new methods for search options --- inc/object.class.php | 112 ++++++++++++++----------- inc/type.class.php | 195 +++++++++++++++++++++++++++---------------- setup.php | 4 +- 3 files changed, 185 insertions(+), 126 deletions(-) diff --git a/inc/object.class.php b/inc/object.class.php index 01712e54..c09b5d2a 100644 --- a/inc/object.class.php +++ b/inc/object.class.php @@ -753,13 +753,7 @@ static function showPrevisualisationForm(PluginGenericobjectType $type) { } } - - function getSearchOptions() { - return $this->getObjectSearchOptions(); - } - - - function getObjectSearchOptions() { + function rawSearchOptions() { global $DB, $GO_FIELDS, $GO_BLACKLIST_FIELDS; $datainjection_blacklisted = ['id', 'date_mod', 'entities_id', 'date_creation']; @@ -767,8 +761,13 @@ function getObjectSearchOptions() { 'entities_id' => 80, 'is_recursive' => 86, 'notepad' => 90, 'date_creation' => 121]; $index = 3; + $options = []; - $options['common'] = __('Characteristics'); + + $options[] = [ + 'id' => 'common', + 'name' => __('Characteristics'), + ]; $table = getTableForItemType(get_called_class()); @@ -780,6 +779,10 @@ function getObjectSearchOptions() { $this->objecttype->fields['itemtype'] ); + if ($field == 'is_deleted') { + continue; + } + //Some fields have fixed index values... $currentindex = $index; if (isset($index_exceptions[$field])) { @@ -789,9 +792,9 @@ function getObjectSearchOptions() { $currentindex++; } - if ($field == 'is_deleted') { - continue; - } + $option = [ + 'id' => $currentindex, + ]; $item = new $this->objecttype->fields['itemtype']; @@ -806,7 +809,7 @@ function getObjectSearchOptions() { } if (preg_match("/(s_id_)/", $field)) { - $options[$currentindex]['linkfield'] = $field; + $option['linkfield'] = $field; } if ($tmp != '') { @@ -814,34 +817,33 @@ function getObjectSearchOptions() { $tmpobj = new $itemtype(); //Set table - $options[$currentindex]['table'] = $tmp; + $option['table'] = $tmp; //Set field if ($tmpobj instanceof CommonTreeDropdown) { - $options[$currentindex]['field'] = 'completename'; + $option['field'] = 'completename'; } else { - $options[$currentindex]['field'] = 'name'; + $option['field'] = 'name'; } } else { - $options[$currentindex]['table'] = $table; - $options[$currentindex]['field'] = $field; + $option['table'] = $table; + $option['field'] = $field; } - $options[$currentindex]['name'] = $searchoption['name']; + $option['name'] = $searchoption['name']; //Massive action or not if (isset($searchoption['massiveaction'])) { - $options[$currentindex]['massiveaction'] - = $searchoption['massiveaction']; + $option['massiveaction'] = $searchoption['massiveaction']; } //Datainjection option if (!in_array($field, $datainjection_blacklisted)) { - $options[$currentindex]['injectable'] = 1; + $option['injectable'] = 1; } else { - $options[$currentindex]['injectable'] = 0; + $option['injectable'] = 0; } //Field type @@ -849,87 +851,97 @@ function getObjectSearchOptions() { default: case "varchar(255)": if ($field == 'name') { - $options[$currentindex]['datatype'] = 'itemlink'; - $options[$currentindex]['itemlink_type'] = get_called_class(); - $options[$currentindex]['massiveaction'] = false; + $option['datatype'] = 'itemlink'; + $option['itemlink_type'] = get_called_class(); + $option['massiveaction'] = false; } else { if (isset($searchoption['datatype']) && $searchoption['datatype'] == 'weblink') { - $options[$currentindex]['datatype'] = 'weblink'; + $option['datatype'] = 'weblink'; } else { - $options[$currentindex]['datatype'] = 'string'; + $option['datatype'] = 'string'; } } if ($item->canUsePluginDataInjection()) { //Datainjection specific - $options[$currentindex]['checktype'] = 'text'; - $options[$currentindex]['displaytype'] = 'text'; + $option['checktype'] = 'text'; + $option['displaytype'] = 'text'; } break; case "tinyint(1)": - $options[$currentindex]['datatype'] = 'bool'; + $option['datatype'] = 'bool'; if ($item->canUsePluginDataInjection()) { //Datainjection specific - $options[$currentindex]['displaytype'] = 'bool'; + $option['displaytype'] = 'bool'; } break; case "text": case "longtext": - $options[$currentindex]['datatype'] = 'text'; + $option['datatype'] = 'text'; if ($item->canUsePluginDataInjection()) { //Datainjection specific - $options[$currentindex]['displaytype'] = 'multiline_text'; + $option['displaytype'] = 'multiline_text'; } break; case "int(11)": if ($tmp != '') { - $options[$currentindex]['datatype'] = 'dropdown'; + $option['datatype'] = 'dropdown'; } else { - $options[$currentindex]['datatype'] = 'integer'; + $option['datatype'] = 'integer'; } if ($item->canUsePluginDataInjection()) { if ($tmp != '') { - $options[$currentindex]['displaytype'] = 'dropdown'; - $options[$currentindex]['checktype'] = 'text'; + $option['displaytype'] = 'dropdown'; + $option['checktype'] = 'text'; } else { //Datainjection specific - $options[$currentindex]['displaytype'] = 'dropdown_integer'; - $options[$currentindex]['checktype'] = 'integer'; + $option['displaytype'] = 'dropdown_integer'; + $option['checktype'] = 'integer'; } } break; case "float": case "decimal": - $options[$currentindex]['datatype'] = $values['Type']; + $option['datatype'] = $values['Type']; if ($item->canUsePluginDataInjection()) { //Datainjection specific - $options[$currentindex]['display'] = 'text'; - $options[$currentindex]['checktype'] = $values['Type']; + $option['display'] = 'text'; + $option['checktype'] = $values['Type']; } break; case "date": - $options[$currentindex]['datatype'] = 'date'; + $option['datatype'] = 'date'; if ($item->canUsePluginDataInjection()) { //Datainjection specific - $options[$currentindex]['displaytype'] = 'date'; - $options[$currentindex]['checktype'] = 'date'; + $option['displaytype'] = 'date'; + $option['checktype'] = 'date'; } break; case "datetime": - $options[$currentindex]['datatype'] = 'datetime'; + $option['datatype'] = 'datetime'; if ($item->canUsePluginDataInjection()) { //Datainjection specific - $options[$currentindex]['displaytype'] = 'date'; - $options[$currentindex]['checktype'] = 'date'; + $option['displaytype'] = 'date'; + $option['checktype'] = 'date'; } if ($field == 'date_mod') { - $options[$currentindex]['massiveaction'] = false; + $option['massiveaction'] = false; } break; } + + $options[] = $option; + $index = $currentindex + 1; } - ksort($options); + + usort( + $options, + function ($a, $b) { + return ($a['id'] < $b['id']) ? -1 : 1; + } + ); + return $options; } diff --git a/inc/type.class.php b/inc/type.class.php index d5a9e7e1..e237358a 100644 --- a/inc/type.class.php +++ b/inc/type.class.php @@ -281,80 +281,127 @@ public function post_deleteItem() { } - function getSearchOptions() { - $sopt['common'] = __("Objects management", "genericobject"); - - $sopt[1]['table'] = $this->getTable(); - $sopt[1]['field'] = 'name'; - $sopt[1]['name'] = __("Model"); - $sopt[1]['datatype'] = 'itemlink'; - - $sopt[5]['table'] = $this->getTable(); - $sopt[5]['field'] = 'is_active'; - $sopt[5]['name'] = __("Active"); - $sopt[5]['datatype'] = 'bool'; - - $sopt[6]['table'] = $this->getTable(); - $sopt[6]['field'] = 'use_tickets'; - $sopt[6]['name'] = __("Associable to a ticket"); - $sopt[6]['datatype'] = 'bool'; - - $sopt[9]['table'] = $this->getTable(); - $sopt[9]['field'] = 'use_history'; - $sopt[9]['name'] = _sx('button', 'Use')." ".__("Historical"); - $sopt[9]['datatype'] = 'bool'; - - $sopt[13]['table'] = $this->getTable(); - $sopt[13]['field'] = 'use_infocoms'; - $sopt[13]['name'] = _sx('button', 'Use')." ".__("Financial and administratives information"); - $sopt[13]['datatype'] = 'bool'; - - $sopt[14]['table'] = $this->getTable(); - $sopt[14]['field'] = 'use_documents'; - $sopt[14]['name'] = _sx('button', 'Use')." "._n("Document", "Documents", 2); - $sopt[14]['datatype'] = 'bool'; - - $sopt[15]['table'] = $this->getTable(); - $sopt[15]['field'] = 'use_loans'; - $sopt[15]['name'] = _sx('button', 'Use')." "._n("Reservation", "Reservations", 2); - $sopt[15]['datatype'] = 'bool'; - - $sopt[16]['table'] = $this->getTable(); - $sopt[16]['field'] = 'use_contracts'; - $sopt[16]['name'] = _sx('button', 'Use')." "._n("Contract", "Contracts", 2); - $sopt[16]['datatype'] = 'bool'; - - $sopt[17]['table'] = $this->getTable(); - $sopt[17]['field'] = 'use_unicity'; - $sopt[17]['name'] = _sx('button', 'Use')." ".__("Fields unicity"); - $sopt[17]['datatype'] = 'bool'; - - $sopt[18]['table'] = $this->getTable(); - $sopt[18]['field'] = 'use_global_search'; - $sopt[18]['name'] = __("Global search"); - $sopt[18]['datatype'] = 'bool'; - - $sopt[19]['table'] = 'glpi_plugin_genericobject_typefamilies'; - $sopt[19]['field'] = 'name'; - $sopt[19]['name'] = __('Family of type of objects', 'genericobject'); - $sopt[19]['datatype'] = 'dropdown'; - - $sopt[20]['table'] = $this->getTable(); - $sopt[20]['field'] = 'use_projects'; - $sopt[20]['name'] = _n('Project', 'Projects', 2); - $sopt[20]['datatype'] = 'bool'; - - $sopt[21]['table'] = $this->getTable(); - $sopt[21]['field'] = 'date_mod'; - $sopt[21]['name'] = __('Last update'); - $sopt[21]['datatype'] = 'datetime'; - $sopt[21]['massiveaction'] = false; - - $sopt[121]['table'] = $this->getTable(); - $sopt[121]['field'] = 'date_creation'; - $sopt[121]['name'] = __('Creation date'); - $sopt[121]['datatype'] = 'datetime'; - $sopt[121]['massiveaction'] = false; + function rawSearchOptions() { + $sopt = []; + + $sopt[] = [ + 'id' => 'common', + 'name' => __("Objects management", "genericobject"), + ]; + + $sopt[] = [ + 'id' => 1, + 'table' => $this->getTable(), + 'field' => 'name', + 'name' => __('Model'), + 'datatype' => 'itemlink', + ]; + + $sopt[] = [ + 'id' => 5, + 'table' => $this->getTable(), + 'field' => 'is_active', + 'name' => __('Active'), + 'datatype' => 'bool', + ]; + + $sopt[] = [ + 'id' => 6, + 'table' => $this->getTable(), + 'field' => 'use_tickets', + 'name' => __('Associable to a ticket'), + 'datatype' => 'bool', + ]; + + $sopt[] = [ + 'id' => 9, + 'table' => $this->getTable(), + 'field' => 'use_history', + 'name' => _sx('button', 'Use') . ' ' . __('Historical'), + 'datatype' => 'bool', + ]; + + $sopt[] = [ + 'id' => 13, + 'table' => $this->getTable(), + 'field' => 'use_infocoms', + 'name' => _sx('button', 'Use') . ' ' . __('Financial and administratives information'), + 'datatype' => 'bool', + ]; + + $sopt[] = [ + 'id' => 14, + 'table' => $this->getTable(), + 'field' => 'use_documents', + 'name' => _sx('button', 'Use') . ' ' . _n('Document', 'Documents', 2), + 'datatype' => 'bool', + ]; + + $sopt[] = [ + 'id' => 15, + 'table' => $this->getTable(), + 'field' => 'use_loans', + 'name' => _sx('button', 'Use') . ' ' . _n('Reservation', 'Reservations', 2), + 'datatype' => 'bool', + ]; + + $sopt[] = [ + 'id' => 16, + 'table' => $this->getTable(), + 'field' => 'use_contracts', + 'name' => _sx('button', 'Use') . ' ' . _n('Contract', 'Contracts', 2), + 'datatype' => 'bool', + ]; + + $sopt[] = [ + 'id' => 17, + 'table' => $this->getTable(), + 'field' => 'use_unicity', + 'name' => _sx('button', 'Use') . ' ' . __('Fields unicity'), + 'datatype' => 'bool', + ]; + + $sopt[] = [ + 'id' => 18, + 'table' => $this->getTable(), + 'field' => 'use_global_search', + 'name' => __('Global search'), + 'datatype' => 'bool', + ]; + + $sopt[] = [ + 'id' => 19, + 'table' => 'glpi_plugin_genericobject_typefamilies', + 'field' => 'name', + 'name' => __('Family of type of objects', 'genericobject'), + 'datatype' => 'dropdown', + ]; + + $sopt[] = [ + 'id' => 20, + 'table' => $this->getTable(), + 'field' => 'use_projects', + 'name' => _n('Project', 'Projects', 2), + 'datatype' => 'bool', + ]; + + $sopt[] = [ + 'id' => 21, + 'table' => $this->getTable(), + 'field' => 'date_mod', + 'name' => __('Last update'), + 'datatype' => 'datetime', + 'massiveaction' => false, + ]; + + $sopt[] = [ + 'id' => 121, + 'table' => $this->getTable(), + 'field' => 'date_creation', + 'name' => __('Creation date'), + 'datatype' => 'datetime', + 'massiveaction' => false, + ]; return $sopt; } diff --git a/setup.php b/setup.php index d246e844..5963a3fe 100644 --- a/setup.php +++ b/setup.php @@ -38,9 +38,9 @@ define ('PLUGIN_GENERICOBJECT_VERSION', '2.5.2'); // Minimal GLPI version, inclusive -define("PLUGIN_GENERICOBJECT_MIN_GLPI", "9.2"); +define("PLUGIN_GENERICOBJECT_MIN_GLPI", "9.3"); // Maximum GLPI version, exclusive -define("PLUGIN_GENERICOBJECT_MAX_GLPI", "9.3"); +define("PLUGIN_GENERICOBJECT_MAX_GLPI", "9.4"); if (!defined("GENERICOBJECT_DIR")) { define("GENERICOBJECT_DIR", GLPI_ROOT . "/plugins/genericobject"); From 8e4b5044adb5381ea1a55fbc39e39ed011085c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 22 Jun 2018 15:18:08 +0200 Subject: [PATCH 2/5] Use stable dependencies and force compatibility with PHP 5.6 --- .travis.yml | 2 +- composer.json | 9 +- composer.lock | 389 +++++++++++++++++++++++++++++++------------------- 3 files changed, 248 insertions(+), 152 deletions(-) diff --git a/.travis.yml b/.travis.yml index f2963c95..972e75da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: php php: - - 5.5 - 5.6 - 7.0 - 7.1 + - 7.2 - nightly #env: diff --git a/composer.json b/composer.json index b5f16753..e21ea281 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,10 @@ { - "minimum-stability": "dev", - "prefer-stable": true, "require-dev": { - "glpi-project/tools": "^0.1.2" + "glpi-project/tools": "^0.1" + }, + "config": { + "platform": { + "php": "5.6" + } } } diff --git a/composer.lock b/composer.lock index 217584f8..c5147d0a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "44cc6cfa94aea760ec23cb56876bae78", + "content-hash": "1780e587040d1a21844800dc378c2f2e", "packages": [], "packages-dev": [ { "name": "consolidation/annotated-command", - "version": "2.8.2", + "version": "2.8.4", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "e97c38717eae23a2bafcf3f09438290eee6ebeb4" + "reference": "651541a0b68318a2a202bda558a676e5ad92223c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/e97c38717eae23a2bafcf3f09438290eee6ebeb4", - "reference": "e97c38717eae23a2bafcf3f09438290eee6ebeb4", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/651541a0b68318a2a202bda558a676e5ad92223c", + "reference": "651541a0b68318a2a202bda558a676e5ad92223c", "shasum": "" }, "require": { @@ -30,8 +30,9 @@ "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "phpunit/phpunit": "^4.8", - "satooshi/php-coveralls": "^1.0.2 | dev-master", + "g1a/composer-test-scenarios": "^2", + "phpunit/phpunit": "^6", + "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "^2.7" }, "type": "library", @@ -56,32 +57,37 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2017-11-29T16:23:23+00:00" + "time": "2018-05-25T18:04:25+00:00" }, { "name": "consolidation/config", - "version": "1.0.7", + "version": "1.0.11", "source": { "type": "git", "url": "https://github.com/consolidation/config.git", - "reference": "b59a3b9ea750c21397f26a68fd2e04d9580af42e" + "reference": "ede41d946078e97e7a9513aadc3352f1c26817af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/config/zipball/b59a3b9ea750c21397f26a68fd2e04d9580af42e", - "reference": "b59a3b9ea750c21397f26a68fd2e04d9580af42e", + "url": "https://api.github.com/repos/consolidation/config/zipball/ede41d946078e97e7a9513aadc3352f1c26817af", + "reference": "ede41d946078e97e7a9513aadc3352f1c26817af", "shasum": "" }, "require": { "dflydev/dot-access-data": "^1.1.0", - "grasmash/yaml-expander": "^1.1", + "grasmash/expander": "^1", "php": ">=5.4.0" }, "require-dev": { + "g1a/composer-test-scenarios": "^1", "phpunit/phpunit": "^4", "satooshi/php-coveralls": "^1.0", "squizlabs/php_codesniffer": "2.*", - "symfony/console": "^2.5|^3" + "symfony/console": "^2.5|^3|^4", + "symfony/yaml": "^2.8.11|^3|^4" + }, + "suggest": { + "symfony/yaml": "Required to use Consolidation\\Config\\Loader\\YamlConfigLoader" }, "type": "library", "extra": { @@ -105,20 +111,20 @@ } ], "description": "Provide configuration services for a commandline tool.", - "time": "2017-10-25T05:50:10+00:00" + "time": "2018-05-27T01:17:02+00:00" }, { "name": "consolidation/log", - "version": "1.0.5", + "version": "1.0.6", "source": { "type": "git", "url": "https://github.com/consolidation/log.git", - "reference": "dbc7c535f319a4a2d5a5077738f8eb7c10df8821" + "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/log/zipball/dbc7c535f319a4a2d5a5077738f8eb7c10df8821", - "reference": "dbc7c535f319a4a2d5a5077738f8eb7c10df8821", + "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395", + "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395", "shasum": "" }, "require": { @@ -127,8 +133,9 @@ "symfony/console": "^2.8|^3|^4" }, "require-dev": { + "g1a/composer-test-scenarios": "^1", "phpunit/phpunit": "4.*", - "satooshi/php-coveralls": "dev-master", + "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "2.*" }, "type": "library", @@ -153,20 +160,20 @@ } ], "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.", - "time": "2017-11-29T01:44:16+00:00" + "time": "2018-05-25T18:14:39+00:00" }, { "name": "consolidation/output-formatters", - "version": "3.1.13", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "3188461e965b32148c8fb85261833b2b72d34b8c" + "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/3188461e965b32148c8fb85261833b2b72d34b8c", - "reference": "3188461e965b32148c8fb85261833b2b72d34b8c", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/d78ef59aea19d3e2e5a23f90a055155ee78a0ad5", + "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5", "shasum": "" }, "require": { @@ -175,11 +182,17 @@ "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "phpunit/phpunit": "^4.8", - "satooshi/php-coveralls": "^1.0.2 | dev-master", + "g1a/composer-test-scenarios": "^2", + "phpunit/phpunit": "^5.7.27", + "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "^2.7", + "symfony/console": "3.2.3", + "symfony/var-dumper": "^2.8|^3|^4", "victorjonsson/markdowndocs": "^1.3" }, + "suggest": { + "symfony/var-dumper": "For using the var_dump formatter" + }, "type": "library", "extra": { "branch-alias": { @@ -202,25 +215,25 @@ } ], "description": "Format text by applying transformations provided by plug-in formatters.", - "time": "2017-11-29T15:25:38+00:00" + "time": "2018-05-25T18:02:34+00:00" }, { "name": "consolidation/robo", - "version": "dev-master", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "55c68dd3c6e5ca135e0ad45b332e5cfd67a4d833" + "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/55c68dd3c6e5ca135e0ad45b332e5cfd67a4d833", - "reference": "55c68dd3c6e5ca135e0ad45b332e5cfd67a4d833", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/ac563abfadf7cb7314b4e152f2b5033a6c255f6f", + "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f", "shasum": "" }, "require": { "consolidation/annotated-command": "^2.8.2", - "consolidation/config": "^1.0.1", + "consolidation/config": "^1.0.10", "consolidation/log": "~1", "consolidation/output-formatters": "^3.1.13", "grasmash/yaml-expander": "^1.3", @@ -239,7 +252,7 @@ "codeception/aspect-mock": "^1|^2.1.1", "codeception/base": "^2.3.7", "codeception/verify": "^0.3.2", - "g-1-a/composer-test-scenarios": "^2", + "g1a/composer-test-scenarios": "^2", "goaop/framework": "~2.1.2", "goaop/parser-reflection": "^1.1.0", "natxet/cssmin": "3.0.4", @@ -282,7 +295,7 @@ } ], "description": "Modern task runner", - "time": "2018-05-08T13:34:54+00:00" + "time": "2018-05-27T01:42:53+00:00" }, { "name": "container-interop/container-interop", @@ -376,30 +389,30 @@ }, { "name": "glpi-project/coding-standard", - "version": "0.5", + "version": "0.7.1", "source": { "type": "git", "url": "https://github.com/glpi-project/coding-standard.git", - "reference": "e19495c896a01199a2fec2e65b7613310598cf96" + "reference": "1cef37d764aecf8fd7d5d167db25da97e289cb03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/coding-standard/zipball/e19495c896a01199a2fec2e65b7613310598cf96", - "reference": "e19495c896a01199a2fec2e65b7613310598cf96", + "url": "https://api.github.com/repos/glpi-project/coding-standard/zipball/1cef37d764aecf8fd7d5d167db25da97e289cb03", + "reference": "1cef37d764aecf8fd7d5d167db25da97e289cb03", "shasum": "" }, "require": { - "squizlabs/php_codesniffer": "~2.0" + "squizlabs/php_codesniffer": "^3.3" }, "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ - "GPLv3" + "GPL-2.0-or-later" ], "authors": [ { "name": "Teclib'", - "email": "contact@teclib.com", + "email": "glpi@teclib.com", "homepage": "https://teclib.com" } ], @@ -409,27 +422,27 @@ "glpi", "phpcs" ], - "time": "2017-01-06T11:10:46+00:00" + "time": "2018-06-07T08:45:05+00:00" }, { "name": "glpi-project/tools", - "version": "0.1.2", + "version": "0.1.5", "source": { "type": "git", "url": "https://github.com/glpi-project/tools.git", - "reference": "55b3ba30c9c7f32acf5d9e8d6747e1e369809b13" + "reference": "5ff99fa5967b468af3d3ba2d7a69ede1214273ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/tools/zipball/55b3ba30c9c7f32acf5d9e8d6747e1e369809b13", - "reference": "55b3ba30c9c7f32acf5d9e8d6747e1e369809b13", + "url": "https://api.github.com/repos/glpi-project/tools/zipball/5ff99fa5967b468af3d3ba2d7a69ede1214273ea", + "reference": "5ff99fa5967b468af3d3ba2d7a69ede1214273ea", "shasum": "" }, "require": { - "consolidation/robo": "dev-master@dev", - "glpi-project/coding-standard": "0.5", - "natxet/cssmin": "~3.0", - "patchwork/jsqueeze": "~1.0" + "consolidation/robo": "^1.3", + "glpi-project/coding-standard": "^0.7", + "natxet/cssmin": "^3.0", + "patchwork/jsqueeze": "^1.0" }, "bin": [ "tools/plugin-release", @@ -444,13 +457,13 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPLv3" + "GPL-3.0-or-later" ], "authors": [ { "name": "Teclib'", "email": "glpi@teclib.com", - "homepage": "https://teclib.com" + "homepage": "http://teclib-group.com" } ], "description": "Various tools for GLPI and its plugins", @@ -459,20 +472,67 @@ "plugins", "tools" ], - "time": "2017-03-03T14:40:45+00:00" + "time": "2018-06-21T11:59:33+00:00" + }, + { + "name": "grasmash/expander", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/grasmash/expander.git", + "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/grasmash/expander/zipball/95d6037344a4be1dd5f8e0b0b2571a28c397578f", + "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f", + "shasum": "" + }, + "require": { + "dflydev/dot-access-data": "^1.1.0", + "php": ">=5.4" + }, + "require-dev": { + "greg-1-anderson/composer-test-scenarios": "^1", + "phpunit/phpunit": "^4|^5.5.4", + "satooshi/php-coveralls": "^1.0.2|dev-master", + "squizlabs/php_codesniffer": "^2.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Grasmash\\Expander\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matthew Grasmick" + } + ], + "description": "Expands internal property references in PHP arrays file.", + "time": "2017-12-21T22:14:55+00:00" }, { "name": "grasmash/yaml-expander", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/grasmash/yaml-expander.git", - "reference": "3f45a3e1ff1d7ace6544c49f526127318abbb75c" + "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f45a3e1ff1d7ace6544c49f526127318abbb75c", - "reference": "3f45a3e1ff1d7ace6544c49f526127318abbb75c", + "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1", + "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1", "shasum": "" }, "require": { @@ -507,7 +567,7 @@ } ], "description": "Expands internal property references in a yaml file.", - "time": "2017-12-08T17:42:26+00:00" + "time": "2017-12-16T16:06:03+00:00" }, { "name": "league/container", @@ -576,16 +636,16 @@ }, { "name": "natxet/CssMin", - "version": "v3.0.5", + "version": "v3.0.6", "source": { "type": "git", "url": "https://github.com/natxet/CssMin.git", - "reference": "9580f5448f05a82c96cfe6c7063a77807d8ec56d" + "reference": "d5d9f4c3e5cedb1ae96a95a21731f8790e38f1dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/natxet/CssMin/zipball/9580f5448f05a82c96cfe6c7063a77807d8ec56d", - "reference": "9580f5448f05a82c96cfe6c7063a77807d8ec56d", + "url": "https://api.github.com/repos/natxet/CssMin/zipball/d5d9f4c3e5cedb1ae96a95a21731f8790e38f1dd", + "reference": "d5d9f4c3e5cedb1ae96a95a21731f8790e38f1dd", "shasum": "" }, "require": { @@ -619,7 +679,7 @@ "css", "minify" ], - "time": "2017-10-04T16:54:00+00:00" + "time": "2018-01-09T11:15:01+00:00" }, { "name": "patchwork/jsqueeze", @@ -761,64 +821,37 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "2.9.1", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62" + "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62", - "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d86873af43b4aa9d1f39a3601cc0cfcf02b25266", + "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266", "shasum": "" }, "require": { "ext-simplexml": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": ">=5.1.2" + "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "bin": [ - "scripts/phpcs", - "scripts/phpcbf" + "bin/phpcs", + "bin/phpcbf" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "3.x-dev" } }, - "autoload": { - "classmap": [ - "CodeSniffer.php", - "CodeSniffer/CLI.php", - "CodeSniffer/Exception.php", - "CodeSniffer/File.php", - "CodeSniffer/Fixer.php", - "CodeSniffer/Report.php", - "CodeSniffer/Reporting.php", - "CodeSniffer/Sniff.php", - "CodeSniffer/Tokens.php", - "CodeSniffer/Reports/", - "CodeSniffer/Tokenizers/", - "CodeSniffer/DocGenerators/", - "CodeSniffer/Standards/AbstractPatternSniff.php", - "CodeSniffer/Standards/AbstractScopeSniff.php", - "CodeSniffer/Standards/AbstractVariableSniff.php", - "CodeSniffer/Standards/IncorrectPatternException.php", - "CodeSniffer/Standards/Generic/Sniffs/", - "CodeSniffer/Standards/MySource/Sniffs/", - "CodeSniffer/Standards/PEAR/Sniffs/", - "CodeSniffer/Standards/PSR1/Sniffs/", - "CodeSniffer/Standards/PSR2/Sniffs/", - "CodeSniffer/Standards/Squiz/Sniffs/", - "CodeSniffer/Standards/Zend/Sniffs/" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -835,20 +868,20 @@ "phpcs", "standards" ], - "time": "2017-05-22T02:43:20+00:00" + "time": "2018-06-06T23:58:19+00:00" }, { "name": "symfony/console", - "version": "v3.4.1", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "2cdef78de8f54f68ff16a857e710e7302b47d4c7" + "reference": "36f83f642443c46f3cf751d4d2ee5d047d757a27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/2cdef78de8f54f68ff16a857e710e7302b47d4c7", - "reference": "2cdef78de8f54f68ff16a857e710e7302b47d4c7", + "url": "https://api.github.com/repos/symfony/console/zipball/36f83f642443c46f3cf751d4d2ee5d047d757a27", + "reference": "36f83f642443c46f3cf751d4d2ee5d047d757a27", "shasum": "" }, "require": { @@ -869,7 +902,7 @@ "symfony/process": "~3.3|~4.0" }, "suggest": { - "psr/log": "For using the console logger", + "psr/log-implementation": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -904,20 +937,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-12-02T18:20:11+00:00" + "time": "2018-05-16T08:49:21+00:00" }, { "name": "symfony/debug", - "version": "v3.4.1", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "fb2001e5d85f95d8b6ab94ae3be5d2672df128fd" + "reference": "b28fd73fefbac341f673f5efd707d539d6a19f68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/fb2001e5d85f95d8b6ab94ae3be5d2672df128fd", - "reference": "fb2001e5d85f95d8b6ab94ae3be5d2672df128fd", + "url": "https://api.github.com/repos/symfony/debug/zipball/b28fd73fefbac341f673f5efd707d539d6a19f68", + "reference": "b28fd73fefbac341f673f5efd707d539d6a19f68", "shasum": "" }, "require": { @@ -960,20 +993,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-11-21T09:01:46+00:00" + "time": "2018-05-16T14:03:39+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.1", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "ca20b8f9ef149f40ff656d52965f240d85f7a8e4" + "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ca20b8f9ef149f40ff656d52965f240d85f7a8e4", - "reference": "ca20b8f9ef149f40ff656d52965f240d85f7a8e4", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fdd5abcebd1061ec647089c6c41a07ed60af09f8", + "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8", "shasum": "" }, "require": { @@ -1023,24 +1056,25 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-11-09T14:14:31+00:00" + "time": "2018-04-06T07:35:25+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.1", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "de56eee71e0a128d8c54ccc1909cdefd574bad0f" + "reference": "8e03ca3fa52a0f56b87506f38cf7bd3f9442b3a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/de56eee71e0a128d8c54ccc1909cdefd574bad0f", - "reference": "de56eee71e0a128d8c54ccc1909cdefd574bad0f", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/8e03ca3fa52a0f56b87506f38cf7bd3f9442b3a0", + "reference": "8e03ca3fa52a0f56b87506f38cf7bd3f9442b3a0", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { @@ -1072,20 +1106,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-11-19T18:59:05+00:00" + "time": "2018-05-16T08:49:21+00:00" }, { "name": "symfony/finder", - "version": "v3.4.1", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a" + "reference": "472a92f3df8b247b49ae364275fb32943b9656c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/dac8d7db537bac7ad8143eb11360a8c2231f251a", - "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a", + "url": "https://api.github.com/repos/symfony/finder/zipball/472a92f3df8b247b49ae364275fb32943b9656c6", + "reference": "472a92f3df8b247b49ae364275fb32943b9656c6", "shasum": "" }, "require": { @@ -1121,20 +1155,75 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-11-05T16:10:10+00:00" + "time": "2018-05-16T08:49:21+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "time": "2018-04-30T19:57:29+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.6.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296" + "reference": "3296adf6a6454a050679cde90f95350ad604b171" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", - "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", + "reference": "3296adf6a6454a050679cde90f95350ad604b171", "shasum": "" }, "require": { @@ -1146,7 +1235,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -1180,20 +1269,20 @@ "portable", "shim" ], - "time": "2017-10-11T12:05:26+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/process", - "version": "v3.4.1", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea" + "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/db25e810fd5e124085e3777257d0cf4ae533d0ea", - "reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea", + "url": "https://api.github.com/repos/symfony/process/zipball/4cbf2db9abcb01486a21b7a059e03a62fae63187", + "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187", "shasum": "" }, "require": { @@ -1229,24 +1318,25 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-11-22T12:18:49+00:00" + "time": "2018-05-16T08:49:21+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.1", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "f6a99b95b338799645fe9f7880d7d4ca1bf79cc1" + "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/f6a99b95b338799645fe9f7880d7d4ca1bf79cc1", - "reference": "f6a99b95b338799645fe9f7880d7d4ca1bf79cc1", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", + "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/console": "<3.4" @@ -1287,14 +1377,17 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-12-04T18:15:22+00:00" + "time": "2018-05-03T23:18:14+00:00" } ], "aliases": [], - "minimum-stability": "dev", + "minimum-stability": "stable", "stability-flags": [], - "prefer-stable": true, + "prefer-stable": false, "prefer-lowest": false, "platform": [], - "platform-dev": [] + "platform-dev": [], + "platform-overrides": { + "php": "5.6" + } } From c69dee05f861d60a1ff7049d27ed95e895366524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 22 Jun 2018 15:20:16 +0200 Subject: [PATCH 3/5] Fix coding standards violations --- front/type.form.php | 2 +- front/type.php | 90 ++++++++++++++++---------------- inc/commondropdown.class.php | 6 +-- inc/commontreedropdown.class.php | 6 +-- inc/field.class.php | 8 +-- inc/functions.php | 2 +- inc/object.class.php | 2 +- inc/object_item.class.php | 6 +-- inc/profile.class.php | 14 ++--- inc/type.class.php | 16 +++--- inc/typefamily.class.php | 2 +- index.php | 2 +- setup.php | 18 +++---- 13 files changed, 87 insertions(+), 87 deletions(-) diff --git a/front/type.form.php b/front/type.form.php index e06c8528..bfd208c6 100644 --- a/front/type.form.php +++ b/front/type.form.php @@ -31,7 +31,7 @@ $_GET["id"] = ''; } $type = new PluginGenericobjectType(); -$extraparams = array (); +$extraparams = []; if (isset ($_POST["select"]) && $_POST["select"] == "all") { $extraparams["selected"] = "checked"; } diff --git a/front/type.php b/front/type.php index 5f91dbcd..2d1a534c 100644 --- a/front/type.php +++ b/front/type.php @@ -1,45 +1,45 @@ -. - -------------------------------------------------------------------------- - @package genericobject - @author the genericobject plugin team - @copyright Copyright (c) 2010-2011 Order plugin team - @license GPLv2+ - http://www.gnu.org/licenses/gpl.txt - @link https://forge.indepnet.net/projects/genericobject - @link http://www.glpi-project.org/ - @since 2009 - ---------------------------------------------------------------------- */ - -include ("../../../inc/includes.php"); - -if (isset($_GET['itemtype']) - && !isset($_GET['search']) - && !isset($_GET['sort'])) { - $type = new PluginGenericobjectType(); - $type->getFromDBByType($_GET['itemtype']); - Html::redirect(Toolbox::getItemTypeFormURL('PluginGenericobjectType').'?id='.$type->getID()); - -} else if (Session::haveRightsOr('plugin_genericobject_types', [READ, CREATE, UPDATE, PURGE])) { - Html::header(__("Type of objects", "genericobject"), $_SERVER['PHP_SELF'], "config", - "PluginGenericobjectType"); - Search::Show('PluginGenericobjectType'); - Html::footer(); - -} else { - Html::redirect($CFG_GLPI['root_doc']."/front/central.php"); -} +. + -------------------------------------------------------------------------- + @package genericobject + @author the genericobject plugin team + @copyright Copyright (c) 2010-2011 Order plugin team + @license GPLv2+ + http://www.gnu.org/licenses/gpl.txt + @link https://forge.indepnet.net/projects/genericobject + @link http://www.glpi-project.org/ + @since 2009 + ---------------------------------------------------------------------- */ + +include ("../../../inc/includes.php"); + +if (isset($_GET['itemtype']) + && !isset($_GET['search']) + && !isset($_GET['sort'])) { + $type = new PluginGenericobjectType(); + $type->getFromDBByType($_GET['itemtype']); + Html::redirect(Toolbox::getItemTypeFormURL('PluginGenericobjectType').'?id='.$type->getID()); + +} else if (Session::haveRightsOr('plugin_genericobject_types', [READ, CREATE, UPDATE, PURGE])) { + Html::header(__("Type of objects", "genericobject"), $_SERVER['PHP_SELF'], "config", + "PluginGenericobjectType"); + Search::Show('PluginGenericobjectType'); + Html::footer(); + +} else { + Html::redirect($CFG_GLPI['root_doc']."/front/central.php"); +} diff --git a/inc/commondropdown.class.php b/inc/commondropdown.class.php index dc71daa6..9f35a8af 100644 --- a/inc/commondropdown.class.php +++ b/inc/commondropdown.class.php @@ -28,16 +28,16 @@ class PluginGenericobjectCommonDropdown extends CommonDropdown { //Get itemtype name - static function getTypeName($nb=0) { + static function getTypeName($nb = 0) { $class=get_called_class(); return dropdown_getTypeName($class, $nb); } - static function getFormURL($full=true) { + static function getFormURL($full = true) { return Toolbox::getItemTypeFormURL( get_parent_class(get_called_class()), $full) . "?itemtype=".get_called_class(); } - static function getSearchURL($full=true) { + static function getSearchURL($full = true) { return Toolbox::getItemTypeSearchURL( get_parent_class(get_called_class()), $full) . "?itemtype=".get_called_class(); diff --git a/inc/commontreedropdown.class.php b/inc/commontreedropdown.class.php index ed780d9d..8b24d0f8 100644 --- a/inc/commontreedropdown.class.php +++ b/inc/commontreedropdown.class.php @@ -28,17 +28,17 @@ class PluginGenericobjectCommonTreeDropdown extends CommonTreeDropdown { //Get itemtype name - static function getTypeName($nb=0) { + static function getTypeName($nb = 0) { $class=get_called_class(); return dropdown_getTypeName($class, $nb); } - static function getFormURL($full=true) { + static function getFormURL($full = true) { _log("PluginGenericobjectCommonTreeDropdown::getFormURL", get_parent_class(get_called_class())); return Toolbox::getItemTypeFormURL( get_parent_class(get_called_class()), $full) . "?itemtype=".get_called_class(); } - static function getSearchURL($full=true) { + static function getSearchURL($full = true) { _log("PluginGenericobjectCommonTreeDropdown::getSearchURL", get_parent_class(get_called_class())); return Toolbox::getItemTypeSearchURL( get_parent_class(get_called_class()), $full) . "?itemtype=".get_called_class(); diff --git a/inc/field.class.php b/inc/field.class.php index aae50dac..022c2f72 100644 --- a/inc/field.class.php +++ b/inc/field.class.php @@ -218,7 +218,7 @@ static function getFieldName($field, $itemtype, $options, $remove_prefix = false * * @return the dropdown random ID */ - static function dropdownFields($name,$itemtype, $used = []) { + static function dropdownFields($name, $itemtype, $used = []) { global $GO_FIELDS; $dropdown_types = []; @@ -279,7 +279,7 @@ static function dropdownFields($name,$itemtype, $used = []) { * @param $itemtype the itemtype * @return an array which contains the full field definition */ - static function getFieldOptions($field, $itemtype="") { + static function getFieldOptions($field, $itemtype = "") { global $GO_FIELDS; $cleaned_field = preg_replace("/^plugin_genericobject_/", '', $field); @@ -346,7 +346,7 @@ public static function displayFieldDefinition($target, $itemtype, $field, $index * @param field the field to delete * @return nothing */ - public static function addNewField($table, $field, $after=false) { + public static function addNewField($table, $field, $after = false) { global $DB; _log("add", $field, "from", $table); @@ -501,7 +501,7 @@ static function changeFieldOrder($params = []) { } } - public static function checkNecessaryFieldsDelete($itemtype,$field) { + public static function checkNecessaryFieldsDelete($itemtype, $field) { $type = new PluginGenericobjectType(); $type->getFromDBByType($itemtype); diff --git a/inc/functions.php b/inc/functions.php index 3e5a1cd8..9ca93ce7 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -6,7 +6,7 @@ * - PluginGenericobjectCommonDropdown * - PluginGenericobjectCommonTreeDropdown */ -function dropdown_getTypeName($class,$nb=0) { +function dropdown_getTypeName($class, $nb = 0) { global $GO_FIELDS; $fk = getForeignKeyFieldForTable(getTableForItemType($class)); $instance = new $class(); diff --git a/inc/object.class.php b/inc/object.class.php index c09b5d2a..8bdcfb8f 100644 --- a/inc/object.class.php +++ b/inc/object.class.php @@ -33,7 +33,7 @@ class PluginGenericobjectObject extends CommonDBTM { private $cpt = 0; //Get itemtype name - static function getTypeName($nb=0) { + static function getTypeName($nb = 0) { global $LANG; $class = get_called_class(); //Datainjection : Don't understand why I need this trick : need to be investigated ! diff --git a/inc/object_item.class.php b/inc/object_item.class.php index 5f1be5d2..204676bf 100644 --- a/inc/object_item.class.php +++ b/inc/object_item.class.php @@ -37,7 +37,7 @@ class PluginGenericobjectObject_Item extends CommonDBChild { static public $items_id_2 = 'items_id'; //Get itemtype name - static function getTypeName($nb=0) { + static function getTypeName($nb = 0) { global $LANG; $class = get_called_class(); //Datainjection : Don't understand why I need this trick : need to be investigated ! @@ -102,7 +102,7 @@ static function getItemType1() { return $classname::$itemtype_1; } - function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { + function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { if (!$withtemplate) { $itemtypes = self::getLinkedItemTypes(); if (in_array(get_class($item), $itemtypes) || get_class($item) == self::getItemType1()) { @@ -112,7 +112,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { return ''; } - static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtemplate=0) { + static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtemplate = 0) { $itemtypes = self::getLinkedItemTypes(); if (get_class($item) == self::getItemType1()) { self::showItemsForSource($item); diff --git a/inc/profile.class.php b/inc/profile.class.php index 8114b4dc..29ed2152 100644 --- a/inc/profile.class.php +++ b/inc/profile.class.php @@ -32,7 +32,7 @@ function cleanProfiles($id) { $this->deleteByCriteria(['id' => $id]); } - function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { + function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { switch ($item->getType()) { case 'Profile': @@ -44,7 +44,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { } } - static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtemplate=0) { + static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtemplate = 0) { switch ($item->getType()) { case 'Profile': $profile = new self(); @@ -55,7 +55,7 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtempl self::showForItemtype($item); break; } - return TRUE; + return true; } static function showForItemtype($type) { @@ -177,7 +177,7 @@ static function getProfileforItemtype($profiles_id, $itemtype) { function getProfilesFromDB($id, $config = true) { global $DB; - $prof_datas = array (); + $prof_datas = []; foreach (getAllDatasFromTable(getTableForItemType(__CLASS__), "`profiles_id`='" . $id . "'") as $prof) { if ($prof['right'] != "" || $config) { @@ -265,7 +265,7 @@ public static function profileExists($profiles_id, $itemtype = false) { * @param profileID the profile ID * @return nothing */ - public static function createAccess($profiles_id, $itemtype, $first=false) { + public static function createAccess($profiles_id, $itemtype, $first = false) { $rights = getAllDatasFromTable('glpi_profiles'); $profile_right = new ProfileRight(); @@ -311,7 +311,7 @@ public static function getTypesRights() { return $rights; } - public static function installRights($first=false) { + public static function installRights($first = false) { $missing_rights = []; $installed_rights = ProfileRight::getAllPossibleRights(); $right_names = []; @@ -384,7 +384,7 @@ static function install(Migration $migration) { "`profiles_id`='".$right['profiles_id']."' AND `name`='$newrightname'")) { switch ($right['right']) { - case NULL: + case null: case '': $rightvalue = 0; break; diff --git a/inc/type.class.php b/inc/type.class.php index e237358a..19dad269 100644 --- a/inc/type.class.php +++ b/inc/type.class.php @@ -62,7 +62,7 @@ function isEntityAssign() { return false; } - static function getTypeName($nb=0) { + static function getTypeName($nb = 0) { return __("Type of objects", "genericobject"); } @@ -96,7 +96,7 @@ function defineTabs($options = []) { return $tabs; } - function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { + function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { if (!$withtemplate) { switch ($item->getType()) { case __CLASS__ : @@ -106,12 +106,12 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { $obj->getEmpty(); $nb_fields = count($obj->fields); - $tabs = array ( + $tabs = [ 1 => __("Main"), 3 => _n("Field", "Fields", 2), 3 => self::createTabEntry(_n("Field", "Fields", Session::getPluralNumber()), $nb_fields), 5 => __("Preview") - ); + ]; if ($item->canUseDirectConnections()) { $tabs[7] = __("Associated element"); } @@ -122,7 +122,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { } - static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtemplate=0) { + static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtemplate = 0) { if ($item->getType() == __CLASS__) { switch ($tabnum) { case 1 : @@ -1336,7 +1336,7 @@ static function deleteFilesAndClassesForOneItemtype($name) { static function deleteItemtypeReferencesInGLPI($itemtype) { //Delete references to PluginGenericobjectType in the following tables - $itemtypes = array ("Contract_Item", "DisplayPreference", "Document_Item", "SavedSearch", "Log"); + $itemtypes = ["Contract_Item", "DisplayPreference", "Document_Item", "SavedSearch", "Log"]; foreach ($itemtypes as $type) { $item = new $type(); $item->deleteByCriteria(['itemtype' => $itemtype]); @@ -1648,7 +1648,7 @@ static function getTypes($all = false) { } return $mytypes; } else { - return array (); + return []; } } @@ -1669,7 +1669,7 @@ static function getTypesByFamily($all = false) { } return $mytypes; } else { - return array (); + return []; } } diff --git a/inc/typefamily.class.php b/inc/typefamily.class.php index 2f31e5f3..477da4a3 100644 --- a/inc/typefamily.class.php +++ b/inc/typefamily.class.php @@ -32,7 +32,7 @@ class PluginGenericobjectTypeFamily extends CommonDropdown { var $can_be_translated = true; - static function getTypeName($nb=0) { + static function getTypeName($nb = 0) { return __('Family of type of objects', 'genericobject'); } diff --git a/index.php b/index.php index d6e105aa..38f3d74a 100644 --- a/index.php +++ b/index.php @@ -46,7 +46,7 @@ if (count($types) == 1) { //There's only one itemtype ? If yes, then automatically //redirect to the search engine - if (key($types) == NULL) { + if (key($types) == null) { $mytypes = $types; $tmp = array_pop($mytypes); if (count($tmp) == 1) { diff --git a/setup.php b/setup.php index 5963a3fe..bfdaf2b9 100644 --- a/setup.php +++ b/setup.php @@ -115,18 +115,18 @@ function plugin_init_genericobject() { global $PLUGIN_HOOKS, $CFG_GLPI, $GO_BLACKLIST_FIELDS, $GO_FIELDS, $GENERICOBJECT_PDF_TYPES, $GO_LINKED_TYPES, $GO_READONLY_FIELDS, $LOADED_PLUGINS; - $GO_READONLY_FIELDS = array ("is_helpdesk_visible", "comment"); + $GO_READONLY_FIELDS = ["is_helpdesk_visible", "comment"]; - $GO_BLACKLIST_FIELDS = array ("itemtype", "table", "is_deleted", "id", "entities_id", - "is_recursive", "is_template", "notepad", "template_name", - "date_mod", "name", "is_helpdesk_visible", "comment", - "date_creation"); + $GO_BLACKLIST_FIELDS = ["itemtype", "table", "is_deleted", "id", "entities_id", + "is_recursive", "is_template", "notepad", "template_name", + "date_mod", "name", "is_helpdesk_visible", "comment", + "date_creation"]; - $GO_LINKED_TYPES = array ('Computer', 'Phone', 'Peripheral', 'Software', 'Monitor', - 'Printer', 'NetworkEquipment'); + $GO_LINKED_TYPES = ['Computer', 'Phone', 'Peripheral', 'Software', 'Monitor', + 'Printer', 'NetworkEquipment']; $PLUGIN_HOOKS['csrf_compliant']['genericobject'] = true; - $GENERICOBJECT_PDF_TYPES = array (); + $GENERICOBJECT_PDF_TYPES = []; $plugin = new Plugin(); if ($plugin->isInstalled("genericobject") @@ -279,7 +279,7 @@ function plugin_genericobject_includeCommonFields($force = false) { } } -function plugin_genericobject_haveRight($class,$right) { +function plugin_genericobject_haveRight($class, $right) { $right_name = PluginGenericobjectProfile::getProfileNameForItemtype($class); return Session::haveRight($right_name, $right); From 29f84f07bb3fbeee7834d7160b855fbdc92a88d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 22 Jun 2018 15:22:59 +0200 Subject: [PATCH 4/5] Update locales --- .tx/config | 3 +- locales/cs_CZ.mo | Bin 3291 -> 3291 bytes locales/cs_CZ.po | 108 +++++++++++----------- locales/en_GB.mo | Bin 511 -> 2844 bytes locales/en_GB.po | 189 +++++++++++++++++++++----------------- locales/es_ES.mo | Bin 2633 -> 2633 bytes locales/es_ES.po | 106 ++++++++++----------- locales/fr_FR.mo | Bin 3177 -> 3177 bytes locales/fr_FR.po | 108 +++++++++++----------- locales/genericobject.pot | 100 ++++++++++---------- locales/it_IT.mo | Bin 2560 -> 2856 bytes locales/it_IT.po | 117 +++++++++++------------ locales/pl_PL.mo | Bin 1743 -> 1743 bytes locales/pl_PL.po | 106 ++++++++++----------- locales/pt_BR.mo | Bin 2600 -> 2600 bytes locales/pt_BR.po | 106 ++++++++++----------- locales/ro_RO.mo | Bin 2564 -> 2564 bytes locales/ro_RO.po | 106 ++++++++++----------- locales/ru_RU.mo | Bin 2279 -> 2279 bytes locales/ru_RU.po | 106 ++++++++++----------- locales/tr_TR.mo | Bin 3023 -> 3023 bytes locales/tr_TR.po | 106 ++++++++++----------- 22 files changed, 643 insertions(+), 618 deletions(-) diff --git a/.tx/config b/.tx/config index 7e950bf7..0778e99b 100644 --- a/.tx/config +++ b/.tx/config @@ -1,9 +1,8 @@ [main] host = https://www.transifex.com -[glpi-project-plugin-genericobject.genericobjectpot] +[glpi-project-plugin-genericobject.genericobject-pot] file_filter = locales/.po source_file = locales/genericobject.pot source_lang = en type = PO -minimum_perc: 100 diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo index 295fc4a6960597be18ddbb55c469c99281253095..75b42952ba33c161be97cc76e94a51f0ffed1504 100644 GIT binary patch delta 44 zcmcaDd0TSB0X6{(T>~>+BO?VvV=E&=Z3BbJ7uck^%ybQbB1Tpw#+$#gJ!1s`A8ZVW delta 44 zcmcaDd0TSB0X6}1T|*;XLt_O)6Dvb=Z3Dx}7uck^jCGC76%0(RObs`GWqZa703Wmr Aj{pDw diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po index 89364339..bd80e307 100644 --- a/locales/cs_CZ.po +++ b/locales/cs_CZ.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Genericobject\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-13 14:17+0100\n" -"PO-Revision-Date: 2018-03-27 05:51+0000\n" +"POT-Creation-Date: 2018-06-22 13:21+0000\n" +"PO-Revision-Date: 2018-06-12 12:43+0000\n" "Last-Translator: Pavel Borecki \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -19,26 +19,17 @@ msgstr "" "Language: cs_CZ\n" "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n" -#: setup.php:188 index.php:58 front/type.form.php:73 front/familylist.php:33 -#: front/familylist.php:41 inc/profile.class.php:39 -#: inc/object_item.class.php:109 inc/type.class.php:285 inc/type.class.php:368 -msgid "Objects management" -msgstr "Správa objektů" - -#: index.php:68 front/familylist.php:37 -msgid "Empty family" -msgstr "Prázdná rodina" - -#: front/commontreedropdown.form.php:36 front/commondropdown.php:11 -#: front/commondropdown.form.php:36 -msgid "The requested dropdown does not exists" -msgstr "Požadovaná rozbalovací nabídka neexistuje" - -#: front/type.php:38 front/object.php:33 inc/profile.class.php:288 +#: front/type.php:38 front/object.php:33 inc/profile.class.php:287 #: inc/type.class.php:66 msgid "Type of objects" msgstr "Typ objektů" +#: front/type.form.php:73 front/familylist.php:33 front/familylist.php:41 +#: index.php:58 inc/object_item.class.php:109 inc/profile.class.php:39 +#: inc/type.class.php:289 inc/type.class.php:415 setup.php:193 +msgid "Objects management" +msgstr "Správa objektů" + #: front/field.form.php:41 msgid "Field(s) deleted successfully" msgstr "Kolonky úspěšně smazány" @@ -47,6 +38,27 @@ msgstr "Kolonky úspěšně smazány" msgid "Field added successfully" msgstr "Kolonka úspěšně přidána" +#: front/commondropdown.php:11 front/commontreedropdown.form.php:36 +#: front/commondropdown.form.php:36 +msgid "The requested dropdown does not exists" +msgstr "Požadovaná rozbalovací nabídka neexistuje" + +#: front/familylist.php:37 index.php:68 +msgid "Empty family" +msgstr "Prázdná rodina" + +#: inc/profile.class.php:141 +msgid "General" +msgstr "Obecné" + +#: inc/profile.class.php:147 +msgid "Objects" +msgstr "Objekty" + +#: inc/profile.class.php:149 +msgid "(No types defined yet)" +msgstr "(Doposud nebyly určené žádné typy)" + #: inc/field.class.php:64 msgid "Fields associated with the object" msgstr "Kolonky přiřazené k objektu" @@ -67,30 +79,6 @@ msgstr "Přidat novou kolonku" msgid "Read-only field" msgstr "Kolonka pouze pro čtení" -#: inc/typefamily.class.php:36 inc/type.class.php:339 inc/type.class.php:458 -msgid "Family of type of objects" -msgstr "Rodina typu objektů" - -#: inc/profile.class.php:142 -msgid "General" -msgstr "Obecné" - -#: inc/profile.class.php:148 -msgid "Objects" -msgstr "Objekty" - -#: inc/profile.class.php:150 -msgid "(No types defined yet)" -msgstr "(Doposud nebyly určené žádné typy)" - -#: inc/object.class.php:471 -msgid "Object preview" -msgstr "Náhled objektu" - -#: inc/object.class.php:751 -msgid "You must configure rights to enable the preview" -msgstr "Pro zapnutí náhledu je třeba nastavit oprávnění" - #: inc/type.class.php:153 msgid "Type name is missing" msgstr "Název typu chybí" @@ -112,56 +100,68 @@ msgstr "Je třeba, aby typ začínal písmenem" msgid "A type already exists with the same name" msgstr "Typ se stejným názvem už existuje" -#: inc/type.class.php:419 +#: inc/type.class.php:376 inc/type.class.php:505 inc/typefamily.class.php:36 +msgid "Family of type of objects" +msgstr "Rodina typu objektů" + +#: inc/type.class.php:466 msgid "Internal identifier" msgstr "Vnitřní identifikátor" -#: inc/type.class.php:473 +#: inc/type.class.php:520 msgid "Behaviour" msgstr "Chování" -#: inc/type.class.php:492 +#: inc/type.class.php:539 msgid "Network connections" msgstr "Síťová připojení" -#: inc/type.class.php:496 +#: inc/type.class.php:543 msgid "injection file plugin" msgstr "zásuvný modul vkládání souborů" -#: inc/type.class.php:498 +#: inc/type.class.php:545 msgid "geninventorynumber plugin" msgstr "zásuvný modul vytváření inventárních čísel" -#: inc/type.class.php:499 +#: inc/type.class.php:546 msgid "order plugin" msgstr "zásuvný modul správa objednávek" -#: inc/type.class.php:500 +#: inc/type.class.php:547 msgid "item's uninstallation plugin" msgstr "zásuvný modul odinstalace položek" -#: inc/type.class.php:501 +#: inc/type.class.php:548 msgid "simcard plugin" msgstr "zásuvný modul sim karty" -#: inc/type.class.php:653 +#: inc/type.class.php:700 msgid "Regenerate files" msgstr "Znovu vytvořit soubory" -#: inc/type.class.php:666 +#: inc/type.class.php:713 msgid "Link to other objects" msgstr "Propojit s ostatními objekty" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1958 +#: inc/type.class.php:2017 #, php-format msgid "Unable to load the class %1$s." msgstr "Nedaří se načíst třídu %1$s." #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1960 +#: inc/type.class.php:2019 #, php-format msgid "" "You probably have garbage data in your database for this plugin and missing " "files in %1$s" msgstr "Nejspíš ve své databázi máte pro tento modul v nepořádku data a chybí soubory v %1$s" + +#: inc/object.class.php:471 +msgid "Object preview" +msgstr "Náhled objektu" + +#: inc/object.class.php:751 +msgid "You must configure rights to enable the preview" +msgstr "Pro zapnutí náhledu je třeba nastavit oprávnění" diff --git a/locales/en_GB.mo b/locales/en_GB.mo index d3387b8fab9a78d19c92437d81559c5a2956e9a5..44b7604665e2c296c34368a1c15961dcf8f59775 100644 GIT binary patch literal 2844 zcmeH{zi%8x6vu}o1m_?SLimw{A1@GcHenr~LC8Ae;_TSgfq!v1f=mIL+nrkv*_}CN zW^G@IX!r-9paM!73M49|NK`a5bQD2CRFpInNJxC&?wuVZL`CV5_C9wr^Jc#9``+!( zXHR@AFrLHnB%YV=5#k!Sb_^dF6UT*k3_Jx+f&`uh+u$kiE${(Qg6Ba4J^_9NJ_UXb zUIK4}_kq8FkAS~{_kw?ckAlZf2vGyigS>tjd=Q)iIc^m^3vPlBfj#gH=)f!Bhalhg zC3p_}9%LPNK;Hic_!@W;mp%=?0dk%La2xy#Wc`1FtmoXx%8wU7&TkcDJzek}coc)| z%XbjRzWfBTFUKY-U(SFWcLC&c>mciCfvodwkbT()IloUq&ie}x62vzk>-ZLAUw#~| z-vL?2?;yu<5!jarkn_9w9# z0}s~pFdp{$Sv;&6SC?L)b;`l{5FYl82m8w7aXcvdKL+P=VKjr3OApx>F}YzW3sDGIL5MLsI+N2TyxC>`>TIMgpAswzE)Wx7S)d2)wXbA zIUj@}^<}QJp;#$FwqKnJ+TMFA4qmKq7|A5T#lDDR<$b@%ID{7_{S;(nD*WrJC+WS7 zwdCakY1PSMRT<@ECfX(_XJke?Q6^}}bYe~RR3_H6xkbT}MMCaC&<1Cw4P9Rp8!GHs zcZ*_c48&?{yx1&t)4-`+t@cJg$J3s2X=JK$+$1_MF0v+r38gh1m6no%!bGOL=)y;* z-Y=AA{fV=K#O@hNENWqF7n~Eh@~%$OBvj|Fz*omAy>h!MnWn8wNv|m0u@;b!S$b!bc+<#U zrr6KS%A{^-0IxYBAo$jEg5TQn~Fl1~j?;kkZ!=Xb$Pbo^J z>%m(}WRP5-A-b&m(PKq@>u@JL7-U6?RnA~!M`bsMuoQtRXtRq7SvNFA-b3xH7@-aK zB+6Vy9Lxrl*F6=8LIJW&mODlv)+LAWUgxoN$vAM!Sw1gnC(%viJkD*>R%_|?*6K3d zT<+XxZ*J5&YG7T6)_tmzXt79r)U{2jZEbd=CH(XFs^~iUyGgS%jk##%m1uUB8ZR|x z8&_vAurcbO6Z!D}+_xruh`LT15B=6PsZ|7<)Atfa48 zv}|IVpk*&RG^x`UC JcK`Q_>u)yL0}%iK literal 511 zcmZ8e!A=`75CxUf9y#|gNIfKi$$D251xL96A&N?9gqHSLIlF^nzbxgtG>JP>9Am z3Dc{^3>J2yjRS-!ISQus%TAZwQ0qg&dDN!CvyF~ec?sF#dxhtLRN@ABp%O_bMR9`S z6pLdhN_ku!ic$y`;tf5RZqWa_uTTgnibKK3u2f7|1?8eu$p;BPl{F1q`^}1LPH&VZ ztVpdTOq{kRuAq18Ori$98K)b+?n7^tQY-U(yWI{_*UH?{*uHI` zeF=>E-?+Jb8pa#CbN1FL|Au7R1Zk&%L-v6Ydbwt>Os39LI=0Dr3p4FCWD delta 29 kcmX>pa#CbN1FL|!uAz~xp|OIYiIt(bwt?a139LI=0Dqnc5C8xG diff --git a/locales/es_ES.po b/locales/es_ES.po index 00efbf67..c88cb478 100644 --- a/locales/es_ES.po +++ b/locales/es_ES.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Genericobject\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-13 14:17+0100\n" +"POT-Creation-Date: 2018-06-22 13:21+0000\n" "PO-Revision-Date: 2017-12-13 13:22+0000\n" "Last-Translator: Alexandre Delaunay \n" "Language-Team: Spanish (Spain) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/es_ES/)\n" @@ -18,26 +18,17 @@ msgstr "" "Language: es_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: setup.php:188 index.php:58 front/type.form.php:73 front/familylist.php:33 -#: front/familylist.php:41 inc/profile.class.php:39 -#: inc/object_item.class.php:109 inc/type.class.php:285 inc/type.class.php:368 -msgid "Objects management" -msgstr "Gestión de objetos" - -#: index.php:68 front/familylist.php:37 -msgid "Empty family" -msgstr "Familia vacía" - -#: front/commontreedropdown.form.php:36 front/commondropdown.php:11 -#: front/commondropdown.form.php:36 -msgid "The requested dropdown does not exists" -msgstr "La lista desplegable requerida no existe" - -#: front/type.php:38 front/object.php:33 inc/profile.class.php:288 +#: front/type.php:38 front/object.php:33 inc/profile.class.php:287 #: inc/type.class.php:66 msgid "Type of objects" msgstr "Tipo de objetos" +#: front/type.form.php:73 front/familylist.php:33 front/familylist.php:41 +#: index.php:58 inc/object_item.class.php:109 inc/profile.class.php:39 +#: inc/type.class.php:289 inc/type.class.php:415 setup.php:193 +msgid "Objects management" +msgstr "Gestión de objetos" + #: front/field.form.php:41 msgid "Field(s) deleted successfully" msgstr "Campo(s) suprimido(s) correctamente" @@ -46,6 +37,27 @@ msgstr "Campo(s) suprimido(s) correctamente" msgid "Field added successfully" msgstr "El campo fue añadido correctamente" +#: front/commondropdown.php:11 front/commontreedropdown.form.php:36 +#: front/commondropdown.form.php:36 +msgid "The requested dropdown does not exists" +msgstr "La lista desplegable requerida no existe" + +#: front/familylist.php:37 index.php:68 +msgid "Empty family" +msgstr "Familia vacía" + +#: inc/profile.class.php:141 +msgid "General" +msgstr "General" + +#: inc/profile.class.php:147 +msgid "Objects" +msgstr "Objetos" + +#: inc/profile.class.php:149 +msgid "(No types defined yet)" +msgstr "" + #: inc/field.class.php:64 msgid "Fields associated with the object" msgstr "Campos asociados al objeto" @@ -66,30 +78,6 @@ msgstr "Añadir un campo nuevo" msgid "Read-only field" msgstr "" -#: inc/typefamily.class.php:36 inc/type.class.php:339 inc/type.class.php:458 -msgid "Family of type of objects" -msgstr "Familia de tipos de objetos" - -#: inc/profile.class.php:142 -msgid "General" -msgstr "General" - -#: inc/profile.class.php:148 -msgid "Objects" -msgstr "Objetos" - -#: inc/profile.class.php:150 -msgid "(No types defined yet)" -msgstr "" - -#: inc/object.class.php:471 -msgid "Object preview" -msgstr "Vista previa del objeto" - -#: inc/object.class.php:751 -msgid "You must configure rights to enable the preview" -msgstr "Tiene que configurar los permisos para acceder a la vista previa" - #: inc/type.class.php:153 msgid "Type name is missing" msgstr "Nombre de tipo es obligatorio" @@ -111,56 +99,68 @@ msgstr "El nombre de tipo tiene que empezar con una letra" msgid "A type already exists with the same name" msgstr "Un tipo de objeto ya existe con el mismo nombre" -#: inc/type.class.php:419 +#: inc/type.class.php:376 inc/type.class.php:505 inc/typefamily.class.php:36 +msgid "Family of type of objects" +msgstr "Familia de tipos de objetos" + +#: inc/type.class.php:466 msgid "Internal identifier" msgstr "Identificador interno" -#: inc/type.class.php:473 +#: inc/type.class.php:520 msgid "Behaviour" msgstr "Comportamiento" -#: inc/type.class.php:492 +#: inc/type.class.php:539 msgid "Network connections" msgstr "Conexiones de red" -#: inc/type.class.php:496 +#: inc/type.class.php:543 msgid "injection file plugin" msgstr "complemento Injection file" -#: inc/type.class.php:498 +#: inc/type.class.php:545 msgid "geninventorynumber plugin" msgstr "complemento Geninventorynumber" -#: inc/type.class.php:499 +#: inc/type.class.php:546 msgid "order plugin" msgstr "complemento Gestión de pedidos" -#: inc/type.class.php:500 +#: inc/type.class.php:547 msgid "item's uninstallation plugin" msgstr "complemento Item's uninstallation" -#: inc/type.class.php:501 +#: inc/type.class.php:548 msgid "simcard plugin" msgstr "" -#: inc/type.class.php:653 +#: inc/type.class.php:700 msgid "Regenerate files" msgstr "Generar de nuevo los ficheros" -#: inc/type.class.php:666 +#: inc/type.class.php:713 msgid "Link to other objects" msgstr "Enlace con otros objetos" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1958 +#: inc/type.class.php:2017 #, php-format msgid "Unable to load the class %1$s." msgstr "" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1960 +#: inc/type.class.php:2019 #, php-format msgid "" "You probably have garbage data in your database for this plugin and missing " "files in %1$s" msgstr "" + +#: inc/object.class.php:471 +msgid "Object preview" +msgstr "Vista previa del objeto" + +#: inc/object.class.php:751 +msgid "You must configure rights to enable the preview" +msgstr "Tiene que configurar los permisos para acceder a la vista previa" diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo index 86e56c458b90b797ea123918a31875bd437ac862..89b279af2a94fee60b4353d1d15f66b6a3759212 100644 GIT binary patch delta 29 lcmaDU@ls;L0X6{(T>~>+BO?VvV=E&=Z3BbN7uaU90sxL)2)F, 2017 # Manu1400 , 2016 -# Johan Cwiklinski , 2016-2017 +# Johan Cwiklinski , 2016-2017 # Le Rohellec Benoit , 2015 # Walid Nouh, 2015 msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Genericobject\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-13 14:17+0100\n" +"POT-Creation-Date: 2018-06-22 13:21+0000\n" "PO-Revision-Date: 2017-12-13 13:24+0000\n" "Last-Translator: Alexandre Delaunay \n" "Language-Team: French (France) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/fr_FR/)\n" @@ -22,26 +22,17 @@ msgstr "" "Language: fr_FR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: setup.php:188 index.php:58 front/type.form.php:73 front/familylist.php:33 -#: front/familylist.php:41 inc/profile.class.php:39 -#: inc/object_item.class.php:109 inc/type.class.php:285 inc/type.class.php:368 -msgid "Objects management" -msgstr "Gestion d'objets" - -#: index.php:68 front/familylist.php:37 -msgid "Empty family" -msgstr "Famille vide" - -#: front/commontreedropdown.form.php:36 front/commondropdown.php:11 -#: front/commondropdown.form.php:36 -msgid "The requested dropdown does not exists" -msgstr "L'intitulé demandé n'existe pas" - -#: front/type.php:38 front/object.php:33 inc/profile.class.php:288 +#: front/type.php:38 front/object.php:33 inc/profile.class.php:287 #: inc/type.class.php:66 msgid "Type of objects" msgstr "Types d'objets" +#: front/type.form.php:73 front/familylist.php:33 front/familylist.php:41 +#: index.php:58 inc/object_item.class.php:109 inc/profile.class.php:39 +#: inc/type.class.php:289 inc/type.class.php:415 setup.php:193 +msgid "Objects management" +msgstr "Gestion d'objets" + #: front/field.form.php:41 msgid "Field(s) deleted successfully" msgstr "Champ(s) supprimé(s) avec succès" @@ -50,6 +41,27 @@ msgstr "Champ(s) supprimé(s) avec succès" msgid "Field added successfully" msgstr "Champ ajouté avec succès" +#: front/commondropdown.php:11 front/commontreedropdown.form.php:36 +#: front/commondropdown.form.php:36 +msgid "The requested dropdown does not exists" +msgstr "L'intitulé demandé n'existe pas" + +#: front/familylist.php:37 index.php:68 +msgid "Empty family" +msgstr "Famille vide" + +#: inc/profile.class.php:141 +msgid "General" +msgstr "Général" + +#: inc/profile.class.php:147 +msgid "Objects" +msgstr "Objets" + +#: inc/profile.class.php:149 +msgid "(No types defined yet)" +msgstr "(Aucun type déjà défini)" + #: inc/field.class.php:64 msgid "Fields associated with the object" msgstr "Champs associés à l'objet" @@ -70,30 +82,6 @@ msgstr "Ajout d'un nouveau champ" msgid "Read-only field" msgstr "Champ en lecture seule" -#: inc/typefamily.class.php:36 inc/type.class.php:339 inc/type.class.php:458 -msgid "Family of type of objects" -msgstr "Famille" - -#: inc/profile.class.php:142 -msgid "General" -msgstr "Général" - -#: inc/profile.class.php:148 -msgid "Objects" -msgstr "Objets" - -#: inc/profile.class.php:150 -msgid "(No types defined yet)" -msgstr "(Aucun type déjà défini)" - -#: inc/object.class.php:471 -msgid "Object preview" -msgstr "Prévisualisation d'un objet de ce type" - -#: inc/object.class.php:751 -msgid "You must configure rights to enable the preview" -msgstr "Vous devez configurer les droits sur cet objet pour voir la prévisualisation" - #: inc/type.class.php:153 msgid "Type name is missing" msgstr "Nom du type manquant" @@ -115,56 +103,68 @@ msgstr "Le type doit commencer par une lettre" msgid "A type already exists with the same name" msgstr "Un type avec le même nom existe déjà" -#: inc/type.class.php:419 +#: inc/type.class.php:376 inc/type.class.php:505 inc/typefamily.class.php:36 +msgid "Family of type of objects" +msgstr "Famille" + +#: inc/type.class.php:466 msgid "Internal identifier" msgstr "Indentifiant interne" -#: inc/type.class.php:473 +#: inc/type.class.php:520 msgid "Behaviour" msgstr "Comportement" -#: inc/type.class.php:492 +#: inc/type.class.php:539 msgid "Network connections" msgstr "Connexions réseaux" -#: inc/type.class.php:496 +#: inc/type.class.php:543 msgid "injection file plugin" msgstr "Plugin injection de fichiers" -#: inc/type.class.php:498 +#: inc/type.class.php:545 msgid "geninventorynumber plugin" msgstr "Plugin génération des numéros d'inventaire" -#: inc/type.class.php:499 +#: inc/type.class.php:546 msgid "order plugin" msgstr "Plugin gestion des commandes" -#: inc/type.class.php:500 +#: inc/type.class.php:547 msgid "item's uninstallation plugin" msgstr "Plugin de désinstallation des matériels" -#: inc/type.class.php:501 +#: inc/type.class.php:548 msgid "simcard plugin" msgstr "Plugin carte SIM" -#: inc/type.class.php:653 +#: inc/type.class.php:700 msgid "Regenerate files" msgstr "Regénérer les fichiers" -#: inc/type.class.php:666 +#: inc/type.class.php:713 msgid "Link to other objects" msgstr "Liaison avec d'autres objets" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1958 +#: inc/type.class.php:2017 #, php-format msgid "Unable to load the class %1$s." msgstr "Impossible de charger la classe %1$s" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1960 +#: inc/type.class.php:2019 #, php-format msgid "" "You probably have garbage data in your database for this plugin and missing " "files in %1$s" msgstr "Vous avez probablement d'anciennes données dans votre base pour ce plugin ou des fichiers manquants dans %1$s" + +#: inc/object.class.php:471 +msgid "Object preview" +msgstr "Prévisualisation d'un objet de ce type" + +#: inc/object.class.php:751 +msgid "You must configure rights to enable the preview" +msgstr "Vous devez configurer les droits sur cet objet pour voir la prévisualisation" diff --git a/locales/genericobject.pot b/locales/genericobject.pot index f15822fc..6aadf4d1 100644 --- a/locales/genericobject.pot +++ b/locales/genericobject.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-13 14:17+0100\n" +"POT-Creation-Date: 2018-06-22 13:21+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,32 +17,44 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: setup.php:188 index.php:58 front/type.form.php:73 front/familylist.php:33 -#: front/familylist.php:41 inc/profile.class.php:39 -#: inc/object_item.class.php:109 inc/type.class.php:285 inc/type.class.php:368 +#: front/type.php:38 front/object.php:33 inc/profile.class.php:287 +#: inc/type.class.php:66 +msgid "Type of objects" +msgstr "" + +#: front/type.form.php:73 front/familylist.php:33 front/familylist.php:41 +#: index.php:58 inc/object_item.class.php:109 inc/profile.class.php:39 +#: inc/type.class.php:289 inc/type.class.php:415 setup.php:193 msgid "Objects management" msgstr "" -#: index.php:68 front/familylist.php:37 -msgid "Empty family" +#: front/field.form.php:41 +msgid "Field(s) deleted successfully" msgstr "" -#: front/commontreedropdown.form.php:36 front/commondropdown.php:11 +#: front/field.form.php:51 +msgid "Field added successfully" +msgstr "" + +#: front/commondropdown.php:11 front/commontreedropdown.form.php:36 #: front/commondropdown.form.php:36 msgid "The requested dropdown does not exists" msgstr "" -#: front/type.php:38 front/object.php:33 inc/profile.class.php:288 -#: inc/type.class.php:66 -msgid "Type of objects" +#: front/familylist.php:37 index.php:68 +msgid "Empty family" msgstr "" -#: front/field.form.php:41 -msgid "Field(s) deleted successfully" +#: inc/profile.class.php:141 +msgid "General" msgstr "" -#: front/field.form.php:51 -msgid "Field added successfully" +#: inc/profile.class.php:147 +msgid "Objects" +msgstr "" + +#: inc/profile.class.php:149 +msgid "(No types defined yet)" msgstr "" #: inc/field.class.php:64 @@ -65,30 +77,6 @@ msgstr "" msgid "Read-only field" msgstr "" -#: inc/typefamily.class.php:36 inc/type.class.php:339 inc/type.class.php:458 -msgid "Family of type of objects" -msgstr "" - -#: inc/profile.class.php:142 -msgid "General" -msgstr "" - -#: inc/profile.class.php:148 -msgid "Objects" -msgstr "" - -#: inc/profile.class.php:150 -msgid "(No types defined yet)" -msgstr "" - -#: inc/object.class.php:471 -msgid "Object preview" -msgstr "" - -#: inc/object.class.php:751 -msgid "You must configure rights to enable the preview" -msgstr "" - #: inc/type.class.php:153 msgid "Type name is missing" msgstr "" @@ -110,56 +98,68 @@ msgstr "" msgid "A type already exists with the same name" msgstr "" -#: inc/type.class.php:419 +#: inc/type.class.php:376 inc/type.class.php:505 inc/typefamily.class.php:36 +msgid "Family of type of objects" +msgstr "" + +#: inc/type.class.php:466 msgid "Internal identifier" msgstr "" -#: inc/type.class.php:473 +#: inc/type.class.php:520 msgid "Behaviour" msgstr "" -#: inc/type.class.php:492 +#: inc/type.class.php:539 msgid "Network connections" msgstr "" -#: inc/type.class.php:496 +#: inc/type.class.php:543 msgid "injection file plugin" msgstr "" -#: inc/type.class.php:498 +#: inc/type.class.php:545 msgid "geninventorynumber plugin" msgstr "" -#: inc/type.class.php:499 +#: inc/type.class.php:546 msgid "order plugin" msgstr "" -#: inc/type.class.php:500 +#: inc/type.class.php:547 msgid "item's uninstallation plugin" msgstr "" -#: inc/type.class.php:501 +#: inc/type.class.php:548 msgid "simcard plugin" msgstr "" -#: inc/type.class.php:653 +#: inc/type.class.php:700 msgid "Regenerate files" msgstr "" -#: inc/type.class.php:666 +#: inc/type.class.php:713 msgid "Link to other objects" msgstr "" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1958 +#: inc/type.class.php:2017 #, php-format msgid "Unable to load the class %1$s." msgstr "" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1960 +#: inc/type.class.php:2019 #, php-format msgid "" "You probably have garbage data in your database for this plugin and missing " "files in %1$s" msgstr "" + +#: inc/object.class.php:471 +msgid "Object preview" +msgstr "" + +#: inc/object.class.php:751 +msgid "You must configure rights to enable the preview" +msgstr "" diff --git a/locales/it_IT.mo b/locales/it_IT.mo index 12bc64d2fd4868b2d77deac34f0de90eb23aa646..7788a45d16e44bf5f73f5d9026115c66d3b70232 100644 GIT binary patch delta 1117 zcmY+?O-K}B9LMolU3Gmc^DWKPr)X2DU3U$%Wa)(vF-j`3ap0rcc zsaU#nDLP3P4_=B62GJp+Lr0-H7<34tLs5C_`=7O-hn@Y*KKsn`JpbP_E3K>T%O9Jg z_bu8%uKip`BbGIYnF_vWzp)*+u^*c%EvpevU@eYg175^VoWTyff!%ly58xWs;5%%= zO{}u4W$P<9ZFGFcI;@SB2ejfYe)pq1ID*Z13U}irY{D!aMjvIt2iS^FQ8w}xW&CG6 zhd;3g&#?L+>swd3k)7W~*~k-=BwnCY_5o!hU+@j-Y@;mnie1UVpHLR8i}X_}8Rb zd41#=NrHWc@0Y~RBjKEKl%yc_TUIrfOf2X5w@KwvoxD7C8dB+FqeJNh|S=+G#?I-PEy{o!D(%nC4e81qTz+Uo{c4xi3E>~g)-oSdiW;)V#Rxk3O?JD1M zv~o-k6!N;X61$z8aFpv&QO-F0BU3ouye$)4H;Q>p-l!$}s86pOzq=85&)=| delta 849 zcmX}qKWGzS7{~E9ZTctIXtk}?TK}9vqf%1u5+N8wsChbd(I@;3gI?$MbjwFXK^sg*xC@B%%3@ zDm29@(&RT8CQ6vcHdUWSCCHFnA3lewyoB0!1A8&VQC!0P_#Abh_wn-;9A>?Wy0H#k z(ha3?JC5NX`Ava|Hl9WHno_)8KqbD9hwu?P_y%qKfvPyg*Qap=3wQ-p@e@?VuTd3$ zK(*{Us*qn8#%*S~aVkB~DfNLqhC(l^GH%>-GgP%gZKLh$)#?AU87gLXyifrO^98Buu+B7>C|IgyMk7&SJ3M3oK8gLWDu<;=cB7#f5Sr7&1K!Z?H((-g>lDq z9P8qR?5uyQ(x}ve?3CB^i+0X&|L@BebGdPcux7kQGdoxJf=1PA*6Kz3RMo%j1?9SL zPx)2vX5ihiPn6@?gtz%{^7^7zsZLz0EuOSyTJO4h6Rmd7r9?EBT8jFt`RJjwyarig BW4QnT diff --git a/locales/it_IT.po b/locales/it_IT.po index 96705599..eee5ecae 100644 --- a/locales/it_IT.po +++ b/locales/it_IT.po @@ -4,13 +4,14 @@ # # Translators: # Salvatore Russo , 2016 +# Giudy , 2018 msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Genericobject\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-13 14:17+0100\n" -"PO-Revision-Date: 2017-12-13 13:22+0000\n" -"Last-Translator: Alexandre Delaunay \n" +"POT-Creation-Date: 2018-06-22 13:21+0000\n" +"PO-Revision-Date: 2018-06-21 11:16+0000\n" +"Last-Translator: Giudy \n" "Language-Team: Italian (Italy) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/it_IT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,26 +19,17 @@ msgstr "" "Language: it_IT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: setup.php:188 index.php:58 front/type.form.php:73 front/familylist.php:33 -#: front/familylist.php:41 inc/profile.class.php:39 -#: inc/object_item.class.php:109 inc/type.class.php:285 inc/type.class.php:368 -msgid "Objects management" -msgstr "Gestione degli Oggetti" - -#: index.php:68 front/familylist.php:37 -msgid "Empty family" -msgstr "Famiglia vuota" - -#: front/commontreedropdown.form.php:36 front/commondropdown.php:11 -#: front/commondropdown.form.php:36 -msgid "The requested dropdown does not exists" -msgstr "Il menù a discesa richiesto non esiste" - -#: front/type.php:38 front/object.php:33 inc/profile.class.php:288 +#: front/type.php:38 front/object.php:33 inc/profile.class.php:287 #: inc/type.class.php:66 msgid "Type of objects" msgstr "Tipo di oggetti" +#: front/type.form.php:73 front/familylist.php:33 front/familylist.php:41 +#: index.php:58 inc/object_item.class.php:109 inc/profile.class.php:39 +#: inc/type.class.php:289 inc/type.class.php:415 setup.php:193 +msgid "Objects management" +msgstr "Gestione degli Oggetti" + #: front/field.form.php:41 msgid "Field(s) deleted successfully" msgstr "Campo(i) rimosso/i con successo" @@ -46,6 +38,27 @@ msgstr "Campo(i) rimosso/i con successo" msgid "Field added successfully" msgstr "Campo aggiunto con successo" +#: front/commondropdown.php:11 front/commontreedropdown.form.php:36 +#: front/commondropdown.form.php:36 +msgid "The requested dropdown does not exists" +msgstr "Il menù a discesa richiesto non esiste" + +#: front/familylist.php:37 index.php:68 +msgid "Empty family" +msgstr "Famiglia vuota" + +#: inc/profile.class.php:141 +msgid "General" +msgstr "Generale" + +#: inc/profile.class.php:147 +msgid "Objects" +msgstr "Oggetti" + +#: inc/profile.class.php:149 +msgid "(No types defined yet)" +msgstr "(Nessun tipo ancora definito)" + #: inc/field.class.php:64 msgid "Fields associated with the object" msgstr "Campi associati con l'oggetto" @@ -64,31 +77,7 @@ msgstr "Aggiungi nuovo campo" #: inc/field.class.php:317 msgid "Read-only field" -msgstr "" - -#: inc/typefamily.class.php:36 inc/type.class.php:339 inc/type.class.php:458 -msgid "Family of type of objects" -msgstr "Famiglia" - -#: inc/profile.class.php:142 -msgid "General" -msgstr "Generale" - -#: inc/profile.class.php:148 -msgid "Objects" -msgstr "Oggetti" - -#: inc/profile.class.php:150 -msgid "(No types defined yet)" -msgstr "" - -#: inc/object.class.php:471 -msgid "Object preview" -msgstr "Anteprima dell'oggetto" - -#: inc/object.class.php:751 -msgid "You must configure rights to enable the preview" -msgstr "Bisogna configurare i diritti per abilitare l'anteprima" +msgstr "Campo in sola lettura" #: inc/type.class.php:153 msgid "Type name is missing" @@ -96,7 +85,7 @@ msgstr "Il nome del tipo non è presente" #: inc/type.class.php:159 msgid "Type name must be longer" -msgstr "" +msgstr "Il nome della tipologia deve essere più lungo" #: inc/type.class.php:165 msgid "" @@ -111,56 +100,68 @@ msgstr "Il nome del tipo deve cominciare con una lettera" msgid "A type already exists with the same name" msgstr "Un tipo con lo stesso nome esiste già" -#: inc/type.class.php:419 +#: inc/type.class.php:376 inc/type.class.php:505 inc/typefamily.class.php:36 +msgid "Family of type of objects" +msgstr "Famiglia" + +#: inc/type.class.php:466 msgid "Internal identifier" msgstr "Identificatore interno" -#: inc/type.class.php:473 +#: inc/type.class.php:520 msgid "Behaviour" msgstr "Comportamento" -#: inc/type.class.php:492 +#: inc/type.class.php:539 msgid "Network connections" msgstr "Connessioni di rete" -#: inc/type.class.php:496 +#: inc/type.class.php:543 msgid "injection file plugin" msgstr "injection file plugin" -#: inc/type.class.php:498 +#: inc/type.class.php:545 msgid "geninventorynumber plugin" msgstr "geninventorynumber plugin" -#: inc/type.class.php:499 +#: inc/type.class.php:546 msgid "order plugin" msgstr "order plugin" -#: inc/type.class.php:500 +#: inc/type.class.php:547 msgid "item's uninstallation plugin" msgstr "item's uninstallation plugin" -#: inc/type.class.php:501 +#: inc/type.class.php:548 msgid "simcard plugin" msgstr "simcard plugin" -#: inc/type.class.php:653 +#: inc/type.class.php:700 msgid "Regenerate files" msgstr "Rigenera file" -#: inc/type.class.php:666 +#: inc/type.class.php:713 msgid "Link to other objects" msgstr "Collega ad altri oggetti" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1958 +#: inc/type.class.php:2017 #, php-format msgid "Unable to load the class %1$s." -msgstr "" +msgstr "Impossibile caricare la classe %1$s ." #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1960 +#: inc/type.class.php:2019 #, php-format msgid "" "You probably have garbage data in your database for this plugin and missing " "files in %1$s" msgstr "" + +#: inc/object.class.php:471 +msgid "Object preview" +msgstr "Anteprima dell'oggetto" + +#: inc/object.class.php:751 +msgid "You must configure rights to enable the preview" +msgstr "Bisogna configurare i diritti per abilitare l'anteprima" diff --git a/locales/pl_PL.mo b/locales/pl_PL.mo index 18a80090321c76c2dcedbc7068fbe75bb0ba9b3b..e76500700a089675912fa3205ece648beaa9d21f 100644 GIT binary patch delta 29 kcmX@ld!BcL9kYOiu7R1Zk&%L-v6Ydbwt>NBKjube0C%JZN&o-= delta 29 kcmX@ld!BcL9kYPBuAz~xp|OIYiIt(bwt?YhKjube0C$%MO#lD@ diff --git a/locales/pl_PL.po b/locales/pl_PL.po index c991b3a8..a7497d0d 100644 --- a/locales/pl_PL.po +++ b/locales/pl_PL.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Genericobject\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-13 14:17+0100\n" +"POT-Creation-Date: 2018-06-22 13:21+0000\n" "PO-Revision-Date: 2017-12-13 13:22+0000\n" "Last-Translator: Alexandre Delaunay \n" "Language-Team: Polish (Poland) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/pl_PL/)\n" @@ -18,26 +18,17 @@ msgstr "" "Language: pl_PL\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" -#: setup.php:188 index.php:58 front/type.form.php:73 front/familylist.php:33 -#: front/familylist.php:41 inc/profile.class.php:39 -#: inc/object_item.class.php:109 inc/type.class.php:285 inc/type.class.php:368 -msgid "Objects management" -msgstr "Zarządzanie obiektami" - -#: index.php:68 front/familylist.php:37 -msgid "Empty family" -msgstr "" - -#: front/commontreedropdown.form.php:36 front/commondropdown.php:11 -#: front/commondropdown.form.php:36 -msgid "The requested dropdown does not exists" -msgstr "Żądana lista rozwijana nie istnieje" - -#: front/type.php:38 front/object.php:33 inc/profile.class.php:288 +#: front/type.php:38 front/object.php:33 inc/profile.class.php:287 #: inc/type.class.php:66 msgid "Type of objects" msgstr "Rodzaj obiektów" +#: front/type.form.php:73 front/familylist.php:33 front/familylist.php:41 +#: index.php:58 inc/object_item.class.php:109 inc/profile.class.php:39 +#: inc/type.class.php:289 inc/type.class.php:415 setup.php:193 +msgid "Objects management" +msgstr "Zarządzanie obiektami" + #: front/field.form.php:41 msgid "Field(s) deleted successfully" msgstr "Pole(a) zostały pomyślnie skasowane" @@ -46,6 +37,27 @@ msgstr "Pole(a) zostały pomyślnie skasowane" msgid "Field added successfully" msgstr "Pole dodane pomyślnie" +#: front/commondropdown.php:11 front/commontreedropdown.form.php:36 +#: front/commondropdown.form.php:36 +msgid "The requested dropdown does not exists" +msgstr "Żądana lista rozwijana nie istnieje" + +#: front/familylist.php:37 index.php:68 +msgid "Empty family" +msgstr "" + +#: inc/profile.class.php:141 +msgid "General" +msgstr "" + +#: inc/profile.class.php:147 +msgid "Objects" +msgstr "" + +#: inc/profile.class.php:149 +msgid "(No types defined yet)" +msgstr "" + #: inc/field.class.php:64 msgid "Fields associated with the object" msgstr "" @@ -66,30 +78,6 @@ msgstr "Dodaj nowe pole" msgid "Read-only field" msgstr "" -#: inc/typefamily.class.php:36 inc/type.class.php:339 inc/type.class.php:458 -msgid "Family of type of objects" -msgstr "" - -#: inc/profile.class.php:142 -msgid "General" -msgstr "" - -#: inc/profile.class.php:148 -msgid "Objects" -msgstr "" - -#: inc/profile.class.php:150 -msgid "(No types defined yet)" -msgstr "" - -#: inc/object.class.php:471 -msgid "Object preview" -msgstr "Podgląd obiektu" - -#: inc/object.class.php:751 -msgid "You must configure rights to enable the preview" -msgstr "" - #: inc/type.class.php:153 msgid "Type name is missing" msgstr "" @@ -111,56 +99,68 @@ msgstr "Typ musi zaczynać się od litery" msgid "A type already exists with the same name" msgstr "Istnieje już typ o takiej samej nazwie" -#: inc/type.class.php:419 +#: inc/type.class.php:376 inc/type.class.php:505 inc/typefamily.class.php:36 +msgid "Family of type of objects" +msgstr "" + +#: inc/type.class.php:466 msgid "Internal identifier" msgstr "Identyfikator wewnętrzny" -#: inc/type.class.php:473 +#: inc/type.class.php:520 msgid "Behaviour" msgstr "Zachowanie" -#: inc/type.class.php:492 +#: inc/type.class.php:539 msgid "Network connections" msgstr "Połączenia sieciowe" -#: inc/type.class.php:496 +#: inc/type.class.php:543 msgid "injection file plugin" msgstr "" -#: inc/type.class.php:498 +#: inc/type.class.php:545 msgid "geninventorynumber plugin" msgstr "geninventorynumber plugin" -#: inc/type.class.php:499 +#: inc/type.class.php:546 msgid "order plugin" msgstr "" -#: inc/type.class.php:500 +#: inc/type.class.php:547 msgid "item's uninstallation plugin" msgstr "" -#: inc/type.class.php:501 +#: inc/type.class.php:548 msgid "simcard plugin" msgstr "" -#: inc/type.class.php:653 +#: inc/type.class.php:700 msgid "Regenerate files" msgstr "" -#: inc/type.class.php:666 +#: inc/type.class.php:713 msgid "Link to other objects" msgstr "Link do innych obiektów" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1958 +#: inc/type.class.php:2017 #, php-format msgid "Unable to load the class %1$s." msgstr "" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1960 +#: inc/type.class.php:2019 #, php-format msgid "" "You probably have garbage data in your database for this plugin and missing " "files in %1$s" msgstr "" + +#: inc/object.class.php:471 +msgid "Object preview" +msgstr "Podgląd obiektu" + +#: inc/object.class.php:751 +msgid "You must configure rights to enable the preview" +msgstr "" diff --git a/locales/pt_BR.mo b/locales/pt_BR.mo index e6a587d1e1eb63a3530d23e5e80566b02a75d673..5aa339f6e6a7323d3efae935d4c47bbb7a2fea20 100644 GIT binary patch delta 29 kcmZ1>vO;9Td{zMqT>~>+BO?VvV=E&=Z3BbN>sc#V0DD&l$p8QV delta 29 kcmZ1>vO;9Td{zN-T|*;XLt_O)6Dvb=Z3Dy2>sc#V0DDRY%m4rY diff --git a/locales/pt_BR.po b/locales/pt_BR.po index 8deaa61c..fa3ea1f9 100644 --- a/locales/pt_BR.po +++ b/locales/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Genericobject\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-13 14:17+0100\n" +"POT-Creation-Date: 2018-06-22 13:21+0000\n" "PO-Revision-Date: 2017-12-13 13:22+0000\n" "Last-Translator: Alexandre Delaunay \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/pt_BR/)\n" @@ -19,26 +19,17 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: setup.php:188 index.php:58 front/type.form.php:73 front/familylist.php:33 -#: front/familylist.php:41 inc/profile.class.php:39 -#: inc/object_item.class.php:109 inc/type.class.php:285 inc/type.class.php:368 -msgid "Objects management" -msgstr "Gerenciamento de objetos" - -#: index.php:68 front/familylist.php:37 -msgid "Empty family" -msgstr "Família vazia" - -#: front/commontreedropdown.form.php:36 front/commondropdown.php:11 -#: front/commondropdown.form.php:36 -msgid "The requested dropdown does not exists" -msgstr "O menu suspenso solicitado não existe" - -#: front/type.php:38 front/object.php:33 inc/profile.class.php:288 +#: front/type.php:38 front/object.php:33 inc/profile.class.php:287 #: inc/type.class.php:66 msgid "Type of objects" msgstr "Tipos de objetos" +#: front/type.form.php:73 front/familylist.php:33 front/familylist.php:41 +#: index.php:58 inc/object_item.class.php:109 inc/profile.class.php:39 +#: inc/type.class.php:289 inc/type.class.php:415 setup.php:193 +msgid "Objects management" +msgstr "Gerenciamento de objetos" + #: front/field.form.php:41 msgid "Field(s) deleted successfully" msgstr "Campo(s) excluído(s) com sucesso" @@ -47,6 +38,27 @@ msgstr "Campo(s) excluído(s) com sucesso" msgid "Field added successfully" msgstr "Campo adicionado com sucesso" +#: front/commondropdown.php:11 front/commontreedropdown.form.php:36 +#: front/commondropdown.form.php:36 +msgid "The requested dropdown does not exists" +msgstr "O menu suspenso solicitado não existe" + +#: front/familylist.php:37 index.php:68 +msgid "Empty family" +msgstr "Família vazia" + +#: inc/profile.class.php:141 +msgid "General" +msgstr "Geral" + +#: inc/profile.class.php:147 +msgid "Objects" +msgstr "Objetos" + +#: inc/profile.class.php:149 +msgid "(No types defined yet)" +msgstr "" + #: inc/field.class.php:64 msgid "Fields associated with the object" msgstr "Campos associados com o objeto" @@ -67,30 +79,6 @@ msgstr "Adicionar novo campo" msgid "Read-only field" msgstr "" -#: inc/typefamily.class.php:36 inc/type.class.php:339 inc/type.class.php:458 -msgid "Family of type of objects" -msgstr "Família de tipo de objetos" - -#: inc/profile.class.php:142 -msgid "General" -msgstr "Geral" - -#: inc/profile.class.php:148 -msgid "Objects" -msgstr "Objetos" - -#: inc/profile.class.php:150 -msgid "(No types defined yet)" -msgstr "" - -#: inc/object.class.php:471 -msgid "Object preview" -msgstr "Pré-visualização do objet" - -#: inc/object.class.php:751 -msgid "You must configure rights to enable the preview" -msgstr "Você deve configurar os direitos para habilitar pré-visualização" - #: inc/type.class.php:153 msgid "Type name is missing" msgstr "O nome do tipo está faltando" @@ -112,56 +100,68 @@ msgstr "O tipo deve começar com uma letra" msgid "A type already exists with the same name" msgstr "Um tipo com o mesmo nome já existe " -#: inc/type.class.php:419 +#: inc/type.class.php:376 inc/type.class.php:505 inc/typefamily.class.php:36 +msgid "Family of type of objects" +msgstr "Família de tipo de objetos" + +#: inc/type.class.php:466 msgid "Internal identifier" msgstr "Identificador interno" -#: inc/type.class.php:473 +#: inc/type.class.php:520 msgid "Behaviour" msgstr "Comportamento" -#: inc/type.class.php:492 +#: inc/type.class.php:539 msgid "Network connections" msgstr "Conexões de rede" -#: inc/type.class.php:496 +#: inc/type.class.php:543 msgid "injection file plugin" msgstr "plugin datainjection" -#: inc/type.class.php:498 +#: inc/type.class.php:545 msgid "geninventorynumber plugin" msgstr "plugin getinventorynumber" -#: inc/type.class.php:499 +#: inc/type.class.php:546 msgid "order plugin" msgstr "plugin order" -#: inc/type.class.php:500 +#: inc/type.class.php:547 msgid "item's uninstallation plugin" msgstr "plugin item's uninstallation" -#: inc/type.class.php:501 +#: inc/type.class.php:548 msgid "simcard plugin" msgstr "plugin simcard" -#: inc/type.class.php:653 +#: inc/type.class.php:700 msgid "Regenerate files" msgstr "Regenerar arquivos" -#: inc/type.class.php:666 +#: inc/type.class.php:713 msgid "Link to other objects" msgstr "Conexão com outros objetos" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1958 +#: inc/type.class.php:2017 #, php-format msgid "Unable to load the class %1$s." msgstr "" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1960 +#: inc/type.class.php:2019 #, php-format msgid "" "You probably have garbage data in your database for this plugin and missing " "files in %1$s" msgstr "" + +#: inc/object.class.php:471 +msgid "Object preview" +msgstr "Pré-visualização do objet" + +#: inc/object.class.php:751 +msgid "You must configure rights to enable the preview" +msgstr "Você deve configurar os direitos para habilitar pré-visualização" diff --git a/locales/ro_RO.mo b/locales/ro_RO.mo index 33d15dce0e5c57710bba96148c701c479ca9a0b2..1c0d861fb4a397ed8ec5b69a994dac7f814c8bb2 100644 GIT binary patch delta 29 kcmZn>X%X4bz$##&Yhb2pWTaqdY-MDqZD6o@0&58i0B{KhJ^%m! delta 29 kcmZn>X%X4bz$##_YiOivXslppVr6KqZD6>00&58i0B`&UK>z>% diff --git a/locales/ro_RO.po b/locales/ro_RO.po index 57591447..09dc697f 100644 --- a/locales/ro_RO.po +++ b/locales/ro_RO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Genericobject\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-13 14:17+0100\n" +"POT-Creation-Date: 2018-06-22 13:21+0000\n" "PO-Revision-Date: 2017-12-13 13:22+0000\n" "Last-Translator: Alexandre Delaunay \n" "Language-Team: Romanian (Romania) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/ro_RO/)\n" @@ -18,26 +18,17 @@ msgstr "" "Language: ro_RO\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: setup.php:188 index.php:58 front/type.form.php:73 front/familylist.php:33 -#: front/familylist.php:41 inc/profile.class.php:39 -#: inc/object_item.class.php:109 inc/type.class.php:285 inc/type.class.php:368 -msgid "Objects management" -msgstr "Managementul obiectelor" - -#: index.php:68 front/familylist.php:37 -msgid "Empty family" -msgstr "Familie vida" - -#: front/commontreedropdown.form.php:36 front/commondropdown.php:11 -#: front/commondropdown.form.php:36 -msgid "The requested dropdown does not exists" -msgstr "Dropdown-ul solicitat nu exista" - -#: front/type.php:38 front/object.php:33 inc/profile.class.php:288 +#: front/type.php:38 front/object.php:33 inc/profile.class.php:287 #: inc/type.class.php:66 msgid "Type of objects" msgstr "Tipul obiectelor" +#: front/type.form.php:73 front/familylist.php:33 front/familylist.php:41 +#: index.php:58 inc/object_item.class.php:109 inc/profile.class.php:39 +#: inc/type.class.php:289 inc/type.class.php:415 setup.php:193 +msgid "Objects management" +msgstr "Managementul obiectelor" + #: front/field.form.php:41 msgid "Field(s) deleted successfully" msgstr "Campul(urile) sterse cu succes" @@ -46,6 +37,27 @@ msgstr "Campul(urile) sterse cu succes" msgid "Field added successfully" msgstr "Camp adaugat cu succes" +#: front/commondropdown.php:11 front/commontreedropdown.form.php:36 +#: front/commondropdown.form.php:36 +msgid "The requested dropdown does not exists" +msgstr "Dropdown-ul solicitat nu exista" + +#: front/familylist.php:37 index.php:68 +msgid "Empty family" +msgstr "Familie vida" + +#: inc/profile.class.php:141 +msgid "General" +msgstr "General" + +#: inc/profile.class.php:147 +msgid "Objects" +msgstr "Obiecte" + +#: inc/profile.class.php:149 +msgid "(No types defined yet)" +msgstr "" + #: inc/field.class.php:64 msgid "Fields associated with the object" msgstr "Campuri asociate la obiect" @@ -66,30 +78,6 @@ msgstr "Add camp nou" msgid "Read-only field" msgstr "" -#: inc/typefamily.class.php:36 inc/type.class.php:339 inc/type.class.php:458 -msgid "Family of type of objects" -msgstr "Familia tipului de obiecte" - -#: inc/profile.class.php:142 -msgid "General" -msgstr "General" - -#: inc/profile.class.php:148 -msgid "Objects" -msgstr "Obiecte" - -#: inc/profile.class.php:150 -msgid "(No types defined yet)" -msgstr "" - -#: inc/object.class.php:471 -msgid "Object preview" -msgstr "Previzualizeaza un obiect de acest tip" - -#: inc/object.class.php:751 -msgid "You must configure rights to enable the preview" -msgstr "Trebuie sa configurati drepturi pe acest obiect pentru a putea previzualiza" - #: inc/type.class.php:153 msgid "Type name is missing" msgstr "Nume tip lipseste" @@ -111,56 +99,68 @@ msgstr "Tipul trebuie sa inceapa cu o litera" msgid "A type already exists with the same name" msgstr "UN tip cu acelasi nume exista deja" -#: inc/type.class.php:419 +#: inc/type.class.php:376 inc/type.class.php:505 inc/typefamily.class.php:36 +msgid "Family of type of objects" +msgstr "Familia tipului de obiecte" + +#: inc/type.class.php:466 msgid "Internal identifier" msgstr "Identificator intern" -#: inc/type.class.php:473 +#: inc/type.class.php:520 msgid "Behaviour" msgstr "Comportament" -#: inc/type.class.php:492 +#: inc/type.class.php:539 msgid "Network connections" msgstr "Conexiuni retea" -#: inc/type.class.php:496 +#: inc/type.class.php:543 msgid "injection file plugin" msgstr "Plugin injectare fisiere" -#: inc/type.class.php:498 +#: inc/type.class.php:545 msgid "geninventorynumber plugin" msgstr "geninventorynumber plugin" -#: inc/type.class.php:499 +#: inc/type.class.php:546 msgid "order plugin" msgstr "Plugin gestiune comenzi" -#: inc/type.class.php:500 +#: inc/type.class.php:547 msgid "item's uninstallation plugin" msgstr "Plugin dezinstalare elemente" -#: inc/type.class.php:501 +#: inc/type.class.php:548 msgid "simcard plugin" msgstr "" -#: inc/type.class.php:653 +#: inc/type.class.php:700 msgid "Regenerate files" msgstr "Fisiere regenerate" -#: inc/type.class.php:666 +#: inc/type.class.php:713 msgid "Link to other objects" msgstr "Linck catre alte obiecte" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1958 +#: inc/type.class.php:2017 #, php-format msgid "Unable to load the class %1$s." msgstr "" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1960 +#: inc/type.class.php:2019 #, php-format msgid "" "You probably have garbage data in your database for this plugin and missing " "files in %1$s" msgstr "" + +#: inc/object.class.php:471 +msgid "Object preview" +msgstr "Previzualizeaza un obiect de acest tip" + +#: inc/object.class.php:751 +msgid "You must configure rights to enable the preview" +msgstr "Trebuie sa configurati drepturi pe acest obiect pentru a putea previzualiza" diff --git a/locales/ru_RU.mo b/locales/ru_RU.mo index bbd24399082ff372910a28f076c9b6fd89e4b281..de249539cc5d4a6fa55d335964e7a308c4c6796e 100644 GIT binary patch delta 29 lcmaDZ_*`(qEoK1=T>~>+BO?VvV=E&=Z3BbNubBU`005802{!-$ delta 29 lcmaDZ_*`(qEoK38T|*;XLt_O)6Dvb=Z3Dy2ubBU`0057;2|54( diff --git a/locales/ru_RU.po b/locales/ru_RU.po index 53696653..1b2cd9ef 100644 --- a/locales/ru_RU.po +++ b/locales/ru_RU.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Genericobject\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-12-13 14:17+0100\n" +"POT-Creation-Date: 2018-06-22 13:21+0000\n" "PO-Revision-Date: 2017-12-13 13:22+0000\n" "Last-Translator: Alexandre Delaunay \n" "Language-Team: Russian (Russia) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/ru_RU/)\n" @@ -19,26 +19,17 @@ msgstr "" "Language: ru_RU\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: setup.php:188 index.php:58 front/type.form.php:73 front/familylist.php:33 -#: front/familylist.php:41 inc/profile.class.php:39 -#: inc/object_item.class.php:109 inc/type.class.php:285 inc/type.class.php:368 -msgid "Objects management" -msgstr "Управление объектами" - -#: index.php:68 front/familylist.php:37 -msgid "Empty family" -msgstr "" - -#: front/commontreedropdown.form.php:36 front/commondropdown.php:11 -#: front/commondropdown.form.php:36 -msgid "The requested dropdown does not exists" -msgstr "" - -#: front/type.php:38 front/object.php:33 inc/profile.class.php:288 +#: front/type.php:38 front/object.php:33 inc/profile.class.php:287 #: inc/type.class.php:66 msgid "Type of objects" msgstr "Тип объектов" +#: front/type.form.php:73 front/familylist.php:33 front/familylist.php:41 +#: index.php:58 inc/object_item.class.php:109 inc/profile.class.php:39 +#: inc/type.class.php:289 inc/type.class.php:415 setup.php:193 +msgid "Objects management" +msgstr "Управление объектами" + #: front/field.form.php:41 msgid "Field(s) deleted successfully" msgstr "Поле(я) удалены успешно" @@ -47,6 +38,27 @@ msgstr "Поле(я) удалены успешно" msgid "Field added successfully" msgstr "Поле(я) добавлены успешно" +#: front/commondropdown.php:11 front/commontreedropdown.form.php:36 +#: front/commondropdown.form.php:36 +msgid "The requested dropdown does not exists" +msgstr "" + +#: front/familylist.php:37 index.php:68 +msgid "Empty family" +msgstr "" + +#: inc/profile.class.php:141 +msgid "General" +msgstr "" + +#: inc/profile.class.php:147 +msgid "Objects" +msgstr "Объекты" + +#: inc/profile.class.php:149 +msgid "(No types defined yet)" +msgstr "" + #: inc/field.class.php:64 msgid "Fields associated with the object" msgstr "Поля связаны с объектом" @@ -67,30 +79,6 @@ msgstr "Добавить новое поле" msgid "Read-only field" msgstr "" -#: inc/typefamily.class.php:36 inc/type.class.php:339 inc/type.class.php:458 -msgid "Family of type of objects" -msgstr "" - -#: inc/profile.class.php:142 -msgid "General" -msgstr "" - -#: inc/profile.class.php:148 -msgid "Objects" -msgstr "Объекты" - -#: inc/profile.class.php:150 -msgid "(No types defined yet)" -msgstr "" - -#: inc/object.class.php:471 -msgid "Object preview" -msgstr "Предпросмотр" - -#: inc/object.class.php:751 -msgid "You must configure rights to enable the preview" -msgstr "Вы должны настроить права для предпросмотра" - #: inc/type.class.php:153 msgid "Type name is missing" msgstr "" @@ -112,56 +100,68 @@ msgstr "Тип должен начинаться с буквы" msgid "A type already exists with the same name" msgstr "Тип с таким именем уже есть" -#: inc/type.class.php:419 +#: inc/type.class.php:376 inc/type.class.php:505 inc/typefamily.class.php:36 +msgid "Family of type of objects" +msgstr "" + +#: inc/type.class.php:466 msgid "Internal identifier" msgstr "Внутренний идентификатор" -#: inc/type.class.php:473 +#: inc/type.class.php:520 msgid "Behaviour" msgstr "Взаимодействия" -#: inc/type.class.php:492 +#: inc/type.class.php:539 msgid "Network connections" msgstr "Сетевые соединения" -#: inc/type.class.php:496 +#: inc/type.class.php:543 msgid "injection file plugin" msgstr "" -#: inc/type.class.php:498 +#: inc/type.class.php:545 msgid "geninventorynumber plugin" msgstr "" -#: inc/type.class.php:499 +#: inc/type.class.php:546 msgid "order plugin" msgstr "" -#: inc/type.class.php:500 +#: inc/type.class.php:547 msgid "item's uninstallation plugin" msgstr "" -#: inc/type.class.php:501 +#: inc/type.class.php:548 msgid "simcard plugin" msgstr "" -#: inc/type.class.php:653 +#: inc/type.class.php:700 msgid "Regenerate files" msgstr "" -#: inc/type.class.php:666 +#: inc/type.class.php:713 msgid "Link to other objects" msgstr "Связать с другим объектом" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1958 +#: inc/type.class.php:2017 #, php-format msgid "Unable to load the class %1$s." msgstr "" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1960 +#: inc/type.class.php:2019 #, php-format msgid "" "You probably have garbage data in your database for this plugin and missing " "files in %1$s" msgstr "" + +#: inc/object.class.php:471 +msgid "Object preview" +msgstr "Предпросмотр" + +#: inc/object.class.php:751 +msgid "You must configure rights to enable the preview" +msgstr "Вы должны настроить права для предпросмотра" diff --git a/locales/tr_TR.mo b/locales/tr_TR.mo index b80ce57d7d8008e0822a0a56344d9b9bad00328e..b15ccd6301d3324db64d8622964f334e5be1a783 100644 GIT binary patch delta 29 lcmX>veqMaT0X6{(T>~>+BO?VvV=E&=Z3BbN7uf!@004veqMaT0X6}1T|*;XLt_O)6Dvb=Z3Dy27uf!@004\n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/tr_TR/)\n" @@ -18,26 +18,17 @@ msgstr "" "Language: tr_TR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: setup.php:188 index.php:58 front/type.form.php:73 front/familylist.php:33 -#: front/familylist.php:41 inc/profile.class.php:39 -#: inc/object_item.class.php:109 inc/type.class.php:285 inc/type.class.php:368 -msgid "Objects management" -msgstr "Nesne yönetimi" - -#: index.php:68 front/familylist.php:37 -msgid "Empty family" -msgstr "Aile boş" - -#: front/commontreedropdown.form.php:36 front/commondropdown.php:11 -#: front/commondropdown.form.php:36 -msgid "The requested dropdown does not exists" -msgstr "İstenen açılan kutu bulunamadı" - -#: front/type.php:38 front/object.php:33 inc/profile.class.php:288 +#: front/type.php:38 front/object.php:33 inc/profile.class.php:287 #: inc/type.class.php:66 msgid "Type of objects" msgstr "Nesne tipi" +#: front/type.form.php:73 front/familylist.php:33 front/familylist.php:41 +#: index.php:58 inc/object_item.class.php:109 inc/profile.class.php:39 +#: inc/type.class.php:289 inc/type.class.php:415 setup.php:193 +msgid "Objects management" +msgstr "Nesne yönetimi" + #: front/field.form.php:41 msgid "Field(s) deleted successfully" msgstr "Alanlar silindi" @@ -46,6 +37,27 @@ msgstr "Alanlar silindi" msgid "Field added successfully" msgstr "Alan eklendi" +#: front/commondropdown.php:11 front/commontreedropdown.form.php:36 +#: front/commondropdown.form.php:36 +msgid "The requested dropdown does not exists" +msgstr "İstenen açılan kutu bulunamadı" + +#: front/familylist.php:37 index.php:68 +msgid "Empty family" +msgstr "Aile boş" + +#: inc/profile.class.php:141 +msgid "General" +msgstr "Genel" + +#: inc/profile.class.php:147 +msgid "Objects" +msgstr "Nesneler" + +#: inc/profile.class.php:149 +msgid "(No types defined yet)" +msgstr "(Henüz bir tür tanımlanmamış)" + #: inc/field.class.php:64 msgid "Fields associated with the object" msgstr "Nesne ile ilişkilendirilmiş alanlar" @@ -66,30 +78,6 @@ msgstr "Alan ekle" msgid "Read-only field" msgstr "Salt okunur alan" -#: inc/typefamily.class.php:36 inc/type.class.php:339 inc/type.class.php:458 -msgid "Family of type of objects" -msgstr "Nesnelerin aile tipi" - -#: inc/profile.class.php:142 -msgid "General" -msgstr "Genel" - -#: inc/profile.class.php:148 -msgid "Objects" -msgstr "Nesneler" - -#: inc/profile.class.php:150 -msgid "(No types defined yet)" -msgstr "(Henüz bir tür tanımlanmamış)" - -#: inc/object.class.php:471 -msgid "Object preview" -msgstr "Nesne önizleme" - -#: inc/object.class.php:751 -msgid "You must configure rights to enable the preview" -msgstr "Önizleyebilmek için izinleri ayarlamalısınız" - #: inc/type.class.php:153 msgid "Type name is missing" msgstr "Tip adı eksik" @@ -111,56 +99,68 @@ msgstr "Tip bir harf ile başlamalıdır" msgid "A type already exists with the same name" msgstr "Aynı adlı bir tip zaten var" -#: inc/type.class.php:419 +#: inc/type.class.php:376 inc/type.class.php:505 inc/typefamily.class.php:36 +msgid "Family of type of objects" +msgstr "Nesnelerin aile tipi" + +#: inc/type.class.php:466 msgid "Internal identifier" msgstr "İç belirteç" -#: inc/type.class.php:473 +#: inc/type.class.php:520 msgid "Behaviour" msgstr "Davranış" -#: inc/type.class.php:492 +#: inc/type.class.php:539 msgid "Network connections" msgstr "Ağ bağlantıları" -#: inc/type.class.php:496 +#: inc/type.class.php:543 msgid "injection file plugin" msgstr "dosya gönderme uygulama eki" -#: inc/type.class.php:498 +#: inc/type.class.php:545 msgid "geninventorynumber plugin" msgstr "stoknumarasiolustur uygulama eki" -#: inc/type.class.php:499 +#: inc/type.class.php:546 msgid "order plugin" msgstr "sıralama uygulama eki" -#: inc/type.class.php:500 +#: inc/type.class.php:547 msgid "item's uninstallation plugin" msgstr "ögeyi kaldırma uygulama eki" -#: inc/type.class.php:501 +#: inc/type.class.php:548 msgid "simcard plugin" msgstr "sim kart uygulama eki" -#: inc/type.class.php:653 +#: inc/type.class.php:700 msgid "Regenerate files" msgstr "Dosyaları yeniden oluştur" -#: inc/type.class.php:666 +#: inc/type.class.php:713 msgid "Link to other objects" msgstr "Diğer nesnelere bağlantı" #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1958 +#: inc/type.class.php:2017 #, php-format msgid "Unable to load the class %1$s." msgstr "%1$s sınıfı yüklenemedi." #. TRANS: %1$s is itemtype name -#: inc/type.class.php:1960 +#: inc/type.class.php:2019 #, php-format msgid "" "You probably have garbage data in your database for this plugin and missing " "files in %1$s" msgstr "Veritabanınızda bu uygulama eki ve %1$s içindeki eksik dosyalar için büyük olasılıkla çöp veriler var " + +#: inc/object.class.php:471 +msgid "Object preview" +msgstr "Nesne önizleme" + +#: inc/object.class.php:751 +msgid "You must configure rights to enable the preview" +msgstr "Önizleyebilmek için izinleri ayarlamalısınız" From 4731d1b6bc6379c741153e59c76340c1d2898dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 22 Jun 2018 15:24:20 +0200 Subject: [PATCH 5/5] Add 2.6.0 version definition --- genericobject.xml | 4 ++++ setup.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/genericobject.xml b/genericobject.xml index 5b2231b1..b5b4178b 100644 --- a/genericobject.xml +++ b/genericobject.xml @@ -22,6 +22,10 @@ Walid Nouh + + 2.6.0 + 9.3 + 2.5.2 9.2 diff --git a/setup.php b/setup.php index bfdaf2b9..cb2b3547 100644 --- a/setup.php +++ b/setup.php @@ -35,7 +35,7 @@ ---------------------------------------------------------------------- */ -define ('PLUGIN_GENERICOBJECT_VERSION', '2.5.2'); +define ('PLUGIN_GENERICOBJECT_VERSION', '2.6.0'); // Minimal GLPI version, inclusive define("PLUGIN_GENERICOBJECT_MIN_GLPI", "9.3");