diff --git a/README.md b/README.md index d25f257..7fd862e 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ This WordPress plugin integrates the rokka image service. All images from your i ### Requirements * Node.js >=7.10.0 (https://nodejs.org/) +* gettext (https://www.gnu.org/software/gettext/) ### Installation diff --git a/composer.json b/composer.json index 3434795..290fa1c 100644 --- a/composer.json +++ b/composer.json @@ -29,14 +29,14 @@ "email": "contact@liip.ch" }, "require": { - "rokka/client": "^0.8.0" + "rokka/client": "^0.10.0" }, "config": { "bin-dir": "bin" }, "require-dev": { - "squizlabs/php_codesniffer": "^2.8", - "wp-coding-standards/wpcs": "^0.11.0", + "squizlabs/php_codesniffer": "^3.1", + "wp-coding-standards/wpcs": "^0.13.1", "phpunit/phpunit": "^5.7" } } diff --git a/composer.lock b/composer.lock index f18c504..eb20058 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "ec168eb97c8ad3720bc8636cf198e60e", - "content-hash": "901bd473a7a1efa05400c1be2490bc58", + "content-hash": "8cd4c544ac339b2d43db30eed41c4189", "packages": [ { "name": "guzzlehttp/guzzle", - "version": "6.2.3", + "version": "6.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006" + "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8d6c6cc55186db87b7dc5009827429ba4e9dc006", - "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699", + "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699", "shasum": "" }, "require": { @@ -28,9 +27,12 @@ }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "^4.0", + "phpunit/phpunit": "^4.0 || ^5.0", "psr/log": "^1.0" }, + "suggest": { + "psr/log": "Required for using the Log middleware" + }, "type": "library", "extra": { "branch-alias": { @@ -67,7 +69,7 @@ "rest", "web service" ], - "time": "2017-02-28 22:50:30" + "time": "2017-06-22T18:50:49+00:00" }, { "name": "guzzlehttp/promises", @@ -118,7 +120,7 @@ "keywords": [ "promise" ], - "time": "2016-12-20 10:07:11" + "time": "2016-12-20T10:07:11+00:00" }, { "name": "guzzlehttp/psr7", @@ -183,7 +185,7 @@ "uri", "url" ], - "time": "2017-03-20 17:10:46" + "time": "2017-03-20T17:10:46+00:00" }, { "name": "psr/http-message", @@ -233,25 +235,25 @@ "request", "response" ], - "time": "2016-08-06 14:39:51" + "time": "2016-08-06T14:39:51+00:00" }, { "name": "rokka/client", - "version": "0.8.0", + "version": "0.10.0", "source": { "type": "git", "url": "https://github.com/rokka-io/rokka-client-php.git", - "reference": "721b3caf83095238a8740ae0daa9c57f9d1974d8" + "reference": "31a68d5808f967dbf0924f2591b34be1c4af912c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rokka-io/rokka-client-php/zipball/721b3caf83095238a8740ae0daa9c57f9d1974d8", - "reference": "721b3caf83095238a8740ae0daa9c57f9d1974d8", + "url": "https://api.github.com/repos/rokka-io/rokka-client-php/zipball/31a68d5808f967dbf0924f2591b34be1c4af912c", + "reference": "31a68d5808f967dbf0924f2591b34be1c4af912c", "shasum": "" }, "require": { "guzzlehttp/guzzle": "^6.0", - "php": "^5.5 || ^7.0" + "php": "^5.6 || ^7.0" }, "require-dev": { "phpunit/phpunit": "4.*" @@ -294,7 +296,7 @@ "rokka", "rokka.io" ], - "time": "2017-06-12 12:04:00" + "time": "2017-08-24T13:09:27+00:00" } ], "packages-dev": [ @@ -350,20 +352,20 @@ "constructor", "instantiate" ], - "time": "2015-06-14 21:17:01" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe" + "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe", - "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102", + "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102", "shasum": "" }, "require": { @@ -392,20 +394,20 @@ "object", "object graph" ], - "time": "2017-01-26 22:05:40" + "time": "2017-04-12T18:52:22+00:00" }, { "name": "phpdocumentor/reflection-common", - "version": "1.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", "shasum": "" }, "require": { @@ -446,26 +448,26 @@ "reflection", "static analysis" ], - "time": "2015-12-27 11:43:31" + "time": "2017-09-11T18:02:19+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.1.1", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" + "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "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.2.0", + "phpdocumentor/type-resolver": "^0.3.0", "webmozart/assert": "^1.0" }, "require-dev": { @@ -491,24 +493,24 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30 07:12:33" + "time": "2017-08-08T06:39:58+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.2.1", + "version": "0.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" + "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773", + "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773", "shasum": "" }, "require": { - "php": ">=5.5", + "php": "^5.5 || ^7.0", "phpdocumentor/reflection-common": "^1.0" }, "require-dev": { @@ -538,26 +540,26 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25 06:54:22" + "time": "2017-06-03T08:32:36+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.7.0", + "version": "v1.7.2", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" + "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", + "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", "sebastian/comparator": "^1.1|^2.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, @@ -568,7 +570,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.7.x-dev" } }, "autoload": { @@ -601,7 +603,7 @@ "spy", "stub" ], - "time": "2017-03-02 20:05:34" + "time": "2017-09-04T11:05:03+00:00" }, { "name": "phpunit/php-code-coverage", @@ -664,7 +666,7 @@ "testing", "xunit" ], - "time": "2017-04-02 07:44:40" + "time": "2017-04-02T07:44:40+00:00" }, { "name": "phpunit/php-file-iterator", @@ -711,7 +713,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03 07:40:28" + "time": "2016-10-03T07:40:28+00:00" }, { "name": "phpunit/php-text-template", @@ -752,7 +754,7 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", @@ -801,7 +803,7 @@ "keywords": [ "timer" ], - "time": "2017-02-26 11:10:40" + "time": "2017-02-26T11:10:40+00:00" }, { "name": "phpunit/php-token-stream", @@ -850,20 +852,20 @@ "keywords": [ "tokenizer" ], - "time": "2017-02-27 10:12:30" + "time": "2017-02-27T10:12:30+00:00" }, { "name": "phpunit/phpunit", - "version": "5.7.17", + "version": "5.7.21", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "68752b665d3875f9a38a357e3ecb35c79f8673bf" + "reference": "3b91adfb64264ddec5a2dee9851f354aa66327db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/68752b665d3875f9a38a357e3ecb35c79f8673bf", - "reference": "68752b665d3875f9a38a357e3ecb35c79f8673bf", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3b91adfb64264ddec5a2dee9851f354aa66327db", + "reference": "3b91adfb64264ddec5a2dee9851f354aa66327db", "shasum": "" }, "require": { @@ -881,7 +883,7 @@ "phpunit/php-timer": "^1.0.6", "phpunit/phpunit-mock-objects": "^3.2", "sebastian/comparator": "^1.2.4", - "sebastian/diff": "~1.2", + "sebastian/diff": "^1.4.3", "sebastian/environment": "^1.3.4 || ^2.0", "sebastian/exporter": "~2.0", "sebastian/global-state": "^1.1", @@ -932,20 +934,20 @@ "testing", "xunit" ], - "time": "2017-03-19 16:52:12" + "time": "2017-06-21T08:11:54+00:00" }, { "name": "phpunit/phpunit-mock-objects", - "version": "3.4.3", + "version": "3.4.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24" + "reference": "a23b761686d50a560cc56233b9ecf49597cc9118" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", - "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118", + "reference": "a23b761686d50a560cc56233b9ecf49597cc9118", "shasum": "" }, "require": { @@ -991,7 +993,7 @@ "mock", "xunit" ], - "time": "2016-12-08 20:27:08" + "time": "2017-06-30T09:13:00+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -1036,7 +1038,7 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2017-03-04 06:30:41" + "time": "2017-03-04T06:30:41+00:00" }, { "name": "sebastian/comparator", @@ -1100,27 +1102,27 @@ "compare", "equality" ], - "time": "2017-01-29 09:50:25" + "time": "2017-01-29T09:50:25+00:00" }, { "name": "sebastian/diff", - "version": "1.4.1", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "type": "library", "extra": { @@ -1152,7 +1154,7 @@ "keywords": [ "diff" ], - "time": "2015-12-08 07:14:41" + "time": "2017-05-22T07:24:03+00:00" }, { "name": "sebastian/environment", @@ -1202,7 +1204,7 @@ "environment", "hhvm" ], - "time": "2016-11-26 07:53:53" + "time": "2016-11-26T07:53:53+00:00" }, { "name": "sebastian/exporter", @@ -1269,7 +1271,7 @@ "export", "exporter" ], - "time": "2016-11-19 08:54:04" + "time": "2016-11-19T08:54:04+00:00" }, { "name": "sebastian/global-state", @@ -1320,7 +1322,7 @@ "keywords": [ "global state" ], - "time": "2015-10-12 03:26:01" + "time": "2015-10-12T03:26:01+00:00" }, { "name": "sebastian/object-enumerator", @@ -1366,7 +1368,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-02-18 15:18:39" + "time": "2017-02-18T15:18:39+00:00" }, { "name": "sebastian/recursion-context", @@ -1419,7 +1421,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19 07:33:16" + "time": "2016-11-19T07:33:16+00:00" }, { "name": "sebastian/resource-operations", @@ -1461,7 +1463,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28 20:34:47" + "time": "2015-07-28T20:34:47+00:00" }, { "name": "sebastian/version", @@ -1504,68 +1506,41 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03 07:35:21" + "time": "2016-10-03T07:35:21+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "2.8.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d" + "reference": "3c2d0a0fe39684ba0c1eb842a6a775d0b938d699" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", - "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/3c2d0a0fe39684ba0c1eb842a6a775d0b938d699", + "reference": "3c2d0a0fe39684ba0c1eb842a6a775d0b938d699", "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" }, "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" @@ -1582,24 +1557,24 @@ "phpcs", "standards" ], - "time": "2017-03-01 22:17:45" + "time": "2017-09-19T22:47:14+00:00" }, { "name": "symfony/yaml", - "version": "v3.2.6", + "version": "v3.3.9", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a" + "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/093e416ad096355149e265ea2e4cc1f9ee40ab1a", - "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a", + "url": "https://api.github.com/repos/symfony/yaml/zipball/1d8c2a99c80862bdc3af94c1781bf70f86bccac0", + "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "require-dev": { "symfony/console": "~2.8|~3.0" @@ -1610,7 +1585,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -1637,7 +1612,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-03-07 16:47:02" + "time": "2017-07-29T21:54:42+00:00" }, { "name": "webmozart/assert", @@ -1687,26 +1662,30 @@ "check", "validate" ], - "time": "2016-11-23 20:04:58" + "time": "2016-11-23T20:04:58+00:00" }, { "name": "wp-coding-standards/wpcs", - "version": "0.11.0", + "version": "0.13.1", "source": { "type": "git", "url": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git", - "reference": "407e4b85f547a5251185f89ceae6599917343388" + "reference": "1f64b1a0b5b789822d0303436ee4e30e0135e4dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/407e4b85f547a5251185f89ceae6599917343388", - "reference": "407e4b85f547a5251185f89ceae6599917343388", + "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/1f64b1a0b5b789822d0303436ee4e30e0135e4dc", + "reference": "1f64b1a0b5b789822d0303436ee4e30e0135e4dc", "shasum": "" }, "require": { - "squizlabs/php_codesniffer": "^2.8.1" + "php": ">=5.3", + "squizlabs/php_codesniffer": "^2.9.0 || ^3.0.2" }, - "type": "library", + "suggest": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1" + }, + "type": "phpcodesniffer-standard", "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -1723,7 +1702,7 @@ "standards", "wordpress" ], - "time": "2017-03-20 23:17:58" + "time": "2017-08-05T16:08:58+00:00" } ], "aliases": [], diff --git a/languages/rokka-integration-de_CH.po b/languages/rokka-integration-de_CH.po index b55ab16..65b69cc 100644 --- a/languages/rokka-integration-de_CH.po +++ b/languages/rokka-integration-de_CH.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: rokka-integration 1.2.1\n" +"Project-Id-Version: rokka-integration 1.2.2\n" "Report-Msgid-Bugs-To: contact@liip.ch\n" -"POT-Creation-Date: 2017-07-12 09:19+0200\n" +"POT-Creation-Date: 2017-09-20 15:42+0200\n" "PO-Revision-Date: 2017-04-04 11:53+0200\n" "Last-Translator: Juerg Hunziker \n" "Language-Team: German\n" @@ -191,7 +191,7 @@ msgstr "" #: src/class-rokka-integration-settings.php:292 msgid "" "Stacks are a set of operations on rokka which represent the image sizes as " -"they are defined in Wordpress. If you change the image sizes in Wordpress, " +"they are defined in WordPress. If you change the image sizes in WordPress, " "execute this command again in order to reflect pass the size changes to the " "stacks on rokka." msgstr "" @@ -234,122 +234,122 @@ msgstr "" msgid "Stack will be deleted" msgstr "" -#: src/class-rokka-integration-settings.php:340 +#: src/class-rokka-integration-settings.php:337 msgid "Yes" msgstr "" -#: src/class-rokka-integration-settings.php:340 +#: src/class-rokka-integration-settings.php:337 msgid "No" msgstr "" -#: src/class-rokka-integration-settings.php:347 +#: src/class-rokka-integration-settings.php:344 msgid "Sync stacks with rokka" msgstr "" -#: src/class-rokka-integration-settings.php:350 +#: src/class-rokka-integration-settings.php:347 msgid "There are no image sizes defined in WordPress." msgstr "" -#: src/class-rokka-integration-settings.php:358 +#: src/class-rokka-integration-settings.php:355 #, php-format msgctxt "%s contains the error from rokka" msgid "There was an error listing the stacks from rokka. %s" msgstr "" -#: src/class-rokka-integration-settings.php:369 +#: src/class-rokka-integration-settings.php:366 msgid "Please enable rokka first (in main settings)." msgstr "" -#: src/class-rokka-integration-settings.php:375 +#: src/class-rokka-integration-settings.php:372 msgid "Mass upload images to rokka" msgstr "" -#: src/class-rokka-integration-settings.php:378 +#: src/class-rokka-integration-settings.php:375 msgid "The following images will be uploaded to rokka:" msgstr "" -#: src/class-rokka-integration-settings.php:383 -#: src/class-rokka-integration-settings.php:408 +#: src/class-rokka-integration-settings.php:380 +#: src/class-rokka-integration-settings.php:405 #, php-format msgctxt "%1$s contains image id. %2$s contains image path." msgid "ID: %1$s / Path: %2$s" msgstr "" -#: src/class-rokka-integration-settings.php:387 +#: src/class-rokka-integration-settings.php:384 msgid "Upload all images to rokka" msgstr "" -#: src/class-rokka-integration-settings.php:391 -#: src/class-rokka-integration-settings.php:416 +#: src/class-rokka-integration-settings.php:388 +#: src/class-rokka-integration-settings.php:413 msgid "Log:" msgstr "" -#: src/class-rokka-integration-settings.php:396 +#: src/class-rokka-integration-settings.php:393 msgid "All images are already uploaded to rokka. Nothing to do here." msgstr "" -#: src/class-rokka-integration-settings.php:400 +#: src/class-rokka-integration-settings.php:397 msgid "Danger zone - Mass delete images" msgstr "" -#: src/class-rokka-integration-settings.php:403 +#: src/class-rokka-integration-settings.php:400 msgid "The following images will be deleted from rokka:" msgstr "" -#: src/class-rokka-integration-settings.php:412 +#: src/class-rokka-integration-settings.php:409 msgid "Remove all images from rokka" msgstr "" -#: src/class-rokka-integration-settings.php:421 +#: src/class-rokka-integration-settings.php:418 msgid "There are no images on rokka yet. Please upload them first." msgstr "" -#: src/class-rokka-integration-settings.php:425 +#: src/class-rokka-integration-settings.php:422 msgid "Please enable rokka first (in main settings)" msgstr "" -#: src/class-rokka-integration-settings.php:438 +#: src/class-rokka-integration-settings.php:435 msgid "Check rokka crendentials" msgstr "" -#: src/class-rokka-integration-settings.php:455 +#: src/class-rokka-integration-settings.php:452 msgid "Liip Logo" msgstr "" -#: src/class-rokka-integration-settings.php:647 -#: src/class-rokka-integration-settings.php:683 -#: src/class-rokka-integration-settings.php:719 -#: src/class-rokka-integration-settings.php:746 +#: src/class-rokka-integration-settings.php:644 +#: src/class-rokka-integration-settings.php:680 +#: src/class-rokka-integration-settings.php:716 +#: src/class-rokka-integration-settings.php:743 msgid "Permission denied! There was something wrong with the nonce." msgstr "" -#: src/class-rokka-integration-settings.php:664 +#: src/class-rokka-integration-settings.php:661 msgid "This image is already on rokka. No need to upload it another time." msgstr "" -#: src/class-rokka-integration-settings.php:667 -#: src/class-rokka-integration-settings.php:703 +#: src/class-rokka-integration-settings.php:664 +#: src/class-rokka-integration-settings.php:700 msgid "image_id parameter missing." msgstr "" -#: src/class-rokka-integration-settings.php:700 +#: src/class-rokka-integration-settings.php:697 msgid "This image is not yet on rokka. No need to delete it." msgstr "" -#: src/class-rokka-integration-settings.php:731 +#: src/class-rokka-integration-settings.php:728 msgid "Could not process stacks." msgstr "" -#: src/class-rokka-integration-settings.php:751 +#: src/class-rokka-integration-settings.php:748 msgid "Yay! Your rokka credentials are valid." msgstr "" -#: src/class-rokka-integration-settings.php:754 +#: src/class-rokka-integration-settings.php:751 msgid "Whops! Something is wrong with your rokka credentials." msgstr "" -#: src/class-rokka-integration-settings.php:784 -#: src/class-rokka-integration-settings.php:793 +#: src/class-rokka-integration-settings.php:781 +#: src/class-rokka-integration-settings.php:790 #: src/class-rokka-integration.php:161 src/class-rokka-integration.php:168 msgid "Cheatin’ huh?" msgstr "" diff --git a/languages/rokka-integration-de_DE.po b/languages/rokka-integration-de_DE.po index 5d0cf42..12f9e0e 100644 --- a/languages/rokka-integration-de_DE.po +++ b/languages/rokka-integration-de_DE.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: rokka-integration 1.2.1\n" +"Project-Id-Version: rokka-integration 1.2.2\n" "Report-Msgid-Bugs-To: contact@liip.ch\n" -"POT-Creation-Date: 2017-07-12 09:19+0200\n" +"POT-Creation-Date: 2017-09-20 15:42+0200\n" "PO-Revision-Date: 2017-04-04 11:57+0200\n" "Last-Translator: Juerg Hunziker \n" "Language-Team: German\n" @@ -191,7 +191,7 @@ msgstr "" #: src/class-rokka-integration-settings.php:292 msgid "" "Stacks are a set of operations on rokka which represent the image sizes as " -"they are defined in Wordpress. If you change the image sizes in Wordpress, " +"they are defined in WordPress. If you change the image sizes in WordPress, " "execute this command again in order to reflect pass the size changes to the " "stacks on rokka." msgstr "" @@ -234,122 +234,122 @@ msgstr "" msgid "Stack will be deleted" msgstr "" -#: src/class-rokka-integration-settings.php:340 +#: src/class-rokka-integration-settings.php:337 msgid "Yes" msgstr "" -#: src/class-rokka-integration-settings.php:340 +#: src/class-rokka-integration-settings.php:337 msgid "No" msgstr "" -#: src/class-rokka-integration-settings.php:347 +#: src/class-rokka-integration-settings.php:344 msgid "Sync stacks with rokka" msgstr "" -#: src/class-rokka-integration-settings.php:350 +#: src/class-rokka-integration-settings.php:347 msgid "There are no image sizes defined in WordPress." msgstr "" -#: src/class-rokka-integration-settings.php:358 +#: src/class-rokka-integration-settings.php:355 #, php-format msgctxt "%s contains the error from rokka" msgid "There was an error listing the stacks from rokka. %s" msgstr "" -#: src/class-rokka-integration-settings.php:369 +#: src/class-rokka-integration-settings.php:366 msgid "Please enable rokka first (in main settings)." msgstr "" -#: src/class-rokka-integration-settings.php:375 +#: src/class-rokka-integration-settings.php:372 msgid "Mass upload images to rokka" msgstr "" -#: src/class-rokka-integration-settings.php:378 +#: src/class-rokka-integration-settings.php:375 msgid "The following images will be uploaded to rokka:" msgstr "" -#: src/class-rokka-integration-settings.php:383 -#: src/class-rokka-integration-settings.php:408 +#: src/class-rokka-integration-settings.php:380 +#: src/class-rokka-integration-settings.php:405 #, php-format msgctxt "%1$s contains image id. %2$s contains image path." msgid "ID: %1$s / Path: %2$s" msgstr "" -#: src/class-rokka-integration-settings.php:387 +#: src/class-rokka-integration-settings.php:384 msgid "Upload all images to rokka" msgstr "" -#: src/class-rokka-integration-settings.php:391 -#: src/class-rokka-integration-settings.php:416 +#: src/class-rokka-integration-settings.php:388 +#: src/class-rokka-integration-settings.php:413 msgid "Log:" msgstr "" -#: src/class-rokka-integration-settings.php:396 +#: src/class-rokka-integration-settings.php:393 msgid "All images are already uploaded to rokka. Nothing to do here." msgstr "" -#: src/class-rokka-integration-settings.php:400 +#: src/class-rokka-integration-settings.php:397 msgid "Danger zone - Mass delete images" msgstr "" -#: src/class-rokka-integration-settings.php:403 +#: src/class-rokka-integration-settings.php:400 msgid "The following images will be deleted from rokka:" msgstr "" -#: src/class-rokka-integration-settings.php:412 +#: src/class-rokka-integration-settings.php:409 msgid "Remove all images from rokka" msgstr "" -#: src/class-rokka-integration-settings.php:421 +#: src/class-rokka-integration-settings.php:418 msgid "There are no images on rokka yet. Please upload them first." msgstr "" -#: src/class-rokka-integration-settings.php:425 +#: src/class-rokka-integration-settings.php:422 msgid "Please enable rokka first (in main settings)" msgstr "" -#: src/class-rokka-integration-settings.php:438 +#: src/class-rokka-integration-settings.php:435 msgid "Check rokka crendentials" msgstr "" -#: src/class-rokka-integration-settings.php:455 +#: src/class-rokka-integration-settings.php:452 msgid "Liip Logo" msgstr "" -#: src/class-rokka-integration-settings.php:647 -#: src/class-rokka-integration-settings.php:683 -#: src/class-rokka-integration-settings.php:719 -#: src/class-rokka-integration-settings.php:746 +#: src/class-rokka-integration-settings.php:644 +#: src/class-rokka-integration-settings.php:680 +#: src/class-rokka-integration-settings.php:716 +#: src/class-rokka-integration-settings.php:743 msgid "Permission denied! There was something wrong with the nonce." msgstr "" -#: src/class-rokka-integration-settings.php:664 +#: src/class-rokka-integration-settings.php:661 msgid "This image is already on rokka. No need to upload it another time." msgstr "" -#: src/class-rokka-integration-settings.php:667 -#: src/class-rokka-integration-settings.php:703 +#: src/class-rokka-integration-settings.php:664 +#: src/class-rokka-integration-settings.php:700 msgid "image_id parameter missing." msgstr "" -#: src/class-rokka-integration-settings.php:700 +#: src/class-rokka-integration-settings.php:697 msgid "This image is not yet on rokka. No need to delete it." msgstr "" -#: src/class-rokka-integration-settings.php:731 +#: src/class-rokka-integration-settings.php:728 msgid "Could not process stacks." msgstr "" -#: src/class-rokka-integration-settings.php:751 +#: src/class-rokka-integration-settings.php:748 msgid "Yay! Your rokka credentials are valid." msgstr "" -#: src/class-rokka-integration-settings.php:754 +#: src/class-rokka-integration-settings.php:751 msgid "Whops! Something is wrong with your rokka credentials." msgstr "" -#: src/class-rokka-integration-settings.php:784 -#: src/class-rokka-integration-settings.php:793 +#: src/class-rokka-integration-settings.php:781 +#: src/class-rokka-integration-settings.php:790 #: src/class-rokka-integration.php:161 src/class-rokka-integration.php:168 msgid "Cheatin’ huh?" msgstr "" diff --git a/languages/rokka-integration.pot b/languages/rokka-integration.pot index 1bbdd4f..de66bd7 100644 --- a/languages/rokka-integration.pot +++ b/languages/rokka-integration.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: rokka-integration 1.2.1\n" +"Project-Id-Version: rokka-integration 1.2.2\n" "Report-Msgid-Bugs-To: contact@liip.ch\n" -"POT-Creation-Date: 2017-07-12 09:19+0200\n" +"POT-Creation-Date: 2017-09-20 15:42+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -173,7 +173,7 @@ msgid "Mass upload/delete" msgstr "" #: src/class-rokka-integration-settings.php:292 -msgid "Stacks are a set of operations on rokka which represent the image sizes as they are defined in Wordpress. If you change the image sizes in Wordpress, execute this command again in order to reflect pass the size changes to the stacks on rokka." +msgid "Stacks are a set of operations on rokka which represent the image sizes as they are defined in WordPress. If you change the image sizes in WordPress, execute this command again in order to reflect pass the size changes to the stacks on rokka." msgstr "" #: src/class-rokka-integration-settings.php:303 @@ -214,122 +214,122 @@ msgstr "" msgid "Stack will be deleted" msgstr "" -#: src/class-rokka-integration-settings.php:340 +#: src/class-rokka-integration-settings.php:337 msgid "Yes" msgstr "" -#: src/class-rokka-integration-settings.php:340 +#: src/class-rokka-integration-settings.php:337 msgid "No" msgstr "" -#: src/class-rokka-integration-settings.php:347 +#: src/class-rokka-integration-settings.php:344 msgid "Sync stacks with rokka" msgstr "" -#: src/class-rokka-integration-settings.php:350 +#: src/class-rokka-integration-settings.php:347 msgid "There are no image sizes defined in WordPress." msgstr "" -#: src/class-rokka-integration-settings.php:358 +#: src/class-rokka-integration-settings.php:355 #, php-format msgctxt "%s contains the error from rokka" msgid "There was an error listing the stacks from rokka. %s" msgstr "" -#: src/class-rokka-integration-settings.php:369 +#: src/class-rokka-integration-settings.php:366 msgid "Please enable rokka first (in main settings)." msgstr "" -#: src/class-rokka-integration-settings.php:375 +#: src/class-rokka-integration-settings.php:372 msgid "Mass upload images to rokka" msgstr "" -#: src/class-rokka-integration-settings.php:378 +#: src/class-rokka-integration-settings.php:375 msgid "The following images will be uploaded to rokka:" msgstr "" -#: src/class-rokka-integration-settings.php:383 -#: src/class-rokka-integration-settings.php:408 +#: src/class-rokka-integration-settings.php:380 +#: src/class-rokka-integration-settings.php:405 #, php-format msgctxt "%1$s contains image id. %2$s contains image path." msgid "ID: %1$s / Path: %2$s" msgstr "" -#: src/class-rokka-integration-settings.php:387 +#: src/class-rokka-integration-settings.php:384 msgid "Upload all images to rokka" msgstr "" -#: src/class-rokka-integration-settings.php:391 -#: src/class-rokka-integration-settings.php:416 +#: src/class-rokka-integration-settings.php:388 +#: src/class-rokka-integration-settings.php:413 msgid "Log:" msgstr "" -#: src/class-rokka-integration-settings.php:396 +#: src/class-rokka-integration-settings.php:393 msgid "All images are already uploaded to rokka. Nothing to do here." msgstr "" -#: src/class-rokka-integration-settings.php:400 +#: src/class-rokka-integration-settings.php:397 msgid "Danger zone - Mass delete images" msgstr "" -#: src/class-rokka-integration-settings.php:403 +#: src/class-rokka-integration-settings.php:400 msgid "The following images will be deleted from rokka:" msgstr "" -#: src/class-rokka-integration-settings.php:412 +#: src/class-rokka-integration-settings.php:409 msgid "Remove all images from rokka" msgstr "" -#: src/class-rokka-integration-settings.php:421 +#: src/class-rokka-integration-settings.php:418 msgid "There are no images on rokka yet. Please upload them first." msgstr "" -#: src/class-rokka-integration-settings.php:425 +#: src/class-rokka-integration-settings.php:422 msgid "Please enable rokka first (in main settings)" msgstr "" -#: src/class-rokka-integration-settings.php:438 +#: src/class-rokka-integration-settings.php:435 msgid "Check rokka crendentials" msgstr "" -#: src/class-rokka-integration-settings.php:455 +#: src/class-rokka-integration-settings.php:452 msgid "Liip Logo" msgstr "" -#: src/class-rokka-integration-settings.php:647 -#: src/class-rokka-integration-settings.php:683 -#: src/class-rokka-integration-settings.php:719 -#: src/class-rokka-integration-settings.php:746 +#: src/class-rokka-integration-settings.php:644 +#: src/class-rokka-integration-settings.php:680 +#: src/class-rokka-integration-settings.php:716 +#: src/class-rokka-integration-settings.php:743 msgid "Permission denied! There was something wrong with the nonce." msgstr "" -#: src/class-rokka-integration-settings.php:664 +#: src/class-rokka-integration-settings.php:661 msgid "This image is already on rokka. No need to upload it another time." msgstr "" -#: src/class-rokka-integration-settings.php:667 -#: src/class-rokka-integration-settings.php:703 +#: src/class-rokka-integration-settings.php:664 +#: src/class-rokka-integration-settings.php:700 msgid "image_id parameter missing." msgstr "" -#: src/class-rokka-integration-settings.php:700 +#: src/class-rokka-integration-settings.php:697 msgid "This image is not yet on rokka. No need to delete it." msgstr "" -#: src/class-rokka-integration-settings.php:731 +#: src/class-rokka-integration-settings.php:728 msgid "Could not process stacks." msgstr "" -#: src/class-rokka-integration-settings.php:751 +#: src/class-rokka-integration-settings.php:748 msgid "Yay! Your rokka credentials are valid." msgstr "" -#: src/class-rokka-integration-settings.php:754 +#: src/class-rokka-integration-settings.php:751 msgid "Whops! Something is wrong with your rokka credentials." msgstr "" -#: src/class-rokka-integration-settings.php:784 -#: src/class-rokka-integration-settings.php:793 +#: src/class-rokka-integration-settings.php:781 +#: src/class-rokka-integration-settings.php:790 #: src/class-rokka-integration.php:161 src/class-rokka-integration.php:168 msgid "Cheatin’ huh?" msgstr "" diff --git a/package.json b/package.json index dde6fe1..a36b2b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rokka-wordpress-plugin", - "version": "1.2.1", + "version": "1.2.2", "description": "Rokka integration plugin for WordPress", "main": "index.js", "scripts": { diff --git a/readme.txt b/readme.txt index aae7dce..7134fa9 100644 --- a/readme.txt +++ b/readme.txt @@ -3,8 +3,8 @@ Contributors: liip, tschortsch Donate link: https://rokka.io/ Tags: rokka, image, service, cdn, integration Requires at least: 4.0 -Tested up to: 4.8 -Stable tag: 1.2.1 +Tested up to: 4.8.2 +Stable tag: 1.2.2 License: GPLv2 License URI: https://www.gnu.org/licenses/gpl-2.0.html @@ -67,6 +67,11 @@ Please create a new GitHub issue and let us know: [https://github.com/rokka-io/r == Changelog == += 1.2.2 = + +* [UPDATE] Updated rokka-client-php to v0.10.0 +* [CHANGE] Improved generation of prefixed stack names. + = 1.2.1 = * [FEATURE] Add autoformat option. If autoformat is enabled, rokka will deliver an image in the usually smaller WebP format instead of PNG or JPG, if the client supports it. diff --git a/rokka-integration.php b/rokka-integration.php index ecfbcd8..71dcfab 100644 --- a/rokka-integration.php +++ b/rokka-integration.php @@ -1,7 +1,7 @@ is_rokka_enabled() ) { diff --git a/scripts/translations/extract_messages.sh b/scripts/translations/extract_messages.sh index 8d75800..bf69fcd 100755 --- a/scripts/translations/extract_messages.sh +++ b/scripts/translations/extract_messages.sh @@ -10,7 +10,7 @@ find "." \ -not -path "tests/*" \ -not -path "vendor/*" \ -type f \( -name "*.php" \) \ - | xargs xgettext --language=PHP --add-comments=TRANSLATORS: --force-po --from-code=UTF-8 --no-wrap --foreign-user --package-name="rokka-integration" --package-version=1.2.1 --msgid-bugs-address=contact@liip.ch \ + | xargs xgettext --language=PHP --add-comments=TRANSLATORS: --force-po --from-code=UTF-8 --no-wrap --foreign-user --package-name="rokka-integration" --package-version=1.2.2 --msgid-bugs-address=contact@liip.ch \ --keyword=__ \ --keyword=_e \ --keyword=__ngettext:1,2 \ diff --git a/src/class-rokka-helper.php b/src/class-rokka-helper.php index 34fe6a9..15b18b6 100644 --- a/src/class-rokka-helper.php +++ b/src/class-rokka-helper.php @@ -508,7 +508,7 @@ public function rokka_sync_stacks() { foreach ( $stacks_to_sync as $stack ) { // handle full size stack specially - if ( $stack['name'] === $this->get_stack_prefix() . $this->get_rokka_full_size_stack_name() ) { + if ( $stack['name'] === $this->get_prefixed_stack_name( $this->get_rokka_full_size_stack_name() ) ) { if ( self::STACK_SYNC_OPERATION_CREATE === $stack['operation'] ) { $this->create_noop_stack( $stack['name'] ); } @@ -555,13 +555,14 @@ public function get_stacks_to_sync() { * @var \Rokka\Client\Core\Stack[] $stacks_on_rokka */ $stacks_on_rokka = array_filter( $stack_collection->getStacks(), function ( $stack ) { + // filter out all non prefixed stacks return substr( $stack->name, 0, strlen( $this->get_stack_prefix() ) ) === $this->get_stack_prefix(); } ); $stacks_to_sync = array(); // Create a noop stack (full size stack) if it not exists already - $noop_stackname = $this->get_stack_prefix() . $this->get_rokka_full_size_stack_name(); + $noop_stackname = $this->get_prefixed_stack_name( $this->get_rokka_full_size_stack_name() ); try { $client->getStack( $noop_stackname ); $stacks_to_sync[ $noop_stackname ] = array( @@ -585,7 +586,7 @@ public function get_stacks_to_sync() { $width = $size[0]; $height = $size[1]; $crop = $size[2]; - $prefixed_name = $this->get_stack_prefix() . $name; + $prefixed_name = $this->get_prefixed_stack_name( $name ); $stack_already_on_rokka = false; // loop through all stacks which are already on rokka @@ -643,16 +644,16 @@ public function get_stacks_to_sync() { } } - // find deleted stacks in wordpress + // find deleted stacks in WordPress if ( ! empty( $stacks_on_rokka ) && ! empty( $sizes ) ) { foreach ( $stacks_on_rokka as $stack ) { // full size stack should never be deleted - if ( $stack->name === $this->get_stack_prefix() . $this->get_rokka_full_size_stack_name() ) { + if ( $stack->name === $this->get_prefixed_stack_name( $this->get_rokka_full_size_stack_name() ) ) { continue; } $stack_still_exists_in_wp = false; foreach ( $sizes as $name => $size ) { - $prefixed_name = $this->get_stack_prefix() . $name; + $prefixed_name = $this->get_prefixed_stack_name( $name ); if ( $stack->name === $prefixed_name ) { $stack_still_exists_in_wp = true; break; @@ -745,9 +746,8 @@ public function get_rokka_full_size_stack_name() { */ public function get_rokka_url( $hash, $filename, $size = 'thumbnail' ) { if ( is_array( $size ) ) { - $stack = null; - // if size is requested as width / height array -> find matching or nearest rokka size + $stack = null; $rokka_sizes = $this->get_available_image_sizes(); foreach ( $rokka_sizes as $size_name => $size_values ) { if ( $size[0] <= $size_values[0] ) { @@ -765,7 +765,17 @@ public function get_rokka_url( $hash, $filename, $size = 'thumbnail' ) { // use fallback image name if empty $filename = 'image.jpg'; } - return $this->get_rokka_scheme() . '://' . $this->get_rokka_domain() . '/' . $this->get_stack_prefix() . $stack . '/' . $hash . '/' . $this->sanitize_rokka_filename( $filename ); + return $this->get_rokka_scheme() . '://' . $this->get_rokka_domain() . '/' . $this->get_prefixed_stack_name( $stack ) . '/' . $hash . '/' . $this->sanitize_rokka_filename( $filename ); + } + + /** + * Returns prefixes stack name + * + * @param string $stack_name Stack name without prefix. + * @return string Prefixed stack name. + */ + public function get_prefixed_stack_name( $stack_name ) { + return $this->get_stack_prefix() . $stack_name; } /** diff --git a/src/class-rokka-integration-settings.php b/src/class-rokka-integration-settings.php index 30b60c7..c8a3e1d 100644 --- a/src/class-rokka-integration-settings.php +++ b/src/class-rokka-integration-settings.php @@ -289,7 +289,7 @@ public function settings_page() { rokka_helper->are_settings_complete() ) : ?>

- +

- rokka_helper->get_stack_prefix() . $this->rokka_helper->get_rokka_full_size_stack_name() === $stack['name'] || - Rokka_Helper::STACK_SYNC_OPERATION_DELETE === $stack['operation'] - ) : ?> + rokka_helper->get_prefixed_stack_name( $this->rokka_helper->get_rokka_full_size_stack_name() ) === $stack['name'] || Rokka_Helper::STACK_SYNC_OPERATION_DELETE === $stack['operation'] ) : ?> - - @@ -514,7 +511,7 @@ public function display_field( $data = array() ) { case 'url': case 'email': $placeholder = ( array_key_exists( 'placeholder', $field ) ? $field['placeholder'] : '' ); - $html .= '' . "\n"; + $html .= '' . "\n"; break; case 'textarea': diff --git a/src/class-rokka-integration.php b/src/class-rokka-integration.php index 73e4aa5..845f868 100644 --- a/src/class-rokka-integration.php +++ b/src/class-rokka-integration.php @@ -76,7 +76,7 @@ class Rokka_Integration { * @param string $file Main plugin file path. * @param string $version Version number. */ - public function __construct( $file = '', $version = '1.2.1' ) { + public function __construct( $file = '', $version = '1.2.2' ) { $this->_version = $version; $this->_token = 'rokka-integration'; @@ -146,7 +146,7 @@ public function load_plugin_textdomain() { * * @return Rokka_Integration Rokka_Integration instance */ - public static function instance( $file = '', $version = '1.2.1' ) { + public static function instance( $file = '', $version = '1.2.2' ) { if ( is_null( self::$_instance ) ) { self::$_instance = new self( $file, $version ); } diff --git a/src/cli-command/class-rokka-wp-cli-command.php b/src/cli-command/class-rokka-wp-cli-command.php index e47eb0e..3236303 100644 --- a/src/cli-command/class-rokka-wp-cli-command.php +++ b/src/cli-command/class-rokka-wp-cli-command.php @@ -41,7 +41,7 @@ class Rokka_Wp_Cli_Command extends WP_CLI_Command { * --- * * ## EXAMPLE - * wp rokka create_stack --name=banner-large --width=1600 --height=700 --crop --autoformat + * wp rokka create_stack --name=banner-large --width=1600 --height=700 --crop --autoformat * * @param array $args Arguments from cli-command. * @param array $assoc_args Associative arguments from cli-command. @@ -82,7 +82,7 @@ public function create_stack( $args, $assoc_args ) { * --- * * ## EXAMPLE - * wp rokka create_noop_stack --name=full + * wp rokka create_noop_stack --name=full * * @param array $args Arguments from cli-command. * @param array $assoc_args Associative arguments from cli-command.