From b49b5e1a52e85ae07dac901fc06704248240565b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Mon, 7 May 2018 14:53:11 +0200 Subject: [PATCH 1/7] Use new methods for search options --- inc/container.class.php | 2 +- setup.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/container.class.php b/inc/container.class.php index 528e4cf4..07335b42 100644 --- a/inc/container.class.php +++ b/inc/container.class.php @@ -182,7 +182,7 @@ function post_getEmpty() { $this->fields['is_recursive'] = 1; } - function getSearchOptionsNew() { + function rawSearchOptions() { $tab = []; $tab[] = [ diff --git a/setup.php b/setup.php index b1391dd2..2dfc6f1d 100644 --- a/setup.php +++ b/setup.php @@ -29,9 +29,9 @@ define ('PLUGIN_FIELDS_VERSION', '1.7.3'); // Minimal GLPI version, inclusive -define("PLUGIN_FIELDS_MIN_GLPI", "9.2"); +define("PLUGIN_FIELDS_MIN_GLPI", "9.3"); // Maximum GLPI version, exclusive -define("PLUGIN_FIELDS_MAX_GLPI", "9.3"); +define("PLUGIN_FIELDS_MAX_GLPI", "9.4"); if (!defined("PLUGINFIELDS_DIR")) { define("PLUGINFIELDS_DIR", GLPI_ROOT . "/plugins/fields"); From 17f051a6d1bdd0f5c9ce54147e920aff60c5317e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Thu, 24 May 2018 10:32:11 +0200 Subject: [PATCH 2/7] Fix unit tests --- .travis.yml | 4 ++-- tests/bootstrap.php | 1 + tests/units/PluginFieldsContainer.php | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9892cd08..6dd857ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ env: global: - DB=mysql matrix: - #- GLPIVER=9.1.2 ==> not released yet! - - GLPIVER=9.2/bugfixes + - GLPIVER=9.3/bugfixes + - GLPIVER=master before_script: - composer self-update diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 259ae456..177dde78 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -8,6 +8,7 @@ define('GLPI_ROOT', dirname(dirname(dirname(__DIR__)))); define("GLPI_CONFIG_DIR", GLPI_ROOT . "/tests"); include GLPI_ROOT . "/inc/includes.php"; +include_once GLPI_ROOT . '/tests/GLPITestCase.php'; include_once GLPI_ROOT . '/tests/DbTestCase.php'; //install plugin diff --git a/tests/units/PluginFieldsContainer.php b/tests/units/PluginFieldsContainer.php index 87047fae..e624f242 100644 --- a/tests/units/PluginFieldsContainer.php +++ b/tests/units/PluginFieldsContainer.php @@ -8,12 +8,12 @@ public function testGetTypeName() { $this->string(\PluginFieldsContainer::getTypeName())->isIdenticalTo('Block'); } - public function testGetSearchOptions() { + public function testRawSearchOptions() { $container = new \PluginFieldsContainer(); $this ->given($this->newTestedInstance) ->then - ->array($this->testedInstance->getSearchOptions()) + ->array($this->testedInstance->rawSearchOptions()) ->hasSize(8); } From 3b6c83e0ae4822c54e529ec9f200bcbab195f814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 22 Jun 2018 12:59:05 +0200 Subject: [PATCH 3/7] Use stable dependencies --- .travis.yml | 2 +- composer.json | 8 +- composer.lock | 693 +++++++++++++++++++++----------------------------- 3 files changed, 300 insertions(+), 403 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6dd857ad..6cd92f2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ php: - 5.6 - 7.0 - 7.1 + - 7.2 - nightly env: @@ -10,7 +11,6 @@ env: - DB=mysql matrix: - GLPIVER=9.3/bugfixes - - GLPIVER=master before_script: - composer self-update diff --git a/composer.json b/composer.json index e73c6e36..f19312b0 100644 --- a/composer.json +++ b/composer.json @@ -1,17 +1,15 @@ { - "minimum-stability": "dev", - "prefer-stable": true, "require-dev": { - "glpi-project/tools": "^0.1.0", + "glpi-project/tools": "^0.1", "atoum/atoum": "^3.1" }, "require": { - "php": ">=5.6.0" + "php": ">=5.6" }, "config": { "optimize-autoloader": true, "platform": { - "php": "5.6.0" + "php": "5.6" } } } diff --git a/composer.lock b/composer.lock index ec0955cd..132860c5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,36 +4,35 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c88f42f781e9e27d4eb6bc2ed1556064", + "content-hash": "5e43bf50d5c8fddf89b745c926a5c05f", "packages": [], "packages-dev": [ { "name": "atoum/atoum", - "version": "3.1.1", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/atoum/atoum.git", - "reference": "6af6b609a108fd2e63f2f42efbb4f0b799e6c710" + "reference": "c5279d0ecd4e2d53af6b38815db2cafee8fc46b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/atoum/atoum/zipball/6af6b609a108fd2e63f2f42efbb4f0b799e6c710", - "reference": "6af6b609a108fd2e63f2f42efbb4f0b799e6c710", + "url": "https://api.github.com/repos/atoum/atoum/zipball/c5279d0ecd4e2d53af6b38815db2cafee8fc46b6", + "reference": "c5279d0ecd4e2d53af6b38815db2cafee8fc46b6", "shasum": "" }, "require": { "ext-hash": "*", "ext-json": "*", - "ext-session": "*", "ext-tokenizer": "*", "ext-xml": "*", - "php": "^5.6.0 || ^7.0.0" + "php": "^5.6.0 || ^7.0.0 <7.4.0" }, "replace": { "mageekguy/atoum": "*" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~1.12" + "friendsofphp/php-cs-fixer": "^2" }, "suggest": { "atoum/stubs": "Provides IDE support (like autocompletion) for atoum", @@ -89,34 +88,34 @@ "test", "unit testing" ], - "time": "2017-07-19T19:59:03+00:00" + "time": "2018-03-15T22:46:39+00:00" }, { "name": "consolidation/annotated-command", - "version": "2.4.13", + "version": "2.8.4", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "abb685e42c83d0b698b4e22059e5d505588f7d3c" + "reference": "651541a0b68318a2a202bda558a676e5ad92223c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/abb685e42c83d0b698b4e22059e5d505588f7d3c", - "reference": "abb685e42c83d0b698b4e22059e5d505588f7d3c", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/651541a0b68318a2a202bda558a676e5ad92223c", + "reference": "651541a0b68318a2a202bda558a676e5ad92223c", "shasum": "" }, "require": { - "consolidation/output-formatters": "^3.1.10", + "consolidation/output-formatters": "^3.1.12", "php": ">=5.4.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", "psr/log": "^1", - "symfony/console": "^2.8|~3", - "symfony/event-dispatcher": "^2.5|^3", - "symfony/finder": "^2.5|^3" + "symfony/console": "^2.8|^3|^4", + "symfony/event-dispatcher": "^2.5|^3|^4", + "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "phpunit/phpunit": "^4.8", - "satooshi/php-coveralls": "^1.0", + "g1a/composer-test-scenarios": "^2", + "phpunit/phpunit": "^6", + "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "^2.7" }, "type": "library", @@ -141,32 +140,37 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2017-08-28T20:16:37+00:00" + "time": "2018-05-25T18:04:25+00:00" }, { "name": "consolidation/config", - "version": "1.0.1", + "version": "1.0.11", "source": { "type": "git", "url": "https://github.com/consolidation/config.git", - "reference": "e3c7311f8926488fe2fbce0ec6af56be417da504" + "reference": "ede41d946078e97e7a9513aadc3352f1c26817af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/config/zipball/e3c7311f8926488fe2fbce0ec6af56be417da504", - "reference": "e3c7311f8926488fe2fbce0ec6af56be417da504", + "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": { @@ -190,29 +194,31 @@ } ], "description": "Provide configuration services for a commandline tool.", - "time": "2017-07-28T18:05:53+00:00" + "time": "2018-05-27T01:17:02+00:00" }, { "name": "consolidation/log", - "version": "1.0.3", + "version": "1.0.6", "source": { "type": "git", "url": "https://github.com/consolidation/log.git", - "reference": "74ba81b4edc585616747cc5c5309ce56fec41254" + "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/log/zipball/74ba81b4edc585616747cc5c5309ce56fec41254", - "reference": "74ba81b4edc585616747cc5c5309ce56fec41254", + "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395", + "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395", "shasum": "" }, "require": { "php": ">=5.5.0", "psr/log": "~1.0", - "symfony/console": "~2.5|~3.0" + "symfony/console": "^2.8|^3|^4" }, "require-dev": { + "g1a/composer-test-scenarios": "^1", "phpunit/phpunit": "4.*", + "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "2.*" }, "type": "library", @@ -237,33 +243,39 @@ } ], "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.", - "time": "2016-03-23T23:46:42+00:00" + "time": "2018-05-25T18:14:39+00:00" }, { "name": "consolidation/output-formatters", - "version": "3.1.11", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "3a1160440819269e6d8d9c11db67129384b8fb35" + "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/3a1160440819269e6d8d9c11db67129384b8fb35", - "reference": "3a1160440819269e6d8d9c11db67129384b8fb35", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/d78ef59aea19d3e2e5a23f90a055155ee78a0ad5", + "reference": "d78ef59aea19d3e2e5a23f90a055155ee78a0ad5", "shasum": "" }, "require": { "php": ">=5.4.0", - "symfony/console": "^2.8|~3", - "symfony/finder": "~2.5|~3.0" + "symfony/console": "^2.8|^3|^4", + "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "phpunit/phpunit": "^4.8", - "satooshi/php-coveralls": "^1.0", + "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": { @@ -286,48 +298,52 @@ } ], "description": "Format text by applying transformations provided by plug-in formatters.", - "time": "2017-08-17T22:11:07+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": "19c7a1888f40bdc8e80a80fdc95d0577802611b0" + "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/19c7a1888f40bdc8e80a80fdc95d0577802611b0", - "reference": "19c7a1888f40bdc8e80a80fdc95d0577802611b0", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/ac563abfadf7cb7314b4e152f2b5033a6c255f6f", + "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f", "shasum": "" }, "require": { - "consolidation/annotated-command": "^2.2", - "consolidation/config": "^1.0.1", + "consolidation/annotated-command": "^2.8.2", + "consolidation/config": "^1.0.10", "consolidation/log": "~1", - "consolidation/output-formatters": "^3.1.5", + "consolidation/output-formatters": "^3.1.13", + "grasmash/yaml-expander": "^1.3", "league/container": "^2.2", "php": ">=5.5.0", - "symfony/console": "~2.8|~3.0", - "symfony/event-dispatcher": "~2.5|~3.0", - "symfony/filesystem": "~2.5|~3.0", - "symfony/finder": "~2.5|~3.0", - "symfony/process": "~2.5|~3.0" + "symfony/console": "^2.8|^3|^4", + "symfony/event-dispatcher": "^2.5|^3|^4", + "symfony/filesystem": "^2.5|^3|^4", + "symfony/finder": "^2.5|^3|^4", + "symfony/process": "^2.5|^3|^4" }, "replace": { "codegyre/robo": "< 1.0" }, "require-dev": { - "codeception/aspect-mock": "~1", - "codeception/base": "^2.2.6", + "codeception/aspect-mock": "^1|^2.1.1", + "codeception/base": "^2.3.7", "codeception/verify": "^0.3.2", - "henrikbjorn/lurker": "~1", - "natxet/cssmin": "~3", + "g1a/composer-test-scenarios": "^2", + "goaop/framework": "~2.1.2", + "goaop/parser-reflection": "^1.1.0", + "natxet/cssmin": "3.0.4", + "nikic/php-parser": "^3.1.5", "patchwork/jsqueeze": "~2", "pear/archive_tar": "^1.4.2", "phpunit/php-code-coverage": "~2|~4", - "satooshi/php-coveralls": "~1", + "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "^2.8" }, "suggest": { @@ -347,9 +363,6 @@ } }, "autoload": { - "classmap": [ - "scripts/composer/ScriptHandler.php" - ], "psr-4": { "Robo\\": "src" } @@ -365,7 +378,7 @@ } ], "description": "Modern task runner", - "time": "2017-08-11T21:46:23+00:00" + "time": "2018-05-27T01:42:53+00:00" }, { "name": "container-interop/container-interop", @@ -459,30 +472,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" } ], @@ -492,27 +505,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", @@ -527,13 +540,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", @@ -542,30 +555,78 @@ "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.1.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/grasmash/yaml-expander.git", - "reference": "720c54b2c99b80d5d696714b6826183d34edce93" + "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/720c54b2c99b80d5d696714b6826183d34edce93", - "reference": "720c54b2c99b80d5d696714b6826183d34edce93", + "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1", + "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1", "shasum": "" }, "require": { "dflydev/dot-access-data": "^1.1.0", "php": ">=5.4", - "symfony/yaml": "^2.8.11|^3" + "symfony/yaml": "^2.8.11|^3|^4" }, "require-dev": { + "greg-1-anderson/composer-test-scenarios": "^1", "phpunit/phpunit": "^4.8|^5.5.4", - "satooshi/php-coveralls": "^1.0", + "satooshi/php-coveralls": "^1.0.2|dev-master", "squizlabs/php_codesniffer": "^2.7" }, "type": "library", @@ -589,7 +650,7 @@ } ], "description": "Expands internal property references in a yaml file.", - "time": "2017-08-01T16:15:05+00:00" + "time": "2017-12-16T16:06:03+00:00" }, { "name": "league/container", @@ -658,16 +719,16 @@ }, { "name": "natxet/CssMin", - "version": "v3.0.4", + "version": "v3.0.6", "source": { "type": "git", "url": "https://github.com/natxet/CssMin.git", - "reference": "92de3fe3ccb4f8298d31952490ef7d5395855c39" + "reference": "d5d9f4c3e5cedb1ae96a95a21731f8790e38f1dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/natxet/CssMin/zipball/92de3fe3ccb4f8298d31952490ef7d5395855c39", - "reference": "92de3fe3ccb4f8298d31952490ef7d5395855c39", + "url": "https://api.github.com/repos/natxet/CssMin/zipball/d5d9f4c3e5cedb1ae96a95a21731f8790e38f1dd", + "reference": "d5d9f4c3e5cedb1ae96a95a21731f8790e38f1dd", "shasum": "" }, "require": { @@ -701,7 +762,7 @@ "css", "minify" ], - "time": "2015-09-25T11:13:11+00:00" + "time": "2018-01-09T11:15:01+00:00" }, { "name": "patchwork/jsqueeze", @@ -745,152 +806,6 @@ ], "time": "2015-03-25T10:11:08+00:00" }, - { - "name": "phpdocumentor/reflection-common", - "version": "1.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "^4.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "time": "2015-12-27T11:43:31+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "3.2.2", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157", - "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.3.0", - "webmozart/assert": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-08-08T06:39:58+00:00" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "0.3.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773", - "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773", - "shasum": "" - }, - "require": { - "php": "^5.5 || ^7.0", - "phpdocumentor/reflection-common": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^5.2||^4.8.24" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "time": "2017-06-03T08:32:36+00:00" - }, { "name": "psr/container", "version": "1.0.0", @@ -989,64 +904,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" @@ -1063,48 +951,49 @@ "phpcs", "standards" ], - "time": "2017-05-22T02:43:20+00:00" + "time": "2018-06-06T23:58:19+00:00" }, { "name": "symfony/console", - "version": "v3.3.8", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "d6596cb5022b6a0bd940eae54a1de78646a5fda6" + "reference": "36f83f642443c46f3cf751d4d2ee5d047d757a27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d6596cb5022b6a0bd940eae54a1de78646a5fda6", - "reference": "d6596cb5022b6a0bd940eae54a1de78646a5fda6", + "url": "https://api.github.com/repos/symfony/console/zipball/36f83f642443c46f3cf751d4d2ee5d047d757a27", + "reference": "36f83f642443c46f3cf751d4d2ee5d047d757a27", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8", - "symfony/debug": "~2.8|~3.0", + "symfony/debug": "~2.8|~3.0|~4.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.3", - "symfony/dependency-injection": "~3.3", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/filesystem": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" + "symfony/config": "~3.3|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/lock": "~3.4|~4.0", + "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/filesystem": "", + "symfony/lock": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1131,20 +1020,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-08-27T14:52:21+00:00" + "time": "2018-05-16T08:49:21+00:00" }, { "name": "symfony/debug", - "version": "v3.3.8", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "084d804fe35808eb2ef596ec83d85d9768aa6c9d" + "reference": "b28fd73fefbac341f673f5efd707d539d6a19f68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/084d804fe35808eb2ef596ec83d85d9768aa6c9d", - "reference": "084d804fe35808eb2ef596ec83d85d9768aa6c9d", + "url": "https://api.github.com/repos/symfony/debug/zipball/b28fd73fefbac341f673f5efd707d539d6a19f68", + "reference": "b28fd73fefbac341f673f5efd707d539d6a19f68", "shasum": "" }, "require": { @@ -1155,12 +1044,12 @@ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/http-kernel": "~2.8|~3.0" + "symfony/http-kernel": "~2.8|~3.0|~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1187,20 +1076,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-08-27T14:52:21+00:00" + "time": "2018-05-16T14:03:39+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.3.8", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "54ca9520a00386f83bca145819ad3b619aaa2485" + "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/54ca9520a00386f83bca145819ad3b619aaa2485", - "reference": "54ca9520a00386f83bca145819ad3b619aaa2485", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/fdd5abcebd1061ec647089c6c41a07ed60af09f8", + "reference": "fdd5abcebd1061ec647089c6c41a07ed60af09f8", "shasum": "" }, "require": { @@ -1211,10 +1100,10 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~3.3", - "symfony/expression-language": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0" + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/dependency-injection": "", @@ -1223,7 +1112,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1250,29 +1139,30 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-07-29T21:54:42+00:00" + "time": "2018-04-06T07:35:25+00:00" }, { "name": "symfony/filesystem", - "version": "v3.3.8", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "b32a0e5f928d0fa3d1dd03c78d020777e50c10cb" + "reference": "8e03ca3fa52a0f56b87506f38cf7bd3f9442b3a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/b32a0e5f928d0fa3d1dd03c78d020777e50c10cb", - "reference": "b32a0e5f928d0fa3d1dd03c78d020777e50c10cb", + "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": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1299,20 +1189,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-07-29T21:54:42+00:00" + "time": "2018-05-16T08:49:21+00:00" }, { "name": "symfony/finder", - "version": "v3.3.8", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "b2260dbc80f3c4198f903215f91a1ac7fe9fe09e" + "reference": "472a92f3df8b247b49ae364275fb32943b9656c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/b2260dbc80f3c4198f903215f91a1ac7fe9fe09e", - "reference": "b2260dbc80f3c4198f903215f91a1ac7fe9fe09e", + "url": "https://api.github.com/repos/symfony/finder/zipball/472a92f3df8b247b49ae364275fb32943b9656c6", + "reference": "472a92f3df8b247b49ae364275fb32943b9656c6", "shasum": "" }, "require": { @@ -1321,7 +1211,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1348,20 +1238,75 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-07-29T21:54:42+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.5.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803" + "reference": "3296adf6a6454a050679cde90f95350ad604b171" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803", - "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", + "reference": "3296adf6a6454a050679cde90f95350ad604b171", "shasum": "" }, "require": { @@ -1373,7 +1318,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -1407,20 +1352,20 @@ "portable", "shim" ], - "time": "2017-06-14T15:44:48+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/process", - "version": "v3.3.8", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0" + "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0", - "reference": "b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0", + "url": "https://api.github.com/repos/symfony/process/zipball/4cbf2db9abcb01486a21b7a059e03a62fae63187", + "reference": "4cbf2db9abcb01486a21b7a059e03a62fae63187", "shasum": "" }, "require": { @@ -1429,7 +1374,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1456,27 +1401,31 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-07-29T21:54:42+00:00" + "time": "2018-05-16T08:49:21+00:00" }, { "name": "symfony/yaml", - "version": "v3.3.8", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0" + "reference": "c5010cc1692ce1fa328b1fb666961eb3d4a85bb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/1d8c2a99c80862bdc3af94c1781bf70f86bccac0", - "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0", + "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" }, "require-dev": { - "symfony/console": "~2.8|~3.0" + "symfony/console": "~3.4|~4.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -1484,7 +1433,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1511,69 +1460,19 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-07-29T21:54:42+00:00" - }, - { - "name": "webmozart/assert", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/webmozart/assert.git", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "time": "2016-11-23T20:04:58+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": { - "php": ">=5.6.0" + "php": ">=5.6" }, "platform-dev": [], "platform-overrides": { - "php": "5.6.0" + "php": "5.6" } } From 1643873b30b181f86430476ace48dc4a6a282c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 22 Jun 2018 15:05:18 +0200 Subject: [PATCH 4/7] Fix coding standards violations --- hook.php | 8 ++++---- inc/container.class.php | 30 +++++++++++++++--------------- inc/field.class.php | 8 ++++---- inc/labeltranslation.class.php | 6 +++--- setup.php | 4 ++-- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/hook.php b/hook.php index 80849f9e..33e46122 100644 --- a/hook.php +++ b/hook.php @@ -77,7 +77,7 @@ function plugin_fields_install() { $dir = GLPI_ROOT . "/plugins/fields/inc/"; $item =strtolower($plug['class']); if (file_exists("$dir$item.class.php")) { - if (!call_user_func(array($class,'install'), $migration, $version)) { + if (!call_user_func([$class,'install'], $migration, $version)) { return false; } } @@ -136,7 +136,7 @@ function plugin_fields_uninstall() { if (file_exists("$dir$item.class.php")) { include_once ("$dir$item.class.php"); - if (!call_user_func(array($class,'uninstall'))) { + if (!call_user_func([$class,'uninstall'])) { return false; } } @@ -263,11 +263,11 @@ function plugin_fields_rule_matched($params = []) { // update current field $container->updateFieldsValues( - array( + [ 'plugin_fields_containers_id' => $data['id'], $field => $value, 'items_id' => $agent->fields['computers_id'] - ), + ], Computer::getType() ); } diff --git a/inc/container.class.php b/inc/container.class.php index 07335b42..770daea7 100644 --- a/inc/container.class.php +++ b/inc/container.class.php @@ -287,7 +287,7 @@ static function getSpecificValueToDisplay($field, $values, array $options = []) } - function getValueToSelect($field_id_or_search_options, $name = '', $values = '', $options = array()) { + function getValueToSelect($field_id_or_search_options, $name = '', $values = '', $options = []) { switch ($field_id_or_search_options['table'].'.'.$field_id_or_search_options['field']) { // For searchoption "Type" @@ -302,7 +302,7 @@ function getValueToSelect($field_id_or_search_options, $name = '', $values = '', return parent::getValueToSelect($field_id_or_search_options, $name, $values, $options); } - function defineTabs($options = array()) { + function defineTabs($options = []) { $ong = []; $this->addDefaultFormTab($ong); $this->addStandardTab('PluginFieldsField', $ong, $options); @@ -376,8 +376,8 @@ function prepareInputForAdd($input) { } $input['itemtypes'] = isset($input['itemtypes']) - ? json_encode($input['itemtypes'], TRUE) - : NULL; + ? json_encode($input['itemtypes'], true) + : null; return $input; } @@ -401,7 +401,7 @@ function post_addItem() { public static function generateTemplate($fields) { $itemtypes = strlen($fields['itemtypes']) > 0 - ? json_decode($fields['itemtypes'], TRUE) + ? json_decode($fields['itemtypes'], true) : []; foreach ($itemtypes as $itemtype) { $sysname = self::getSystemName($itemtype, $fields['name']); @@ -511,7 +511,7 @@ static function getTypeName($nb = 0) { return __("Block", "fields"); } - public function showForm($ID, $options = array()) { + public function showForm($ID, $options = []) { global $CFG_GLPI; $this->initForm($ID, $options); @@ -605,7 +605,7 @@ public function showForm($ID, $options = array()) { return true; } - static function showFormItemtype($params = array()) { + static function showFormItemtype($params = []) { global $CFG_GLPI; $is_domtab = isset($params['type']) && $params['type'] == 'domtab'; @@ -618,7 +618,7 @@ static function showFormItemtype($params = array()) { 'display_emptychoice' => $is_domtab]); if ($is_domtab) { - Ajax::updateItemOnSelectEvent(array("dropdown_type$rand", "dropdown_itemtypes$rand"), + Ajax::updateItemOnSelectEvent(["dropdown_type$rand", "dropdown_itemtypes$rand"], "subtype_$rand", "../ajax/container_subtype_dropdown.php", ['type' => '__VALUE0__', @@ -827,7 +827,7 @@ static function getEntries($type = 'tab', $full = false) { AND `plugin_fields_containers_id` = '".$item['id']."' AND `right` >= ".READ); $first_found = array_shift($found); - if ($first_found['right'] == NULL || $first_found['right'] == 0) { + if ($first_found['right'] == null || $first_found['right'] == 0) { continue; } @@ -878,7 +878,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { // needs to check if entity of item is in hierachy of $tab_name foreach ($container->find("`is_active` = 1 AND `name` = '$tab_name'") as $data) { $dataitemtypes = json_decode($data['itemtypes']); - if (in_array(get_class($item), $dataitemtypes) != FALSE) { + if (in_array(get_class($item), $dataitemtypes) != false) { $entities = [$data['entities_id']]; if ($data['is_recursive']) { $entities = getSonsOf(getTableForItemType('Entity'), $data['entities_id']); @@ -901,7 +901,7 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtem $found_c = $container->find("`type` = 'tab' AND `name` = '$tabnum' AND is_active = 1"); foreach ($found_c as $data) { $dataitemtypes = json_decode($data['itemtypes']); - if (in_array(get_class($item), $dataitemtypes) != FALSE) { + if (in_array(get_class($item), $dataitemtypes) != false) { return PluginFieldsField::showForTabContainer($data['id'], $item->fields['id'], get_class($item)); } } @@ -963,7 +963,7 @@ function updateFieldsValues($data, $itemtype, $massiveaction = false) { * @return nothing */ static function constructHistory($containers_id, $items_id, $itemtype, $data, - $old_values = array()) { + $old_values = []) { // Don't log few itemtypes $obj = new $itemtype(); if ($obj->dohistory == false) { @@ -1189,7 +1189,7 @@ static function findContainer($itemtype, $type = 'tab', $subtype = '') { foreach ($itemtypes as $data) { $dataitemtypes = json_decode($data['itemtypes']); $item = new $itemtype(); - if (in_array($item->getType(), $dataitemtypes) != FALSE) { + if (in_array($item->getType(), $dataitemtypes) != false) { $id = $data['id']; } } @@ -1206,7 +1206,7 @@ static function findContainer($itemtype, $type = 'tab', $subtype = '') { $found = $profile->find("`profiles_id` = '".$_SESSION['glpiactiveprofile']['id']."' AND $condition"); $first_found = array_shift($found); - if ($first_found['right'] == NULL || $first_found['right'] == 0) { + if ($first_found['right'] == null || $first_found['right'] == 0) { return false; } } @@ -1291,7 +1291,7 @@ static function preItem(CommonDBTM $item) { //need to check if container is usable on this object entity $loc_c = new PluginFieldsContainer; $loc_c->getFromDB($c_id); - $entities = array($loc_c->fields['entities_id']); + $entities = [$loc_c->fields['entities_id']]; if ($loc_c->fields['is_recursive']) { $entities = getSonsOf(getTableForItemType('Entity'), $loc_c->fields['entities_id']); } diff --git a/inc/field.class.php b/inc/field.class.php index b7c86f1f..a700fa30 100644 --- a/inc/field.class.php +++ b/inc/field.class.php @@ -228,7 +228,7 @@ function getNextRanking() { return 0; } - function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { + function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { if (!$withtemplate) { $nb = 0; switch ($item->getType()) { @@ -243,13 +243,13 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { "`plugin_fields_containers_id` = '".$item->getID()."'")); } - static function displayTabContentForItem(CommonGLPI $item, $tabnum=1, $withtemplate=0) { + static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtemplate = 0) { $fup = new self(); $fup->showSummary($item); return true; } - function defineTabs($options = array()) { + function defineTabs($options = []) { $ong = []; $this->addDefaultFormTab($ong); $this->addStandardTab('PluginFieldsLabelTranslation', $ong, $options); @@ -348,7 +348,7 @@ function showSummary($container) { } - function showForm($ID, $options = array()) { + function showForm($ID, $options = []) { global $CFG_GLPI; if (isset($options['parent_id']) && !empty($options['parent_id'])) { diff --git a/inc/labeltranslation.class.php b/inc/labeltranslation.class.php index cec1466b..9469a88c 100644 --- a/inc/labeltranslation.class.php +++ b/inc/labeltranslation.class.php @@ -63,7 +63,7 @@ static function createForItem(CommonDBTM $item) { return true; } - function getTabNameForItem(CommonGLPI $item, $withtemplate=0) { + function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) { $nb = countElementsInTable(self::getTable(), "`plugin_fields_itemtype` = '{$item::getType()}' AND `plugin_fields_items_id` = '{$item->getID()}'"); @@ -71,7 +71,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) { self::showTranslations($item); } @@ -177,7 +177,7 @@ static function showTranslations(CommonDBTM $item) { * * @return void */ - function showForm($itemtype, $items_id, $id=-1) { + function showForm($itemtype, $items_id, $id = -1) { global $CFG_GLPI; if ($id > 0) { diff --git a/setup.php b/setup.php index 2dfc6f1d..12caa567 100644 --- a/setup.php +++ b/setup.php @@ -81,7 +81,7 @@ function plugin_init_fields() { // Init hook about itemtype(s) for plugin fields if (!isset($PLUGIN_HOOKS['plugin_fields'])) { - $PLUGIN_HOOKS['plugin_fields'] = array(); + $PLUGIN_HOOKS['plugin_fields'] = []; } // When a Category is changed during ticket creation @@ -241,7 +241,7 @@ function plugin_fields_checkFiles($force = false) { foreach ($containers as $container) { $itemtypes = (strlen($container['itemtypes']) > 0) - ? json_decode($container['itemtypes'], TRUE) + ? json_decode($container['itemtypes'], true) : []; foreach ($itemtypes as $itemtype) { $classname = PluginFieldsContainer::getClassname($itemtype, $container['name']); From 85f61278e7d5b47ab19419b3255767b6269e5031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Mon, 25 Jun 2018 15:08:58 +0200 Subject: [PATCH 5/7] Fix Countable warning on plugin installation; fixes #256 --- inc/container.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inc/container.class.php b/inc/container.class.php index 770daea7..409fbae2 100644 --- a/inc/container.class.php +++ b/inc/container.class.php @@ -132,9 +132,10 @@ static function install(Migration $migration, $version) { $containers = $obj->find(); foreach ($containers as $container) { //First, drop old fields from plugin directories - $itemtypes = (count($container['itemtypes']) > 0) + $itemtypes = !empty($container['itemtypes']) ? json_decode($container['itemtypes'], true) : []; + foreach ($itemtypes as $itemtype) { $sysname = self::getSystemName($itemtype, $container['name']); $class_filename = $sysname.".class.php"; From 128be6de35f4081636d262fb3e34b99c9e5a9efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 22 Jun 2018 13:56:16 +0200 Subject: [PATCH 6/7] Update locales --- .tx/config | 4 +- locales/cs_CZ.mo | Bin 3340 -> 3313 bytes locales/cs_CZ.po | 98 +++++++++++++++++--------------- locales/en_GB.mo | Bin 1921 -> 3172 bytes locales/en_GB.po | 138 ++++++++++++++++++++++++--------------------- locales/en_US.mo | Bin 3059 -> 3036 bytes locales/en_US.po | 98 +++++++++++++++++--------------- locales/es_ES.mo | Bin 2218 -> 2195 bytes locales/es_ES.po | 98 +++++++++++++++++--------------- locales/fields.pot | 94 +++++++++++++++--------------- locales/fr_FR.mo | Bin 3324 -> 3301 bytes locales/fr_FR.po | 101 ++++++++++++++++++--------------- locales/pl_PL.mo | Bin 3344 -> 3321 bytes locales/pl_PL.po | 98 +++++++++++++++++--------------- locales/pt_BR.mo | Bin 3256 -> 3232 bytes locales/pt_BR.po | 98 +++++++++++++++++--------------- locales/ro_RO.mo | Bin 1506 -> 1483 bytes locales/ro_RO.po | 98 +++++++++++++++++--------------- locales/ru_RU.mo | Bin 4064 -> 4048 bytes locales/ru_RU.po | 98 +++++++++++++++++--------------- locales/tr_TR.mo | Bin 3160 -> 3140 bytes locales/tr_TR.po | 98 +++++++++++++++++--------------- 22 files changed, 596 insertions(+), 525 deletions(-) diff --git a/.tx/config b/.tx/config index c4ffe0a3..86703e06 100644 --- a/.tx/config +++ b/.tx/config @@ -1,8 +1,8 @@ [main] host = https://www.transifex.com -[glpi-plugin-plugin-fields.fieldspot] +[glpi-plugin-plugin-fields.fields-pot] file_filter = locales/.po source_file = locales/fields.pot source_lang = en - +type = PO diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo index aff55aee9dcd00dabae64703e3f34bd7e62a8287..d8a3c45b992d8cc3092e5bde13a7f19efa48e795 100644 GIT binary patch delta 411 zcmYk&J4?e*6u|LgXjA(DQSemJY81UbV=|D@{JDaJnH~g zv4(f3Zv0m0oNBkJJ;$_`P1`Xn$F=P_i;>&jG8@ekKk{3Fx$ebH*RZY9|GI_0y1Ey| e=1%AZ(Xkh|Lf5E1-yenkp-~BfX6GVvp8f&YU^lb? delta 450 zcmXZYJ5Rz;6bJAlQjnrC4!$tPlIUQ_#oHDT>m$AvlO_^F984s+k{i-UDJh7LrC-3= z!QIV)gvrI#ufbPfVby=7%}syze{y?z+R^H3rf*LL*%;Axf@qP5hBHL-a2%OP5yg?0 zAWF0bSKua8;31raXOR_{M81ub5Q|*g3h)tLz)u+V8>cAvZ}f}8G75@1dBHl|KrX?s z;Wb=qPov8oHbWHf6DWhvDZ?zR z!5bJ(`~|~_r{@MQvG;gTV!FX}Q_~BUVdS{ZxmvkoSF-1H9IwUBMORvy!SyoZCNp+5 zUbKp4j^k2o(dn|PFIt_Z=z6}TRYXrVwNuZR^?OGH;Km$S2)dl-E)udV5{*U N8j@Az;3@g6`~gv9L?i$J diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po index d4b18fb3..642365e8 100644 --- a/locales/cs_CZ.po +++ b/locales/cs_CZ.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-13 14:22+0100\n" -"PO-Revision-Date: 2018-03-27 05:53+0000\n" -"Last-Translator: Pavel Borecki \n" +"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"PO-Revision-Date: 2018-06-28 08:23+0000\n" +"Last-Translator: Cédric Anne\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +21,7 @@ msgstr "" "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" #: front/container.php:4 front/container.form.php:35 inc/menu.class.php:6 -#: setup.php:161 +#: setup.php:174 msgid "Additionnal fields" msgstr "Další kolonky" @@ -29,43 +29,31 @@ msgstr "Další kolonky" msgid "MySQL tables installation" msgstr "Instalace MySQL tabulek" -#: hook.php:103 +#: hook.php:106 msgid "The plugin can't be uninstalled when the plugin is disabled" msgstr "Zásuvný modul nemůže být odinstalován protože je vypnutý." -#: hook.php:112 +#: hook.php:115 msgid "MySQL tables uninstallation" msgstr "Odebrání MySQL tabulek" -#: inc/dropdown.class.php:17 -msgid "Updating generated dropdown files" -msgstr "Aktualizují se vytvořené soubory rozbalovací nabídky" - -#: inc/labeltranslation.class.php:137 -msgid "Language" -msgstr "Jazyk" - -#: inc/labeltranslation.class.php:138 -msgid "Label" -msgstr "Štítek" - -#: inc/field.class.php:70 +#: inc/field.class.php:72 msgid "Field" msgstr "Kolonka" -#: inc/field.class.php:246 +#: inc/field.class.php:241 msgid "Fields" msgstr "Kolonky" -#: inc/field.class.php:296 +#: inc/field.class.php:290 msgid "Add a new field" msgstr "Přidat novou kolonku" -#: inc/field.class.php:300 +#: inc/field.class.php:294 msgid "No field for this block" msgstr "Žádná kolonka pro tento blok" -#: inc/field.class.php:312 inc/field.class.php:414 +#: inc/field.class.php:306 inc/field.class.php:419 msgid "Read only" msgstr "Pouze pro čtení" @@ -77,96 +65,114 @@ msgstr "Nastavit" msgid "Configure fields values" msgstr "Nastavit hodnoty kolonek" -#: inc/field.class.php:840 +#: inc/field.class.php:712 msgid "show" msgstr "zobrazit" -#: inc/field.class.php:985 +#: inc/field.class.php:858 msgid "Header" msgstr "Hlavička" -#: inc/field.class.php:986 +#: inc/field.class.php:859 msgid "Text (single line)" msgstr "Text (jednořádkový)" -#: inc/field.class.php:987 +#: inc/field.class.php:860 msgid "Text (multiples lines)" msgstr "Text (víceřádkový)" -#: inc/field.class.php:988 +#: inc/field.class.php:861 msgid "Number" msgstr "Číslo" -#: inc/field.class.php:989 +#: inc/field.class.php:862 msgid "URL" msgstr "URL adresa" -#: inc/field.class.php:990 +#: inc/field.class.php:863 msgid "Dropdown" msgstr "Rozbalovací" -#: inc/field.class.php:991 +#: inc/field.class.php:864 msgid "Yes/No" msgstr "Ano/Ne" -#: inc/field.class.php:992 +#: inc/field.class.php:865 msgid "Date" msgstr "Datum" -#: inc/field.class.php:993 +#: inc/field.class.php:866 msgid "Date & time" msgstr "Datum a čas" -#: inc/container.class.php:8 +#: inc/container.class.php:12 msgid "Regenerate container files" msgstr "Znovu vytvořit kontejnerové soubory" -#: inc/container.class.php:69 +#: inc/container.class.php:127 msgid "Updating generated containers files" msgstr "Aktualizují se vytvořené soubory kontejnerů" -#: inc/container.class.php:229 +#: inc/container.class.php:318 msgid "You cannot add block without associated element type" msgstr "Není možné přidat blok bez typu přiřazeného prvku" -#: inc/container.class.php:244 +#: inc/container.class.php:335 msgid "" "You cannot add several blocks with type 'Insertion in the form' on same " "object" msgstr "Není možné přidat několik bloků s typem „Vložení do formuláře“ na stejný objekt" -#: inc/container.class.php:265 +#: inc/container.class.php:350 +msgid "" +"You cannot add several blocks with type 'Insertion in the form of a specific" +" tab' on same object tab" +msgstr "" + +#: inc/container.class.php:372 msgid "You cannot add several blocs with identical name on same object" msgstr "Není možné přidat více bloků se stejným názvem do jednoho objektu" -#: inc/container.class.php:410 +#: inc/container.class.php:512 msgid "Block" msgstr "Blok" -#: inc/container.class.php:482 +#: inc/container.class.php:583 msgid "Tab" msgstr "Tabulka" -#: inc/container.class.php:621 +#: inc/container.class.php:788 msgid "Add tab" msgstr "Přidat tabulku" -#: inc/container.class.php:622 +#: inc/container.class.php:789 msgid "Insertion in the form (before save button)" msgstr "Vložení do formuláře (před tlačítkem uložit)" -#: inc/container.class.php:623 +#: inc/container.class.php:790 msgid "Insertion in the form of a specific tab (before save button)" msgstr "Vložení do formuláře konkrétního panelu (před tlačítkem uložit)" -#: inc/container.class.php:956 +#: inc/container.class.php:1149 msgid "Some mandatory fields are empty" msgstr "Některá povinná pole nejsou vyplněná" -#: inc/container.class.php:961 +#: inc/container.class.php:1154 msgid "Some numeric fields contains non numeric values" msgstr "Některé číselné kolonky obsahují nečíselné hodnoty" -#: inc/container.class.php:966 +#: inc/container.class.php:1159 msgid "Some URL fields contains invalid links" msgstr "Některé URL kolonky obsahují neplatné odkazy" + +#: inc/labeltranslation.class.php:129 +msgid "Language" +msgstr "Jazyk" + +#: inc/labeltranslation.class.php:130 +msgid "Label" +msgstr "Štítek" + +#: inc/dropdown.class.php:16 +msgid "Updating generated dropdown files" +msgstr "Aktualizují se vytvořené soubory rozbalovací nabídky" diff --git a/locales/en_GB.mo b/locales/en_GB.mo index 65b7420ce38362f90ce7f5f336512c5742a2283b..9586c46f1da4aeccf99704d5e8301270311a94eb 100644 GIT binary patch literal 3172 zcmeH|O=ule6vwaH`0;H0X#K1oz4fC>EYqY>OL#F#8q=CKNn`R_=*Bwl&CSc$dG|i& z&Ln+wA#SB06m%sBB8XkM>Y^?LL0l?=E(AqE=%OxMx^SWX&b)aIiLu~P=;ht{&CEUb zo^$^9+<8B3-|~*4_0u1w*KSbiS$OV7F0@x~QtD0^!du|$a69b4K6nn^2G7I$;d^ik zya;cHpTb+=mr(4#hBw3SO8x+!;`tZ&9Nflau{#1~-aLE|o`erU55>>hP}cbfivLgG zPIw9Kf#1Si@DDfycd{rh)Dd_eoP&~wfn)GYIerm7&hsU>8~zBz&!6xa*vCTzt8fm! z4_|=4L0qYQi1Z2?J`F{;^CTgx6!3(`d#!V>C%{5)T;P-fG+V%Orp26d%7sDqUj@a$xWKXBsx7R4`sW%cLSwn zBwxuznrJDyNs}W%n1v3aowPgXqOY_a^nN-L6x!bl)kGBOP+POAmtvDd#d8+cg>e=; zYr~{F;?=>#HBPHZXP4q;o|?70(m=0-Np8G)G0aSH(R*|jx42JTJ94X59V%QDSFc_& zVPsM@ZM{jwla8&+0s-SlC$T+Unzce3g_%n`J>w8fOsk!B zy35$SWm2*(_RjZQd2NxiH&*USjZLkYGnpP}f0$%}9}(I^HI37Suf%qF!(&^`#J-*hFQeloltA zADVOOq{}4=>oOfuu7%`!HO`h@&KvJtBSz>*o5Zw?&2-jjn~jsaSz$Yp?qpxgF6?yw z<^}kVs_JKBDM$9s)n79Wydda?$o`{~jZ0o@xiaK9BEh&pBDM%+T}a9=yHz!xI*Bis zj)D`2O-Wbv{KVwZiNjO+#MHv#^s%|hf@!-n3ub*Yj)H@E(+4$I)s^{UwO}$e#W@J% z7+3Yk@cz+Y_&_i+s)t9bBO`l{A2%rKbU_55|Crn literal 1921 zcmeH`O^@3|7{>=FZvhIl<-Jme11O=II1aQF?=GTUc1y}`Nw+By5)zukPn@CljO7_` zb~$k2io^+t1L6cXJ_17U2@t0Wgeq}GT)1%J!2j_kT~&e)fW*i%Kil*6d!Dgx9y{`> zKzS1NBJkjGyFp9Zghr@$PHz>h&(;u|!NgWrMdbpzyi zzkxp>hCe{|{~i+T|0BrbegfJ5caZ)61lj*6CbR!>ko`}A=n`!Zm*_5d24w$Lko_}| z{l5g+|6353_!$lR{|d7IUm*LRgbdWg7RdfXki9aH=Y0V35wuX*pUXq2JeGafjmIHv zjXxkBLp{Mai}EPQYc31Nbrki%inR`i*;wGCaWttyjyh1U7gqD#p^my)5zy#Fa_=_SEg=m#b&d3(|Yj+ z>69ulu%0U3LmDf?jO5f+g=~)rBn#>ZVZlB~8rKOxXILCvWdxy|TsK zIeBd5gU)l!`-O{a)&aqR3R`qaW-g!2Skmf#8p?2EVNB^aMk`Y6&mhT zlwtp%-_`|HuxqmGmuq-w5%#igk-ZVpKBB!K+eMuRQ?hQ3{d{Nf+8dkY)V%A6cgRPV zofuZ`eVPO{NY&d^c|?`Si(A8i9OiX~yefH+^wtiQt_o_~XC_q_>ddQ=OJr;K)<~^a z)Z|0)`6aU7i_faKui_VF{8G~IpYFxI9tNr%+BLkx;kcJo?-kYW%lJ$ZpFQ0}X>DmA z)Tq+dBgw8xO)D<1so`p~*Q8b^=yI93~Go`)m#1&DXNp8kbmX}7AP3TJ;WIoClTSR2v zyLch$w6+J^8;3cIyS)}Z@IV&!`z6v4a1>FQL5XYT+m\n" -"Language-Team: English (United Kingdom) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/en_GB/)\n" +"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"PO-Revision-Date: 2018-06-28 08:22+0000\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=ASCII\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: front/container.php:4 front/container.form.php:35 inc/menu.class.php:6 -#: setup.php:161 +#: setup.php:174 msgid "Additionnal fields" msgstr "Additionnal fields" @@ -26,45 +26,33 @@ msgstr "Additionnal fields" msgid "MySQL tables installation" msgstr "MySQL tables installation" -#: hook.php:103 +#: hook.php:106 msgid "The plugin can't be uninstalled when the plugin is disabled" -msgstr "" +msgstr "The plugin can't be uninstalled when the plugin is disabled" -#: hook.php:112 +#: hook.php:115 msgid "MySQL tables uninstallation" msgstr "MySQL tables uninstallation" -#: inc/dropdown.class.php:17 -msgid "Updating generated dropdown files" -msgstr "" - -#: inc/labeltranslation.class.php:137 -msgid "Language" -msgstr "" - -#: inc/labeltranslation.class.php:138 -msgid "Label" -msgstr "" - -#: inc/field.class.php:70 +#: inc/field.class.php:72 msgid "Field" msgstr "Field" -#: inc/field.class.php:246 +#: inc/field.class.php:241 msgid "Fields" msgstr "Fields" -#: inc/field.class.php:296 +#: inc/field.class.php:290 msgid "Add a new field" msgstr "Add a new field" -#: inc/field.class.php:300 +#: inc/field.class.php:294 msgid "No field for this block" -msgstr "" +msgstr "No field for this block" -#: inc/field.class.php:312 inc/field.class.php:414 +#: inc/field.class.php:306 inc/field.class.php:419 msgid "Read only" -msgstr "" +msgstr "Read only" #: inc/field.class.php:396 msgid "Configure" @@ -74,96 +62,118 @@ msgstr "Configure" msgid "Configure fields values" msgstr "Configure fields values" -#: inc/field.class.php:840 +#: inc/field.class.php:712 msgid "show" -msgstr "" +msgstr "show" -#: inc/field.class.php:985 +#: inc/field.class.php:858 msgid "Header" msgstr "Header" -#: inc/field.class.php:986 +#: inc/field.class.php:859 msgid "Text (single line)" msgstr "Text (single line)" -#: inc/field.class.php:987 +#: inc/field.class.php:860 msgid "Text (multiples lines)" msgstr "Text (multiples lines)" -#: inc/field.class.php:988 +#: inc/field.class.php:861 msgid "Number" msgstr "Number" -#: inc/field.class.php:989 +#: inc/field.class.php:862 msgid "URL" -msgstr "" +msgstr "URL" -#: inc/field.class.php:990 +#: inc/field.class.php:863 msgid "Dropdown" msgstr "Dropdown" -#: inc/field.class.php:991 +#: inc/field.class.php:864 msgid "Yes/No" msgstr "Yes/No" -#: inc/field.class.php:992 +#: inc/field.class.php:865 msgid "Date" msgstr "Date" -#: inc/field.class.php:993 +#: inc/field.class.php:866 msgid "Date & time" msgstr "Date & time" -#: inc/container.class.php:8 +#: inc/container.class.php:12 msgid "Regenerate container files" msgstr "Regenerate container files" -#: inc/container.class.php:69 +#: inc/container.class.php:127 msgid "Updating generated containers files" -msgstr "" +msgstr "Updating generated containers files" -#: inc/container.class.php:229 +#: inc/container.class.php:318 msgid "You cannot add block without associated element type" -msgstr "" +msgstr "You cannot add block without associated element type" -#: inc/container.class.php:244 +#: inc/container.class.php:335 msgid "" "You cannot add several blocks with type 'Insertion in the form' on same " "object" msgstr "" +"You cannot add several blocks with type 'Insertion in the form' on same " +"object" + +#: inc/container.class.php:350 +msgid "" +"You cannot add several blocks with type 'Insertion in the form of a specific " +"tab' on same object tab" +msgstr "" +"You cannot add several blocks with type 'Insertion in the form of a specific " +"tab' on same object tab" -#: inc/container.class.php:265 +#: inc/container.class.php:372 msgid "You cannot add several blocs with identical name on same object" -msgstr "" +msgstr "You cannot add several blocs with identical name on same object" -#: inc/container.class.php:410 +#: inc/container.class.php:512 msgid "Block" -msgstr "" +msgstr "Block" -#: inc/container.class.php:482 +#: inc/container.class.php:583 msgid "Tab" msgstr "Tab" -#: inc/container.class.php:621 +#: inc/container.class.php:788 msgid "Add tab" msgstr "Add tab" -#: inc/container.class.php:622 +#: inc/container.class.php:789 msgid "Insertion in the form (before save button)" msgstr "Insertion in the form (before save button)" -#: inc/container.class.php:623 +#: inc/container.class.php:790 msgid "Insertion in the form of a specific tab (before save button)" msgstr "Insertion in the form of a specific tab (before save button)" -#: inc/container.class.php:956 +#: inc/container.class.php:1149 msgid "Some mandatory fields are empty" msgstr "Some mandatory fields are empty" -#: inc/container.class.php:961 +#: inc/container.class.php:1154 msgid "Some numeric fields contains non numeric values" msgstr "Some numeric fields contains non numeric values" -#: inc/container.class.php:966 +#: inc/container.class.php:1159 msgid "Some URL fields contains invalid links" -msgstr "" +msgstr "Some URL fields contains invalid links" + +#: inc/labeltranslation.class.php:129 +msgid "Language" +msgstr "Language" + +#: inc/labeltranslation.class.php:130 +msgid "Label" +msgstr "Label" + +#: inc/dropdown.class.php:16 +msgid "Updating generated dropdown files" +msgstr "Updating generated dropdown files" diff --git a/locales/en_US.mo b/locales/en_US.mo index a76fa3b0d54429151717f6bff262ab368b1f2b59..c89eea6bbb0d8771d776855f8021ed7b1191581d 100644 GIT binary patch delta 410 zcmYk%K_~=K7{Kvw8FqK}AbT*Owvn<2O~#PMxDe&CAt_r*O-!27>^3uPIc*Y0M;9q4 z<+ioSMM@$UXDJs>oE((1|F8$I*ZaNqz3+Xm?@N2p8l_bIG9_}|Dbgh(wTws_53m~# zu>(&ri)W}|0~LJ096lmbo>`LoH>9MzxBSE+=Wm?E0>zTNa#rfU57!Cw64=6i+{NUh z6HE$SAXBbb`tTly@D&S~QAI|ui0!zFJ-CK>3~>tgTlY6O$oWp?)c~6h0?9`?+8M_@ zF5o;);}IquKQ(vSj+L@)m=lI&>!$5k*09M?mllm>ujWU7B{1gP*mHEt9Q~g+_Lo<3 fqu5vp-5}a_<4Wl0v$yA)p}(Qe1cBGwOIMX2xxqXS delta 449 zcmXZXJxBvF6bJBEt*t!~(ZQmEMg>Jm^m4Y9o>B@rNl}r`V#K38T61uB^#jD49oz+V zbQFXNPP)2?i;F|W#aRRwo%Daw@W?MOc`qT&2)?1JwQL7$ky`X7iZ>9=JJ&6CKxVGd?sSmz`t_;0LZV*ndRa0s5l z@Sz(RUi1hN^o(f`zQPIk4Ts@~Ml=KSupKJc4_(*?kKsH#Z=JuuapX-6U87ip-v}QX zgK0PgSKtOLz$+O3_@i;qb`}k?To_!;GLbe7Bc%&n*Vb0~y0vS2wxjrx^evMax|rj7 zjvEFO8B=6aI)+x1p3h6JR9;Q`j%%`Iry>hVDwbQ==f2vW-m>y& TQsufVTfAh+9g{T<\n" +"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"PO-Revision-Date: 2018-06-28 08:23+0000\n" +"Last-Translator: Cédric Anne\n" "Language-Team: English (United States) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/en_US/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: front/container.php:4 front/container.form.php:35 inc/menu.class.php:6 -#: setup.php:161 +#: setup.php:174 msgid "Additionnal fields" msgstr "Additional Fields" @@ -27,43 +27,31 @@ msgstr "Additional Fields" msgid "MySQL tables installation" msgstr "MySQL tables installation" -#: hook.php:103 +#: hook.php:106 msgid "The plugin can't be uninstalled when the plugin is disabled" msgstr "The plugin can't be uninstalled when the plugin is disabled" -#: hook.php:112 +#: hook.php:115 msgid "MySQL tables uninstallation" msgstr "MySQL tables uninstallation" -#: inc/dropdown.class.php:17 -msgid "Updating generated dropdown files" -msgstr "Updating generated dropdown files" - -#: inc/labeltranslation.class.php:137 -msgid "Language" -msgstr "Language" - -#: inc/labeltranslation.class.php:138 -msgid "Label" -msgstr "Label" - -#: inc/field.class.php:70 +#: inc/field.class.php:72 msgid "Field" msgstr "Field" -#: inc/field.class.php:246 +#: inc/field.class.php:241 msgid "Fields" msgstr "Fields" -#: inc/field.class.php:296 +#: inc/field.class.php:290 msgid "Add a new field" msgstr "Add a New Field" -#: inc/field.class.php:300 +#: inc/field.class.php:294 msgid "No field for this block" msgstr "No Field for this Block" -#: inc/field.class.php:312 inc/field.class.php:414 +#: inc/field.class.php:306 inc/field.class.php:419 msgid "Read only" msgstr "Read Only" @@ -75,96 +63,114 @@ msgstr "Configure" msgid "Configure fields values" msgstr "Configure Fields Values" -#: inc/field.class.php:840 +#: inc/field.class.php:712 msgid "show" msgstr "show" -#: inc/field.class.php:985 +#: inc/field.class.php:858 msgid "Header" msgstr "Header" -#: inc/field.class.php:986 +#: inc/field.class.php:859 msgid "Text (single line)" msgstr "Text (single line)" -#: inc/field.class.php:987 +#: inc/field.class.php:860 msgid "Text (multiples lines)" msgstr "Text (multiples lines)" -#: inc/field.class.php:988 +#: inc/field.class.php:861 msgid "Number" msgstr "Number" -#: inc/field.class.php:989 +#: inc/field.class.php:862 msgid "URL" msgstr "URL" -#: inc/field.class.php:990 +#: inc/field.class.php:863 msgid "Dropdown" msgstr "Dropdown" -#: inc/field.class.php:991 +#: inc/field.class.php:864 msgid "Yes/No" msgstr "Yes/No" -#: inc/field.class.php:992 +#: inc/field.class.php:865 msgid "Date" msgstr "Date" -#: inc/field.class.php:993 +#: inc/field.class.php:866 msgid "Date & time" msgstr "Date & Time" -#: inc/container.class.php:8 +#: inc/container.class.php:12 msgid "Regenerate container files" msgstr "Regenerate container files" -#: inc/container.class.php:69 +#: inc/container.class.php:127 msgid "Updating generated containers files" msgstr "Updating generated containers files" -#: inc/container.class.php:229 +#: inc/container.class.php:318 msgid "You cannot add block without associated element type" msgstr "You cannot add block without associated element type" -#: inc/container.class.php:244 +#: inc/container.class.php:335 msgid "" "You cannot add several blocks with type 'Insertion in the form' on same " "object" msgstr "You cannot add several blocks with type 'Insertion in the form' on same object" -#: inc/container.class.php:265 +#: inc/container.class.php:350 +msgid "" +"You cannot add several blocks with type 'Insertion in the form of a specific" +" tab' on same object tab" +msgstr "" + +#: inc/container.class.php:372 msgid "You cannot add several blocs with identical name on same object" msgstr "You cannot add several blocks with identical name on same object" -#: inc/container.class.php:410 +#: inc/container.class.php:512 msgid "Block" msgstr "Block" -#: inc/container.class.php:482 +#: inc/container.class.php:583 msgid "Tab" msgstr "Tab" -#: inc/container.class.php:621 +#: inc/container.class.php:788 msgid "Add tab" msgstr "Add Tab" -#: inc/container.class.php:622 +#: inc/container.class.php:789 msgid "Insertion in the form (before save button)" msgstr "Insert in the Form (before save button)" -#: inc/container.class.php:623 +#: inc/container.class.php:790 msgid "Insertion in the form of a specific tab (before save button)" msgstr "Insert in the Form of a Specific Tab (before save button)" -#: inc/container.class.php:956 +#: inc/container.class.php:1149 msgid "Some mandatory fields are empty" msgstr "Some required fields are empty" -#: inc/container.class.php:961 +#: inc/container.class.php:1154 msgid "Some numeric fields contains non numeric values" msgstr "Some numeric fields contains non-numeric values" -#: inc/container.class.php:966 +#: inc/container.class.php:1159 msgid "Some URL fields contains invalid links" msgstr "Some URL fields contains invalid links" + +#: inc/labeltranslation.class.php:129 +msgid "Language" +msgstr "Language" + +#: inc/labeltranslation.class.php:130 +msgid "Label" +msgstr "Label" + +#: inc/dropdown.class.php:16 +msgid "Updating generated dropdown files" +msgstr "Updating generated dropdown files" diff --git a/locales/es_ES.mo b/locales/es_ES.mo index d0b1c7499218a352e0c77b6acbb85f196b60b01a..5f19c5aedc11f3971a9371024a7988041e6af844 100644 GIT binary patch delta 293 zcmYk$ze@sf7{~F)pC=OHrGjG7L0ft7+LMPqZLe}L};2jR=-_3#;<@AIWE^!fj26%cs}i=;$Ei;5&MkEd9`IM(n2n;5|^ zp5Pnm_|DzdR;R-AGi!n?SIXuS< zma&Gn=pQy&Zvwku(l%Aev}{A!Rm-|oYOxJx)p2=4sZ_k>^atjH=eYe>XVCMiM&oDM Q@m|_S-F2VWXOU@W4}E?qUjP6A delta 316 zcmXZWu}i~H5XbSWHdcyAqX@d_12@By*07E% z*v3QbU~$+>{$Bc-srlM7+S^fHJut>`z41qR^>|Oa4Q-6_b_36MTwb*mrkOrV!Z;m- p*)R#z$*>p3syT}KgD6h>k=oCaFzt1dqidbTo$br+L2g<1vwv}eGmHQL diff --git a/locales/es_ES.po b/locales/es_ES.po index fe09353f..a4d67d57 100644 --- a/locales/es_ES.po +++ b/locales/es_ES.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-13 14:22+0100\n" -"PO-Revision-Date: 2017-09-22 15:16+0000\n" -"Last-Translator: Johan Cwiklinski \n" +"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"PO-Revision-Date: 2018-06-28 08:23+0000\n" +"Last-Translator: Cédric Anne\n" "Language-Team: Spanish (Spain) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/es_ES/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: front/container.php:4 front/container.form.php:35 inc/menu.class.php:6 -#: setup.php:161 +#: setup.php:174 msgid "Additionnal fields" msgstr "Campos adicionales" @@ -28,43 +28,31 @@ msgstr "Campos adicionales" msgid "MySQL tables installation" msgstr "Instalación de las tablas MySQL" -#: hook.php:103 +#: hook.php:106 msgid "The plugin can't be uninstalled when the plugin is disabled" msgstr "El plugin no se puede desinstalar el plugin cuando se desactiva" -#: hook.php:112 +#: hook.php:115 msgid "MySQL tables uninstallation" msgstr "Desinstalación de las tablas MySQL" -#: inc/dropdown.class.php:17 -msgid "Updating generated dropdown files" -msgstr "" - -#: inc/labeltranslation.class.php:137 -msgid "Language" -msgstr "" - -#: inc/labeltranslation.class.php:138 -msgid "Label" -msgstr "" - -#: inc/field.class.php:70 +#: inc/field.class.php:72 msgid "Field" msgstr "Campo" -#: inc/field.class.php:246 +#: inc/field.class.php:241 msgid "Fields" msgstr "Campos" -#: inc/field.class.php:296 +#: inc/field.class.php:290 msgid "Add a new field" msgstr "Agregar nuevo campo" -#: inc/field.class.php:300 +#: inc/field.class.php:294 msgid "No field for this block" msgstr "" -#: inc/field.class.php:312 inc/field.class.php:414 +#: inc/field.class.php:306 inc/field.class.php:419 msgid "Read only" msgstr "Solo lectura" @@ -76,96 +64,114 @@ msgstr "Configurar" msgid "Configure fields values" msgstr "Configure valores de los campos" -#: inc/field.class.php:840 +#: inc/field.class.php:712 msgid "show" msgstr "" -#: inc/field.class.php:985 +#: inc/field.class.php:858 msgid "Header" msgstr "Encabezamiento" -#: inc/field.class.php:986 +#: inc/field.class.php:859 msgid "Text (single line)" msgstr "Texto (línea simple)" -#: inc/field.class.php:987 +#: inc/field.class.php:860 msgid "Text (multiples lines)" msgstr "Texto (multiples líneas)" -#: inc/field.class.php:988 +#: inc/field.class.php:861 msgid "Number" msgstr "Número" -#: inc/field.class.php:989 +#: inc/field.class.php:862 msgid "URL" msgstr "" -#: inc/field.class.php:990 +#: inc/field.class.php:863 msgid "Dropdown" msgstr "Menú desplegable" -#: inc/field.class.php:991 +#: inc/field.class.php:864 msgid "Yes/No" msgstr "Si/No" -#: inc/field.class.php:992 +#: inc/field.class.php:865 msgid "Date" msgstr "Fecha" -#: inc/field.class.php:993 +#: inc/field.class.php:866 msgid "Date & time" msgstr "Fecha & Hora" -#: inc/container.class.php:8 +#: inc/container.class.php:12 msgid "Regenerate container files" msgstr "Regenerar archivos contenedores" -#: inc/container.class.php:69 +#: inc/container.class.php:127 msgid "Updating generated containers files" msgstr "" -#: inc/container.class.php:229 +#: inc/container.class.php:318 msgid "You cannot add block without associated element type" msgstr "" -#: inc/container.class.php:244 +#: inc/container.class.php:335 msgid "" "You cannot add several blocks with type 'Insertion in the form' on same " "object" msgstr "" -#: inc/container.class.php:265 +#: inc/container.class.php:350 +msgid "" +"You cannot add several blocks with type 'Insertion in the form of a specific" +" tab' on same object tab" +msgstr "" + +#: inc/container.class.php:372 msgid "You cannot add several blocs with identical name on same object" msgstr "" -#: inc/container.class.php:410 +#: inc/container.class.php:512 msgid "Block" msgstr "" -#: inc/container.class.php:482 +#: inc/container.class.php:583 msgid "Tab" msgstr "Pestaña" -#: inc/container.class.php:621 +#: inc/container.class.php:788 msgid "Add tab" msgstr "Agregar pestaña" -#: inc/container.class.php:622 +#: inc/container.class.php:789 msgid "Insertion in the form (before save button)" msgstr "Insertando en el formulario (antes del botón guardar)" -#: inc/container.class.php:623 +#: inc/container.class.php:790 msgid "Insertion in the form of a specific tab (before save button)" msgstr "Inserción en el formulario de una pestaña específica (antes del botón guardar)" -#: inc/container.class.php:956 +#: inc/container.class.php:1149 msgid "Some mandatory fields are empty" msgstr "Algunos campos obligatorios están vacíos" -#: inc/container.class.php:961 +#: inc/container.class.php:1154 msgid "Some numeric fields contains non numeric values" msgstr "Algunos campos numéricos contienen valores no numéricos" -#: inc/container.class.php:966 +#: inc/container.class.php:1159 msgid "Some URL fields contains invalid links" msgstr "" + +#: inc/labeltranslation.class.php:129 +msgid "Language" +msgstr "" + +#: inc/labeltranslation.class.php:130 +msgid "Label" +msgstr "" + +#: inc/dropdown.class.php:16 +msgid "Updating generated dropdown files" +msgstr "" diff --git a/locales/fields.pot b/locales/fields.pot index a1a5f616..11154522 100644 --- a/locales/fields.pot +++ b/locales/fields.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-13 14:22+0100\n" +"POT-Creation-Date: 2018-06-28 08:22+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: front/container.php:4 front/container.form.php:35 inc/menu.class.php:6 -#: setup.php:161 +#: setup.php:174 msgid "Additionnal fields" msgstr "" @@ -26,43 +26,31 @@ msgstr "" msgid "MySQL tables installation" msgstr "" -#: hook.php:103 +#: hook.php:106 msgid "The plugin can't be uninstalled when the plugin is disabled" msgstr "" -#: hook.php:112 +#: hook.php:115 msgid "MySQL tables uninstallation" msgstr "" -#: inc/dropdown.class.php:17 -msgid "Updating generated dropdown files" -msgstr "" - -#: inc/labeltranslation.class.php:137 -msgid "Language" -msgstr "" - -#: inc/labeltranslation.class.php:138 -msgid "Label" -msgstr "" - -#: inc/field.class.php:70 +#: inc/field.class.php:72 msgid "Field" msgstr "" -#: inc/field.class.php:246 +#: inc/field.class.php:241 msgid "Fields" msgstr "" -#: inc/field.class.php:296 +#: inc/field.class.php:290 msgid "Add a new field" msgstr "" -#: inc/field.class.php:300 +#: inc/field.class.php:294 msgid "No field for this block" msgstr "" -#: inc/field.class.php:312 inc/field.class.php:414 +#: inc/field.class.php:306 inc/field.class.php:419 msgid "Read only" msgstr "" @@ -74,96 +62,114 @@ msgstr "" msgid "Configure fields values" msgstr "" -#: inc/field.class.php:840 +#: inc/field.class.php:712 msgid "show" msgstr "" -#: inc/field.class.php:985 +#: inc/field.class.php:858 msgid "Header" msgstr "" -#: inc/field.class.php:986 +#: inc/field.class.php:859 msgid "Text (single line)" msgstr "" -#: inc/field.class.php:987 +#: inc/field.class.php:860 msgid "Text (multiples lines)" msgstr "" -#: inc/field.class.php:988 +#: inc/field.class.php:861 msgid "Number" msgstr "" -#: inc/field.class.php:989 +#: inc/field.class.php:862 msgid "URL" msgstr "" -#: inc/field.class.php:990 +#: inc/field.class.php:863 msgid "Dropdown" msgstr "" -#: inc/field.class.php:991 +#: inc/field.class.php:864 msgid "Yes/No" msgstr "" -#: inc/field.class.php:992 +#: inc/field.class.php:865 msgid "Date" msgstr "" -#: inc/field.class.php:993 +#: inc/field.class.php:866 msgid "Date & time" msgstr "" -#: inc/container.class.php:8 +#: inc/container.class.php:12 msgid "Regenerate container files" msgstr "" -#: inc/container.class.php:69 +#: inc/container.class.php:127 msgid "Updating generated containers files" msgstr "" -#: inc/container.class.php:229 +#: inc/container.class.php:318 msgid "You cannot add block without associated element type" msgstr "" -#: inc/container.class.php:244 +#: inc/container.class.php:335 msgid "" "You cannot add several blocks with type 'Insertion in the form' on same " "object" msgstr "" -#: inc/container.class.php:265 +#: inc/container.class.php:350 +msgid "" +"You cannot add several blocks with type 'Insertion in the form of a specific " +"tab' on same object tab" +msgstr "" + +#: inc/container.class.php:372 msgid "You cannot add several blocs with identical name on same object" msgstr "" -#: inc/container.class.php:410 +#: inc/container.class.php:512 msgid "Block" msgstr "" -#: inc/container.class.php:482 +#: inc/container.class.php:583 msgid "Tab" msgstr "" -#: inc/container.class.php:621 +#: inc/container.class.php:788 msgid "Add tab" msgstr "" -#: inc/container.class.php:622 +#: inc/container.class.php:789 msgid "Insertion in the form (before save button)" msgstr "" -#: inc/container.class.php:623 +#: inc/container.class.php:790 msgid "Insertion in the form of a specific tab (before save button)" msgstr "" -#: inc/container.class.php:956 +#: inc/container.class.php:1149 msgid "Some mandatory fields are empty" msgstr "" -#: inc/container.class.php:961 +#: inc/container.class.php:1154 msgid "Some numeric fields contains non numeric values" msgstr "" -#: inc/container.class.php:966 +#: inc/container.class.php:1159 msgid "Some URL fields contains invalid links" msgstr "" + +#: inc/labeltranslation.class.php:129 +msgid "Language" +msgstr "" + +#: inc/labeltranslation.class.php:130 +msgid "Label" +msgstr "" + +#: inc/dropdown.class.php:16 +msgid "Updating generated dropdown files" +msgstr "" diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo index 8af74a34e42e31bdb00d0cb7f59f8e3bcba0bb91..3ef2f5e0d0b8e1c2a87bd5dbddf33f3fb916e896 100644 GIT binary patch delta 410 zcmYk%u}i~16vy#bZH;Yp5DHpBO?6O_XiQN;Kt$|Vs1yesLz^L>DI`JY)Iksj{{TV! z14NKQ5jPP!_($kg3WA&9=HT~i2XFb@J%0D@-A}%sZ0Pzu#ajW zEi-7OqZ(itmv9T$@fa8J5_j<))x)2t?tftpvssZ6>NtuX7SYdci0rVrrJyE#8wPt= zvmbGTGG6xl->Ye$K-w2G78+(p!nVbJ}#X+v@ fMzL`ixQ4M72ZOBe#%jJkwyBka;fF zxu!Es8aa^>II)UyJzjT|?Y5QIaSXQIX)2p-omj25WxFklZFr7yo2FAb<(|Et-8Bnn TvKvRLVe-1E4h+`sMy&832=Ykp diff --git a/locales/fr_FR.po b/locales/fr_FR.po index 7875403a..3c2e8861 100644 --- a/locales/fr_FR.po +++ b/locales/fr_FR.po @@ -5,14 +5,15 @@ # Translators: # Alexandre Delaunay , 2016 # Alexandre Delaunay , 2016 -# Johan Cwiklinski , 2016-2017 +# Cédric Anne, 2018 +# Johan Cwiklinski , 2016-2017 msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-13 14:22+0100\n" -"PO-Revision-Date: 2017-09-23 21:40+0000\n" -"Last-Translator: Johan Cwiklinski \n" +"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"PO-Revision-Date: 2018-06-28 08:23+0000\n" +"Last-Translator: Cédric Anne\n" "Language-Team: French (France) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/fr_FR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: front/container.php:4 front/container.form.php:35 inc/menu.class.php:6 -#: setup.php:161 +#: setup.php:174 msgid "Additionnal fields" msgstr "Champs supplémentaires" @@ -29,43 +30,31 @@ msgstr "Champs supplémentaires" msgid "MySQL tables installation" msgstr "Installation des tables MySQL" -#: hook.php:103 +#: hook.php:106 msgid "The plugin can't be uninstalled when the plugin is disabled" msgstr "Le plugin ne peut etre désinstallé quand le plugin est désactivé" -#: hook.php:112 +#: hook.php:115 msgid "MySQL tables uninstallation" msgstr "Désinstallation des tables MySQL" -#: inc/dropdown.class.php:17 -msgid "Updating generated dropdown files" -msgstr "Mise à jour des fichiers générés des listes déroulantes " - -#: inc/labeltranslation.class.php:137 -msgid "Language" -msgstr "Langue" - -#: inc/labeltranslation.class.php:138 -msgid "Label" -msgstr "Libellé" - -#: inc/field.class.php:70 +#: inc/field.class.php:72 msgid "Field" msgstr "Champ" -#: inc/field.class.php:246 +#: inc/field.class.php:241 msgid "Fields" msgstr "Champs" -#: inc/field.class.php:296 +#: inc/field.class.php:290 msgid "Add a new field" msgstr "Ajouter un nouveau champ" -#: inc/field.class.php:300 +#: inc/field.class.php:294 msgid "No field for this block" msgstr "Aucun champ pour ce bloc" -#: inc/field.class.php:312 inc/field.class.php:414 +#: inc/field.class.php:306 inc/field.class.php:419 msgid "Read only" msgstr "Lecture seule" @@ -77,96 +66,114 @@ msgstr "Configuration" msgid "Configure fields values" msgstr "Configurer les valeurs du champ" -#: inc/field.class.php:840 +#: inc/field.class.php:712 msgid "show" msgstr "afficher" -#: inc/field.class.php:985 +#: inc/field.class.php:858 msgid "Header" msgstr "Entête" -#: inc/field.class.php:986 +#: inc/field.class.php:859 msgid "Text (single line)" msgstr "Texte (ligne simple)" -#: inc/field.class.php:987 +#: inc/field.class.php:860 msgid "Text (multiples lines)" msgstr "Texte (lignes multiples)" -#: inc/field.class.php:988 +#: inc/field.class.php:861 msgid "Number" msgstr "Nombre" -#: inc/field.class.php:989 +#: inc/field.class.php:862 msgid "URL" msgstr "URL" -#: inc/field.class.php:990 +#: inc/field.class.php:863 msgid "Dropdown" msgstr "Liste déroulante (Intitulés)" -#: inc/field.class.php:991 +#: inc/field.class.php:864 msgid "Yes/No" msgstr "Oui/Non" -#: inc/field.class.php:992 +#: inc/field.class.php:865 msgid "Date" msgstr "Date" -#: inc/field.class.php:993 +#: inc/field.class.php:866 msgid "Date & time" msgstr "Date & heure" -#: inc/container.class.php:8 +#: inc/container.class.php:12 msgid "Regenerate container files" msgstr "Régénérer les fichiers des blocs" -#: inc/container.class.php:69 +#: inc/container.class.php:127 msgid "Updating generated containers files" msgstr "Mettre à jour les fichier de conteneurs générés" -#: inc/container.class.php:229 +#: inc/container.class.php:318 msgid "You cannot add block without associated element type" msgstr "Vous ne pouvez pas ajouter de bloc sans associer de type d'élément" -#: inc/container.class.php:244 +#: inc/container.class.php:335 msgid "" "You cannot add several blocks with type 'Insertion in the form' on same " "object" msgstr "Vous ne pouvez pas créer plusieurs blocs de type 'Insertion dans le formulaire' sur le même objet" -#: inc/container.class.php:265 +#: inc/container.class.php:350 +msgid "" +"You cannot add several blocks with type 'Insertion in the form of a specific" +" tab' on same object tab" +msgstr "" + +#: inc/container.class.php:372 msgid "You cannot add several blocs with identical name on same object" msgstr "Vous ne pouvez pas ajouter plusieurs blocs avec un même nom sur le même objet" -#: inc/container.class.php:410 +#: inc/container.class.php:512 msgid "Block" msgstr "Bloc" -#: inc/container.class.php:482 +#: inc/container.class.php:583 msgid "Tab" msgstr "Onglet" -#: inc/container.class.php:621 +#: inc/container.class.php:788 msgid "Add tab" msgstr "Ajout d'un onglet" -#: inc/container.class.php:622 +#: inc/container.class.php:789 msgid "Insertion in the form (before save button)" msgstr "Insertion dans le formulaire (avant le bouton sauvegarder)" -#: inc/container.class.php:623 +#: inc/container.class.php:790 msgid "Insertion in the form of a specific tab (before save button)" msgstr "Insertion dans le formulaire d'un onglet spécifique (avant le bouton sauvegarder)" -#: inc/container.class.php:956 +#: inc/container.class.php:1149 msgid "Some mandatory fields are empty" msgstr "Des champs obligatoires sont vides" -#: inc/container.class.php:961 +#: inc/container.class.php:1154 msgid "Some numeric fields contains non numeric values" msgstr "Des champs numériques contiennent des données non numériques" -#: inc/container.class.php:966 +#: inc/container.class.php:1159 msgid "Some URL fields contains invalid links" msgstr "Des champs URL contiennent des liens invalides" + +#: inc/labeltranslation.class.php:129 +msgid "Language" +msgstr "Langue" + +#: inc/labeltranslation.class.php:130 +msgid "Label" +msgstr "Libellé" + +#: inc/dropdown.class.php:16 +msgid "Updating generated dropdown files" +msgstr "Mise à jour des fichiers générés des listes déroulantes " diff --git a/locales/pl_PL.mo b/locales/pl_PL.mo index dc3aab3b6ff78bced5c29d8af1fb711eeb534fd2..6a4c154e30aae20d852d19f5d6dfe8f63e3c52b4 100644 GIT binary patch delta 411 zcmYk$KTE?<6o&C*tya^br9!bTri+UNW5f~z{wcaB5k*8q5D6L~CeavPGBALXrhM8 zSi_AhKfxmRGgSRoS$>;&hpO)ZZS0_nA2^0pP1?fWGD}qz=WrTVGmlWcN2nHSVFe%2 z!YM|RG^lgEBsC6WFHEkzG>RR4 T^SyTw2j_Y-4E_Fn;c4U#4?s23 delta 450 zcmXZW&r1S97{>9*OmpoQ1(luFQ-o~nZe_BRb%+AlNJ6Mf&}55Px|W)eBtnO7L39Zs zx^^wRhV-X&=-j*pBd+(57Y#;-s4KBCw6j46CY8^3T6HAS=qe~ToqCUF&~G3Q%G@BS9OV0So< zFKFUB#_=21Fhm+=i%p!sEPC^fF^w(k#}Cx-Gphd&`k@e}5Fa88&fx(bVg|eD1&IuI znt`WaJE<9_W-O@2qGg&1-OzOakULucP!P^jpg1uT{V_0J(bW|iY;q( zEmxIptt9J}s-\n" +"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"PO-Revision-Date: 2018-06-28 08:23+0000\n" +"Last-Translator: Cédric Anne\n" "Language-Team: Polish (Poland) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/pl_PL/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +20,7 @@ msgstr "" "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" #: front/container.php:4 front/container.form.php:35 inc/menu.class.php:6 -#: setup.php:161 +#: setup.php:174 msgid "Additionnal fields" msgstr "Dodatkowe pola" @@ -28,43 +28,31 @@ msgstr "Dodatkowe pola" msgid "MySQL tables installation" msgstr "Instalacja tabel MYSQL" -#: hook.php:103 +#: hook.php:106 msgid "The plugin can't be uninstalled when the plugin is disabled" msgstr "Wtyczka nie może zostać odinstalowana kiedy jest wyłączona" -#: hook.php:112 +#: hook.php:115 msgid "MySQL tables uninstallation" msgstr "Deinstalacja tabel MYSQL" -#: inc/dropdown.class.php:17 -msgid "Updating generated dropdown files" -msgstr "Zaktualizowano pliki generowane z list rozwijanych" - -#: inc/labeltranslation.class.php:137 -msgid "Language" -msgstr "Język" - -#: inc/labeltranslation.class.php:138 -msgid "Label" -msgstr "Etykieta" - -#: inc/field.class.php:70 +#: inc/field.class.php:72 msgid "Field" msgstr "Pole" -#: inc/field.class.php:246 +#: inc/field.class.php:241 msgid "Fields" msgstr "Pola" -#: inc/field.class.php:296 +#: inc/field.class.php:290 msgid "Add a new field" msgstr "Dodaj nowe pole" -#: inc/field.class.php:300 +#: inc/field.class.php:294 msgid "No field for this block" msgstr "Brak pola dla tego bloku" -#: inc/field.class.php:312 inc/field.class.php:414 +#: inc/field.class.php:306 inc/field.class.php:419 msgid "Read only" msgstr "Tylko do odczytu" @@ -76,96 +64,114 @@ msgstr "Konfiguruj" msgid "Configure fields values" msgstr "Konfiguruj wartości pól" -#: inc/field.class.php:840 +#: inc/field.class.php:712 msgid "show" msgstr "pokaż" -#: inc/field.class.php:985 +#: inc/field.class.php:858 msgid "Header" msgstr "Nagłówek" -#: inc/field.class.php:986 +#: inc/field.class.php:859 msgid "Text (single line)" msgstr "Tekst (pojedyncza linia)" -#: inc/field.class.php:987 +#: inc/field.class.php:860 msgid "Text (multiples lines)" msgstr "Tekst (wiele linii)" -#: inc/field.class.php:988 +#: inc/field.class.php:861 msgid "Number" msgstr "Liczba" -#: inc/field.class.php:989 +#: inc/field.class.php:862 msgid "URL" msgstr "URL" -#: inc/field.class.php:990 +#: inc/field.class.php:863 msgid "Dropdown" msgstr "Lista rozwijana" -#: inc/field.class.php:991 +#: inc/field.class.php:864 msgid "Yes/No" msgstr "Tak/Nie" -#: inc/field.class.php:992 +#: inc/field.class.php:865 msgid "Date" msgstr "Data" -#: inc/field.class.php:993 +#: inc/field.class.php:866 msgid "Date & time" msgstr "Data & czas" -#: inc/container.class.php:8 +#: inc/container.class.php:12 msgid "Regenerate container files" msgstr "Wygeneruj ponownie" -#: inc/container.class.php:69 +#: inc/container.class.php:127 msgid "Updating generated containers files" msgstr "Zaktualizowano wygenerowane pliki kontenerów" -#: inc/container.class.php:229 +#: inc/container.class.php:318 msgid "You cannot add block without associated element type" msgstr "Nie można dodać bloku bez powiązanego typu elementu" -#: inc/container.class.php:244 +#: inc/container.class.php:335 msgid "" "You cannot add several blocks with type 'Insertion in the form' on same " "object" msgstr "Nie możesz dodać kilku bloków z typem 'Dodawanie danych w formularzu' w tym samym obiekcie" -#: inc/container.class.php:265 +#: inc/container.class.php:350 +msgid "" +"You cannot add several blocks with type 'Insertion in the form of a specific" +" tab' on same object tab" +msgstr "" + +#: inc/container.class.php:372 msgid "You cannot add several blocs with identical name on same object" msgstr "Nie możesz dodać kilku bloków o identycznej nazwie w tym samym obiekcie" -#: inc/container.class.php:410 +#: inc/container.class.php:512 msgid "Block" msgstr "Blok" -#: inc/container.class.php:482 +#: inc/container.class.php:583 msgid "Tab" msgstr "Zakładka" -#: inc/container.class.php:621 +#: inc/container.class.php:788 msgid "Add tab" msgstr "Dodaj zakładkę" -#: inc/container.class.php:622 +#: inc/container.class.php:789 msgid "Insertion in the form (before save button)" msgstr "Dodawanie danych w formularzu (przed przyciskiem zapisz)" -#: inc/container.class.php:623 +#: inc/container.class.php:790 msgid "Insertion in the form of a specific tab (before save button)" msgstr "Dodawanie danych w formularzu w konkretnej karcie (przed przyciskiem zapisz)" -#: inc/container.class.php:956 +#: inc/container.class.php:1149 msgid "Some mandatory fields are empty" msgstr "Niektóre wymagane pola są puste" -#: inc/container.class.php:961 +#: inc/container.class.php:1154 msgid "Some numeric fields contains non numeric values" msgstr "Niektóre pola numeryczne zawierają wartości inne niż liczby" -#: inc/container.class.php:966 +#: inc/container.class.php:1159 msgid "Some URL fields contains invalid links" msgstr "Niektóre pola zawierają nieprawidłowe linki URL" + +#: inc/labeltranslation.class.php:129 +msgid "Language" +msgstr "Język" + +#: inc/labeltranslation.class.php:130 +msgid "Label" +msgstr "Etykieta" + +#: inc/dropdown.class.php:16 +msgid "Updating generated dropdown files" +msgstr "Zaktualizowano pliki generowane z list rozwijanych" diff --git a/locales/pt_BR.mo b/locales/pt_BR.mo index 3eeef33bc78a9ac21a3637a727ba3c4e600fd0f1..285473448d07df0cddc3bb3e9738d018b303bcd2 100644 GIT binary patch delta 410 zcmYk%y-UMD7{~Fa+S->W;vlx55^xaF!x-N}wqkLpEs8j}Nze=dNihkEQx_Mfjzt7@ zw3A{NanQlV!9T#oNn8XcCvou`b?`XubNAfu4xa16S>dvhs9z;SZo5PVL}Vu;(u0TC zhfPdj3v+mZLwJKpe8O&gMy9;6#Q6{8OZmk3on%F3LBlE*F^!F^)PI6a3Oa=o9Kkyr z#FxKd{7WzA3=U%+70%-rx@choJMjVY_=x@Zie>!5_Egw!nfLVGP?BbCi>c&@Xs=T$4pDNk;Dm3g|{ S-2=62%XM2-tmbiaH1Y#p+eg*_ diff --git a/locales/pt_BR.po b/locales/pt_BR.po index d911169d..c7aa46cd 100644 --- a/locales/pt_BR.po +++ b/locales/pt_BR.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-13 14:22+0100\n" -"PO-Revision-Date: 2017-09-22 15:16+0000\n" -"Last-Translator: polar147 \n" +"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"PO-Revision-Date: 2018-06-28 08:23+0000\n" +"Last-Translator: Cédric Anne\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +21,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: front/container.php:4 front/container.form.php:35 inc/menu.class.php:6 -#: setup.php:161 +#: setup.php:174 msgid "Additionnal fields" msgstr "Campos adicionais" @@ -29,43 +29,31 @@ msgstr "Campos adicionais" msgid "MySQL tables installation" msgstr "Instalação de tabelas no MySQL" -#: hook.php:103 +#: hook.php:106 msgid "The plugin can't be uninstalled when the plugin is disabled" msgstr "O plugin não pode ser desinstalado enquando o plugin estiver desabilitado" -#: hook.php:112 +#: hook.php:115 msgid "MySQL tables uninstallation" msgstr "Desinstalação de tabelas no MySQL" -#: inc/dropdown.class.php:17 -msgid "Updating generated dropdown files" -msgstr "Atualizando arquivos que foram baixados" - -#: inc/labeltranslation.class.php:137 -msgid "Language" -msgstr "Idioma" - -#: inc/labeltranslation.class.php:138 -msgid "Label" -msgstr "Rótulo" - -#: inc/field.class.php:70 +#: inc/field.class.php:72 msgid "Field" msgstr "Campo" -#: inc/field.class.php:246 +#: inc/field.class.php:241 msgid "Fields" msgstr "Campos" -#: inc/field.class.php:296 +#: inc/field.class.php:290 msgid "Add a new field" msgstr "Adicionar um novo campo" -#: inc/field.class.php:300 +#: inc/field.class.php:294 msgid "No field for this block" msgstr "Nenhum campo para este bloco" -#: inc/field.class.php:312 inc/field.class.php:414 +#: inc/field.class.php:306 inc/field.class.php:419 msgid "Read only" msgstr "Somente leitura" @@ -77,96 +65,114 @@ msgstr "Configurar" msgid "Configure fields values" msgstr "Configurar valores dos campos" -#: inc/field.class.php:840 +#: inc/field.class.php:712 msgid "show" msgstr "Exibir" -#: inc/field.class.php:985 +#: inc/field.class.php:858 msgid "Header" msgstr "Cabeçalho" -#: inc/field.class.php:986 +#: inc/field.class.php:859 msgid "Text (single line)" msgstr "Texto (linha simples)" -#: inc/field.class.php:987 +#: inc/field.class.php:860 msgid "Text (multiples lines)" msgstr "Texto (Multiplas linhas)" -#: inc/field.class.php:988 +#: inc/field.class.php:861 msgid "Number" msgstr "Número" -#: inc/field.class.php:989 +#: inc/field.class.php:862 msgid "URL" msgstr "URL" -#: inc/field.class.php:990 +#: inc/field.class.php:863 msgid "Dropdown" msgstr "Suspenso" -#: inc/field.class.php:991 +#: inc/field.class.php:864 msgid "Yes/No" msgstr "Sim/Não" -#: inc/field.class.php:992 +#: inc/field.class.php:865 msgid "Date" msgstr "Data" -#: inc/field.class.php:993 +#: inc/field.class.php:866 msgid "Date & time" msgstr "Datar & Hora" -#: inc/container.class.php:8 +#: inc/container.class.php:12 msgid "Regenerate container files" msgstr "Regerar arquivos de contêiner" -#: inc/container.class.php:69 +#: inc/container.class.php:127 msgid "Updating generated containers files" msgstr "Atualizando arquivos de contêineres gerados" -#: inc/container.class.php:229 +#: inc/container.class.php:318 msgid "You cannot add block without associated element type" msgstr "Você não pode adicionar um bloco sem um tipo de elemento associado" -#: inc/container.class.php:244 +#: inc/container.class.php:335 msgid "" "You cannot add several blocks with type 'Insertion in the form' on same " "object" msgstr "Você não pode adicionar vários blocos com o tipo 'Inserção no formulário' no mesmo objeto" -#: inc/container.class.php:265 +#: inc/container.class.php:350 +msgid "" +"You cannot add several blocks with type 'Insertion in the form of a specific" +" tab' on same object tab" +msgstr "" + +#: inc/container.class.php:372 msgid "You cannot add several blocs with identical name on same object" msgstr "Você não pode adicionar vários blocos com nome idêntico no mesmo objeto" -#: inc/container.class.php:410 +#: inc/container.class.php:512 msgid "Block" msgstr "Bloco" -#: inc/container.class.php:482 +#: inc/container.class.php:583 msgid "Tab" msgstr "Aba" -#: inc/container.class.php:621 +#: inc/container.class.php:788 msgid "Add tab" msgstr "Adicionar aba" -#: inc/container.class.php:622 +#: inc/container.class.php:789 msgid "Insertion in the form (before save button)" msgstr "Inserção no formulário (antes do botão de salvar)" -#: inc/container.class.php:623 +#: inc/container.class.php:790 msgid "Insertion in the form of a specific tab (before save button)" msgstr "Inserção no formulário de uma guia específica (antes do botão de salvar)" -#: inc/container.class.php:956 +#: inc/container.class.php:1149 msgid "Some mandatory fields are empty" msgstr "Alguns campos obrigatórios estão vazios" -#: inc/container.class.php:961 +#: inc/container.class.php:1154 msgid "Some numeric fields contains non numeric values" msgstr "Alguns campos numéricos contém valores não numéricos" -#: inc/container.class.php:966 +#: inc/container.class.php:1159 msgid "Some URL fields contains invalid links" msgstr "Alguns campos de URL contém links inválidos" + +#: inc/labeltranslation.class.php:129 +msgid "Language" +msgstr "Idioma" + +#: inc/labeltranslation.class.php:130 +msgid "Label" +msgstr "Rótulo" + +#: inc/dropdown.class.php:16 +msgid "Updating generated dropdown files" +msgstr "Atualizando arquivos que foram baixados" diff --git a/locales/ro_RO.mo b/locales/ro_RO.mo index fa4d657c20eb61f5b4afa30791925b57a70de7c2..8fc8a63a8ecf5121a6e4a55dbbd6e0a512a435b7 100644 GIT binary patch delta 264 zcmaFFeVTj1p8DI23=H>}7#R2&7#Mc3FfgzK=~F;j2uNQ7(%eA$DUg-|(jS2|5Hawu zLc|4uGzX9`3#38fYCsyKUmHlX0cm3(Ee52mfV3o#4g}Ib#E=anRDg6LD}x*ZGmtS2 zC?E=?X8~yuAiV)d0};c~&5?|^86zxo4a{_nEEEhZtc;Ab4S;|vz+X2gwJftZGe1w) zC9x#cO2Np$5LuluM4eA!afxn7QDRa(4O93FXJNHM zgh=yn*e}8=Z2b3|aQMFiM_~(2!y`BYGl-=doCSDWp*boeJfN6@k8lz`LoB@yPLj8z z-{ewpxx!>aD^(X#h}z)+Kem@HxZLwS6Rl=S$Tcq3xl&B7YT2v{Ol{wU$lHbSp=V-V wXx7Rz-L-vUB@\n" +"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"PO-Revision-Date: 2018-06-28 08:23+0000\n" +"Last-Translator: Cédric Anne\n" "Language-Team: Romanian (Romania) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/ro_RO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" #: front/container.php:4 front/container.form.php:35 inc/menu.class.php:6 -#: setup.php:161 +#: setup.php:174 msgid "Additionnal fields" msgstr "Campuri aditionale" @@ -28,43 +28,31 @@ msgstr "Campuri aditionale" msgid "MySQL tables installation" msgstr "Instalare tabele MySQL" -#: hook.php:103 +#: hook.php:106 msgid "The plugin can't be uninstalled when the plugin is disabled" msgstr "" -#: hook.php:112 +#: hook.php:115 msgid "MySQL tables uninstallation" msgstr "Dezinstalare tabele MySQL" -#: inc/dropdown.class.php:17 -msgid "Updating generated dropdown files" -msgstr "" - -#: inc/labeltranslation.class.php:137 -msgid "Language" -msgstr "" - -#: inc/labeltranslation.class.php:138 -msgid "Label" -msgstr "" - -#: inc/field.class.php:70 +#: inc/field.class.php:72 msgid "Field" msgstr "Camp" -#: inc/field.class.php:246 +#: inc/field.class.php:241 msgid "Fields" msgstr "Campuri" -#: inc/field.class.php:296 +#: inc/field.class.php:290 msgid "Add a new field" msgstr "Add un camp nou" -#: inc/field.class.php:300 +#: inc/field.class.php:294 msgid "No field for this block" msgstr "" -#: inc/field.class.php:312 inc/field.class.php:414 +#: inc/field.class.php:306 inc/field.class.php:419 msgid "Read only" msgstr "" @@ -76,96 +64,114 @@ msgstr "Configurare" msgid "Configure fields values" msgstr "Configurare valori campuri" -#: inc/field.class.php:840 +#: inc/field.class.php:712 msgid "show" msgstr "" -#: inc/field.class.php:985 +#: inc/field.class.php:858 msgid "Header" msgstr "Header" -#: inc/field.class.php:986 +#: inc/field.class.php:859 msgid "Text (single line)" msgstr "Text (singura linie)" -#: inc/field.class.php:987 +#: inc/field.class.php:860 msgid "Text (multiples lines)" msgstr "Text (multiple linii)" -#: inc/field.class.php:988 +#: inc/field.class.php:861 msgid "Number" msgstr "Numar" -#: inc/field.class.php:989 +#: inc/field.class.php:862 msgid "URL" msgstr "" -#: inc/field.class.php:990 +#: inc/field.class.php:863 msgid "Dropdown" msgstr "Dropdown" -#: inc/field.class.php:991 +#: inc/field.class.php:864 msgid "Yes/No" msgstr "Da/Nu" -#: inc/field.class.php:992 +#: inc/field.class.php:865 msgid "Date" msgstr "Data" -#: inc/field.class.php:993 +#: inc/field.class.php:866 msgid "Date & time" msgstr "Data & time" -#: inc/container.class.php:8 +#: inc/container.class.php:12 msgid "Regenerate container files" msgstr "" -#: inc/container.class.php:69 +#: inc/container.class.php:127 msgid "Updating generated containers files" msgstr "" -#: inc/container.class.php:229 +#: inc/container.class.php:318 msgid "You cannot add block without associated element type" msgstr "" -#: inc/container.class.php:244 +#: inc/container.class.php:335 msgid "" "You cannot add several blocks with type 'Insertion in the form' on same " "object" msgstr "" -#: inc/container.class.php:265 +#: inc/container.class.php:350 +msgid "" +"You cannot add several blocks with type 'Insertion in the form of a specific" +" tab' on same object tab" +msgstr "" + +#: inc/container.class.php:372 msgid "You cannot add several blocs with identical name on same object" msgstr "" -#: inc/container.class.php:410 +#: inc/container.class.php:512 msgid "Block" msgstr "" -#: inc/container.class.php:482 +#: inc/container.class.php:583 msgid "Tab" msgstr "Tab" -#: inc/container.class.php:621 +#: inc/container.class.php:788 msgid "Add tab" msgstr "Add tab" -#: inc/container.class.php:622 +#: inc/container.class.php:789 msgid "Insertion in the form (before save button)" msgstr "" -#: inc/container.class.php:623 +#: inc/container.class.php:790 msgid "Insertion in the form of a specific tab (before save button)" msgstr "" -#: inc/container.class.php:956 +#: inc/container.class.php:1149 msgid "Some mandatory fields are empty" msgstr "Unele campuri obligatorii sunt goale" -#: inc/container.class.php:961 +#: inc/container.class.php:1154 msgid "Some numeric fields contains non numeric values" msgstr "" -#: inc/container.class.php:966 +#: inc/container.class.php:1159 msgid "Some URL fields contains invalid links" msgstr "" + +#: inc/labeltranslation.class.php:129 +msgid "Language" +msgstr "" + +#: inc/labeltranslation.class.php:130 +msgid "Label" +msgstr "" + +#: inc/dropdown.class.php:16 +msgid "Updating generated dropdown files" +msgstr "" diff --git a/locales/ru_RU.mo b/locales/ru_RU.mo index 3905b072a96b8b0f58216de765b8baf865a5ca2b..cd239ae712057cadcd7643215cc2e6e2721e695a 100644 GIT binary patch delta 410 zcmYk#&npCR7{~F)5^ET=O1YTXEDDn`O4A%jI9WfE!|onrva^|Dwq_=!)H?Yi$lb4l zTIEJ@lyY+AA8=I;;?3^Cw{N|^&!^{kzHi#Ic9m_YI0=#4W|54Dd?rOS>}wSnz$qk> zBBpQ$hw-4EUtkaQHKy^gp1;@qz~8xVoX3oS=f<9+Tju!xzKL32){SCg dEp&ru+l|Yiqt8B^6+?ehp9uo5y5CYv{s7@iJox|s delta 426 zcmXZWPcH*O7{~EPNwuXa4iX3HQhyS)?ar#A5gfSCl!yxnv9!{q*(Tj3dXOHx0VfCI zJxF>H#7W{vTt(vK>J>e1p{`(@hz&n#Cn5I%0(~KL+FhVQK`fB0GcI~pG&s$z0qnU=9(2XhGG&MDz zQR%qB2xTqT)7L7NPpz diff --git a/locales/ru_RU.po b/locales/ru_RU.po index f907f4cf..d171647c 100644 --- a/locales/ru_RU.po +++ b/locales/ru_RU.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-13 14:22+0100\n" -"PO-Revision-Date: 2017-09-22 15:16+0000\n" -"Last-Translator: Nikolay \n" +"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"PO-Revision-Date: 2018-06-28 08:23+0000\n" +"Last-Translator: Cédric Anne\n" "Language-Team: Russian (Russia) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +21,7 @@ msgstr "" "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" #: front/container.php:4 front/container.form.php:35 inc/menu.class.php:6 -#: setup.php:161 +#: setup.php:174 msgid "Additionnal fields" msgstr "Дополнительные поля" @@ -29,43 +29,31 @@ msgstr "Дополнительные поля" msgid "MySQL tables installation" msgstr "Установка таблиц MySQL " -#: hook.php:103 +#: hook.php:106 msgid "The plugin can't be uninstalled when the plugin is disabled" msgstr "Плагин не может быть удален пока плагин выключен" -#: hook.php:112 +#: hook.php:115 msgid "MySQL tables uninstallation" msgstr "Удаление таблиц MySQL" -#: inc/dropdown.class.php:17 -msgid "Updating generated dropdown files" -msgstr "Обновление автоматически раскрывающегося списка файлов" - -#: inc/labeltranslation.class.php:137 -msgid "Language" -msgstr "Язык" - -#: inc/labeltranslation.class.php:138 -msgid "Label" -msgstr "Метка" - -#: inc/field.class.php:70 +#: inc/field.class.php:72 msgid "Field" msgstr "Поле" -#: inc/field.class.php:246 +#: inc/field.class.php:241 msgid "Fields" msgstr "Поля" -#: inc/field.class.php:296 +#: inc/field.class.php:290 msgid "Add a new field" msgstr "Добавить новое поле" -#: inc/field.class.php:300 +#: inc/field.class.php:294 msgid "No field for this block" msgstr "Нет поля для этого блока" -#: inc/field.class.php:312 inc/field.class.php:414 +#: inc/field.class.php:306 inc/field.class.php:419 msgid "Read only" msgstr "Только чтение" @@ -77,96 +65,114 @@ msgstr "Настройка" msgid "Configure fields values" msgstr "Настрить поля значений" -#: inc/field.class.php:840 +#: inc/field.class.php:712 msgid "show" msgstr "показать" -#: inc/field.class.php:985 +#: inc/field.class.php:858 msgid "Header" msgstr "Заголовок" -#: inc/field.class.php:986 +#: inc/field.class.php:859 msgid "Text (single line)" msgstr "Тест (одна строка)" -#: inc/field.class.php:987 +#: inc/field.class.php:860 msgid "Text (multiples lines)" msgstr "Текст (многострочный)" -#: inc/field.class.php:988 +#: inc/field.class.php:861 msgid "Number" msgstr "Номер" -#: inc/field.class.php:989 +#: inc/field.class.php:862 msgid "URL" msgstr "URL" -#: inc/field.class.php:990 +#: inc/field.class.php:863 msgid "Dropdown" msgstr "Выпадающий список" -#: inc/field.class.php:991 +#: inc/field.class.php:864 msgid "Yes/No" msgstr "Да/Нет" -#: inc/field.class.php:992 +#: inc/field.class.php:865 msgid "Date" msgstr "Дата" -#: inc/field.class.php:993 +#: inc/field.class.php:866 msgid "Date & time" msgstr "Дата и время" -#: inc/container.class.php:8 +#: inc/container.class.php:12 msgid "Regenerate container files" msgstr "Восстановить файлы контейнера" -#: inc/container.class.php:69 +#: inc/container.class.php:127 msgid "Updating generated containers files" msgstr "Обновление созданных файлов контейнеров" -#: inc/container.class.php:229 +#: inc/container.class.php:318 msgid "You cannot add block without associated element type" msgstr "Вы не можете добавить блок без связанного типа элемента" -#: inc/container.class.php:244 +#: inc/container.class.php:335 msgid "" "You cannot add several blocks with type 'Insertion in the form' on same " "object" msgstr "Вы не можете добавить несколько блоков с типом 'Вставить в виде' в один и тот же объект" -#: inc/container.class.php:265 +#: inc/container.class.php:350 +msgid "" +"You cannot add several blocks with type 'Insertion in the form of a specific" +" tab' on same object tab" +msgstr "" + +#: inc/container.class.php:372 msgid "You cannot add several blocs with identical name on same object" msgstr "Вы не можете добавить несколько блоков с одинаковыми именами на один и тот же объект" -#: inc/container.class.php:410 +#: inc/container.class.php:512 msgid "Block" msgstr "Блок" -#: inc/container.class.php:482 +#: inc/container.class.php:583 msgid "Tab" msgstr "Вкладка" -#: inc/container.class.php:621 +#: inc/container.class.php:788 msgid "Add tab" msgstr "Добавить вкладку" -#: inc/container.class.php:622 +#: inc/container.class.php:789 msgid "Insertion in the form (before save button)" msgstr "Добавить в виде (до кнопки сохранения)" -#: inc/container.class.php:623 +#: inc/container.class.php:790 msgid "Insertion in the form of a specific tab (before save button)" msgstr "Добавить в виде конкретной вкладки (до кнопки сохранения)" -#: inc/container.class.php:956 +#: inc/container.class.php:1149 msgid "Some mandatory fields are empty" msgstr "Некоторые обязательные поля пусты" -#: inc/container.class.php:961 +#: inc/container.class.php:1154 msgid "Some numeric fields contains non numeric values" msgstr "Некоторые числовые поля содержат не только цифры" -#: inc/container.class.php:966 +#: inc/container.class.php:1159 msgid "Some URL fields contains invalid links" msgstr "Некоторый URL полей содержат недействительные ссылки" + +#: inc/labeltranslation.class.php:129 +msgid "Language" +msgstr "Язык" + +#: inc/labeltranslation.class.php:130 +msgid "Label" +msgstr "Метка" + +#: inc/dropdown.class.php:16 +msgid "Updating generated dropdown files" +msgstr "Обновление автоматически раскрывающегося списка файлов" diff --git a/locales/tr_TR.mo b/locales/tr_TR.mo index 14095e055cbc21aa907b6703a63b55df1b1e9b6d..555e8b6704e523952119aa65692d3f103dcfec17 100644 GIT binary patch delta 410 zcmYk#F-yZx6o%nbjn+m5ajJ@t*%F&ZX+s>OC`@W&dzoW{3pxXC|1?-`NGn7#&^_;Y1kYR@pwRjh&v5B*Ig{tTt zNAU^gu!GCkLzOSmQo(gp`BPN?=QxSiSi(n~z%N|HZ@nl|W|(KYD)70gc!+D5;u8Mg z7*^8eKwH~(Osj0#j$t{jZ5J$#zPVv;`A0zY5C-6hiN;(E2CFCtTN~EwUXDah@f$1>P~<8LVUZ&SlRLOegxDMicG_y8 zm5p`^DeP?gLJ@4!_zP?-Ei8N&vMl?|46`#&xnAzB8jBudL=QtmDIz)=CNkhj-*cEi zeg%{88jizTI0)Zh27dPag1Y}3>i!?7=l#MwjAO|REI_QJy%a?hN8qEN2ZwM1p2A6Z z1NEX8n1&y43ijY4jAOd)Uxj7319ksdzkUhFkl#ZI-(eR1K?`Qm1)>sy6-?I)I(U}h zFL?tdwE{jZBwrS>t6vEit;9KrNJ*@j4UsEmDW~Pv3E@rt| zWTvz&kry~dRfR3?1j-8=s^teZtEi4*+iu``YKI&xwDnR!OA* diff --git a/locales/tr_TR.po b/locales/tr_TR.po index de3ff1ca..55f69a08 100644 --- a/locales/tr_TR.po +++ b/locales/tr_TR.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: GLPI Plugin - Fields\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-13 14:22+0100\n" -"PO-Revision-Date: 2017-09-23 21:40+0000\n" -"Last-Translator: Kaya Zeren \n" +"POT-Creation-Date: 2018-06-28 08:22+0000\n" +"PO-Revision-Date: 2018-06-28 08:23+0000\n" +"Last-Translator: Cédric Anne\n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/tr_TR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: front/container.php:4 front/container.form.php:35 inc/menu.class.php:6 -#: setup.php:161 +#: setup.php:174 msgid "Additionnal fields" msgstr "Ek alanlar" @@ -27,43 +27,31 @@ msgstr "Ek alanlar" msgid "MySQL tables installation" msgstr "MySQL tabloları yükleme" -#: hook.php:103 +#: hook.php:106 msgid "The plugin can't be uninstalled when the plugin is disabled" msgstr "Bu uygulama eki devre dışı iken kaldırılamaz" -#: hook.php:112 +#: hook.php:115 msgid "MySQL tables uninstallation" msgstr "MySQL tabloları kaldırma" -#: inc/dropdown.class.php:17 -msgid "Updating generated dropdown files" -msgstr "Oluşturulmuş açılan kutu dosyaları güncelleniyor" - -#: inc/labeltranslation.class.php:137 -msgid "Language" -msgstr "Dil" - -#: inc/labeltranslation.class.php:138 -msgid "Label" -msgstr "Etiket" - -#: inc/field.class.php:70 +#: inc/field.class.php:72 msgid "Field" msgstr "Alan" -#: inc/field.class.php:246 +#: inc/field.class.php:241 msgid "Fields" msgstr "Alanlar" -#: inc/field.class.php:296 +#: inc/field.class.php:290 msgid "Add a new field" msgstr "Alan ekle" -#: inc/field.class.php:300 +#: inc/field.class.php:294 msgid "No field for this block" msgstr "Bu blokta henüz bir alan yok" -#: inc/field.class.php:312 inc/field.class.php:414 +#: inc/field.class.php:306 inc/field.class.php:419 msgid "Read only" msgstr "Salt okunur" @@ -75,96 +63,114 @@ msgstr "Ayarlar" msgid "Configure fields values" msgstr "Alan değerleri ayarları" -#: inc/field.class.php:840 +#: inc/field.class.php:712 msgid "show" msgstr "görüntüle" -#: inc/field.class.php:985 +#: inc/field.class.php:858 msgid "Header" msgstr "Üst Bilgi" -#: inc/field.class.php:986 +#: inc/field.class.php:859 msgid "Text (single line)" msgstr "Metin (tek satır)" -#: inc/field.class.php:987 +#: inc/field.class.php:860 msgid "Text (multiples lines)" msgstr "Metin (birden çok satır)" -#: inc/field.class.php:988 +#: inc/field.class.php:861 msgid "Number" msgstr "Sayı" -#: inc/field.class.php:989 +#: inc/field.class.php:862 msgid "URL" msgstr "İnternet Adresi" -#: inc/field.class.php:990 +#: inc/field.class.php:863 msgid "Dropdown" msgstr "Açılan Kutu" -#: inc/field.class.php:991 +#: inc/field.class.php:864 msgid "Yes/No" msgstr "Evet/Hayır" -#: inc/field.class.php:992 +#: inc/field.class.php:865 msgid "Date" msgstr "Tarih" -#: inc/field.class.php:993 +#: inc/field.class.php:866 msgid "Date & time" msgstr "Tarih ve Saat" -#: inc/container.class.php:8 +#: inc/container.class.php:12 msgid "Regenerate container files" msgstr "Kapsayıcı dosyalar yeniden oluşturulsun" -#: inc/container.class.php:69 +#: inc/container.class.php:127 msgid "Updating generated containers files" msgstr "Oluşturulmuş kapsayıcı dosyaları güncelleniyor" -#: inc/container.class.php:229 +#: inc/container.class.php:318 msgid "You cannot add block without associated element type" msgstr "İlişkilendirilmiş bir bileşen tipi olmadan bir blok eklenemez" -#: inc/container.class.php:244 +#: inc/container.class.php:335 msgid "" "You cannot add several blocks with type 'Insertion in the form' on same " "object" msgstr "Aynı nesne üzerine 'forma eklensin' türünde bir kaç blok eklenemez" -#: inc/container.class.php:265 +#: inc/container.class.php:350 +msgid "" +"You cannot add several blocks with type 'Insertion in the form of a specific" +" tab' on same object tab" +msgstr "" + +#: inc/container.class.php:372 msgid "You cannot add several blocs with identical name on same object" msgstr "Aynı nesne üzerine aynı adla birden fazla blok eklenemez" -#: inc/container.class.php:410 +#: inc/container.class.php:512 msgid "Block" msgstr "Blok" -#: inc/container.class.php:482 +#: inc/container.class.php:583 msgid "Tab" msgstr "Sekme" -#: inc/container.class.php:621 +#: inc/container.class.php:788 msgid "Add tab" msgstr "Sekme ekle" -#: inc/container.class.php:622 +#: inc/container.class.php:789 msgid "Insertion in the form (before save button)" msgstr "Forma eklensin (kaydet düğmesinden önce)" -#: inc/container.class.php:623 +#: inc/container.class.php:790 msgid "Insertion in the form of a specific tab (before save button)" msgstr "Forma sekme olarak eklensin (kaydet düğmesinden önce)" -#: inc/container.class.php:956 +#: inc/container.class.php:1149 msgid "Some mandatory fields are empty" msgstr "Bazı zorunlu alanlar boş" -#: inc/container.class.php:961 +#: inc/container.class.php:1154 msgid "Some numeric fields contains non numeric values" msgstr "Bazı sayısal alanlarda sayısal olmayan değerler var" -#: inc/container.class.php:966 +#: inc/container.class.php:1159 msgid "Some URL fields contains invalid links" msgstr "Bazı İnternet adresi alanlarında geçersiz bağlantılar var" + +#: inc/labeltranslation.class.php:129 +msgid "Language" +msgstr "Dil" + +#: inc/labeltranslation.class.php:130 +msgid "Label" +msgstr "Etiket" + +#: inc/dropdown.class.php:16 +msgid "Updating generated dropdown files" +msgstr "Oluşturulmuş açılan kutu dosyaları güncelleniyor" From cb6d35b5e24cf35ba5730d7c84b74d51d09a9e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 22 Jun 2018 14:56:04 +0200 Subject: [PATCH 7/7] Add 1.8.0 version definition --- plugin.xml | 4 ++++ setup.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index 1f7f4631..21b7ae74 100644 --- a/plugin.xml +++ b/plugin.xml @@ -72,6 +72,10 @@ Il existe un [script de migration](https://github.com/pluginsGLPI/customfields/b Johan Cwiklinski + + 1.8.0 + 9.3 + 1.7.3 9.2 diff --git a/setup.php b/setup.php index 12caa567..3c3be848 100644 --- a/setup.php +++ b/setup.php @@ -26,7 +26,7 @@ -------------------------------------------------------------------------- */ -define ('PLUGIN_FIELDS_VERSION', '1.7.3'); +define ('PLUGIN_FIELDS_VERSION', '1.8.0'); // Minimal GLPI version, inclusive define("PLUGIN_FIELDS_MIN_GLPI", "9.3");