From 78068a08ee0ad6a13c5b6e0327884f558243e59d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20D=C4=9Bdi=C4=8D?= Date: Wed, 8 Nov 2023 16:56:30 +0100 Subject: [PATCH 1/6] Generating pot files with wp-cli --- composer.json | 3 +- composer.lock | 632 +++++++++++++++++++++++++++++++++- gulpfile.js | 30 +- package-lock.json | 78 ----- package.json | 1 - src/languages/crdm-modern.pot | 243 ++++++------- 6 files changed, 767 insertions(+), 220 deletions(-) diff --git a/composer.json b/composer.json index 1f9924cc..63500b73 100644 --- a/composer.json +++ b/composer.json @@ -38,6 +38,7 @@ "phan/phan": "^5.1", "skaut/wordpress-stubs": "^2.2.0", "phpstan/phpstan": "^1.4", - "dealerdirect/phpcodesniffer-composer-installer": "^1.0" + "dealerdirect/phpcodesniffer-composer-installer": "^1.0", + "wp-cli/i18n-command": "^2.4" } } diff --git a/composer.lock b/composer.lock index 997242fa..86152a7b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7108da27258bc33e5f49b2c20ecc07c5", + "content-hash": "1f8c6d45dc238bbf50d83fd5b81980dc", "packages": [], "packages-dev": [ { @@ -303,6 +303,64 @@ }, "time": "2023-01-05T11:28:13+00:00" }, + { + "name": "eftec/bladeone", + "version": "3.52", + "source": { + "type": "git", + "url": "https://github.com/EFTEC/BladeOne.git", + "reference": "a19bf66917de0b29836983db87a455a4f6e32148" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/EFTEC/BladeOne/zipball/a19bf66917de0b29836983db87a455a4f6e32148", + "reference": "a19bf66917de0b29836983db87a455a4f6e32148", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": ">=5.6" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.16.1", + "phpunit/phpunit": "^5.7", + "squizlabs/php_codesniffer": "^3.5.4" + }, + "suggest": { + "eftec/bladeonehtml": "Extension to create forms", + "ext-mbstring": "This extension is used if it's active" + }, + "type": "library", + "autoload": { + "psr-4": { + "eftec\\bladeone\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jorge Patricio Castro Castillo", + "email": "jcastro@eftec.cl" + } + ], + "description": "The standalone version Blade Template Engine from Laravel in a single php file", + "homepage": "https://github.com/EFTEC/BladeOne", + "keywords": [ + "blade", + "php", + "template", + "templating", + "view" + ], + "support": { + "issues": "https://github.com/EFTEC/BladeOne/issues", + "source": "https://github.com/EFTEC/BladeOne/tree/3.52" + }, + "time": "2021-04-17T13:49:01+00:00" + }, { "name": "felixfbecker/advanced-json-rpc", "version": "v3.2.1", @@ -348,6 +406,210 @@ }, "time": "2021-06-11T22:34:44+00:00" }, + { + "name": "gettext/gettext", + "version": "v4.8.11", + "source": { + "type": "git", + "url": "https://github.com/php-gettext/Gettext.git", + "reference": "b632aaf5e4579d0b2ae8bc61785e238bff4c5156" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/b632aaf5e4579d0b2ae8bc61785e238bff4c5156", + "reference": "b632aaf5e4579d0b2ae8bc61785e238bff4c5156", + "shasum": "" + }, + "require": { + "gettext/languages": "^2.3", + "php": ">=5.4.0" + }, + "require-dev": { + "illuminate/view": "^5.0.x-dev", + "phpunit/phpunit": "^4.8|^5.7|^6.5", + "squizlabs/php_codesniffer": "^3.0", + "symfony/yaml": "~2", + "twig/extensions": "*", + "twig/twig": "^1.31|^2.0" + }, + "suggest": { + "illuminate/view": "Is necessary if you want to use the Blade extractor", + "symfony/yaml": "Is necessary if you want to use the Yaml extractor/generator", + "twig/extensions": "Is necessary if you want to use the Twig extractor", + "twig/twig": "Is necessary if you want to use the Twig extractor" + }, + "type": "library", + "autoload": { + "psr-4": { + "Gettext\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Oscar Otero", + "email": "oom@oscarotero.com", + "homepage": "http://oscarotero.com", + "role": "Developer" + } + ], + "description": "PHP gettext manager", + "homepage": "https://github.com/oscarotero/Gettext", + "keywords": [ + "JS", + "gettext", + "i18n", + "mo", + "po", + "translation" + ], + "support": { + "email": "oom@oscarotero.com", + "issues": "https://github.com/oscarotero/Gettext/issues", + "source": "https://github.com/php-gettext/Gettext/tree/v4.8.11" + }, + "funding": [ + { + "url": "https://paypal.me/oscarotero", + "type": "custom" + }, + { + "url": "https://github.com/oscarotero", + "type": "github" + }, + { + "url": "https://www.patreon.com/misteroom", + "type": "patreon" + } + ], + "time": "2023-08-14T15:15:05+00:00" + }, + { + "name": "gettext/languages", + "version": "2.10.0", + "source": { + "type": "git", + "url": "https://github.com/php-gettext/Languages.git", + "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-gettext/Languages/zipball/4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab", + "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "require-dev": { + "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5 || ^8.4" + }, + "bin": [ + "bin/export-plural-rules" + ], + "type": "library", + "autoload": { + "psr-4": { + "Gettext\\Languages\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michele Locati", + "email": "mlocati@gmail.com", + "role": "Developer" + } + ], + "description": "gettext languages with plural rules", + "homepage": "https://github.com/php-gettext/Languages", + "keywords": [ + "cldr", + "i18n", + "internationalization", + "l10n", + "language", + "languages", + "localization", + "php", + "plural", + "plural rules", + "plurals", + "translate", + "translations", + "unicode" + ], + "support": { + "issues": "https://github.com/php-gettext/Languages/issues", + "source": "https://github.com/php-gettext/Languages/tree/2.10.0" + }, + "funding": [ + { + "url": "https://paypal.me/mlocati", + "type": "custom" + }, + { + "url": "https://github.com/mlocati", + "type": "github" + } + ], + "time": "2022-10-18T15:00:10+00:00" + }, + { + "name": "mck89/peast", + "version": "v1.15.4", + "source": { + "type": "git", + "url": "https://github.com/mck89/peast.git", + "reference": "1df4dc28a6b5bb7ab117ab073c1712256e954e18" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mck89/peast/zipball/1df4dc28a6b5bb7ab117ab073c1712256e954e18", + "reference": "1df4dc28a6b5bb7ab117ab073c1712256e954e18", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.15.4-dev" + } + }, + "autoload": { + "psr-4": { + "Peast\\": "lib/Peast/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Marco Marchiò", + "email": "marco.mm89@gmail.com" + } + ], + "description": "Peast is PHP library that generates AST for JavaScript code", + "support": { + "issues": "https://github.com/mck89/peast/issues", + "source": "https://github.com/mck89/peast/tree/v1.15.4" + }, + "time": "2023-08-12T08:29:29+00:00" + }, { "name": "microsoft/tolerant-php-parser", "version": "v0.1.2", @@ -393,6 +655,56 @@ }, "time": "2022-10-05T17:30:19+00:00" }, + { + "name": "mustache/mustache", + "version": "v2.14.2", + "source": { + "type": "git", + "url": "https://github.com/bobthecow/mustache.php.git", + "reference": "e62b7c3849d22ec55f3ec425507bf7968193a6cb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/e62b7c3849d22ec55f3ec425507bf7968193a6cb", + "reference": "e62b7c3849d22ec55f3ec425507bf7968193a6cb", + "shasum": "" + }, + "require": { + "php": ">=5.2.4" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~1.11", + "phpunit/phpunit": "~3.7|~4.0|~5.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "Mustache": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Justin Hileman", + "email": "justin@justinhileman.info", + "homepage": "http://justinhileman.com" + } + ], + "description": "A Mustache implementation in PHP.", + "homepage": "https://github.com/bobthecow/mustache.php", + "keywords": [ + "mustache", + "templating" + ], + "support": { + "issues": "https://github.com/bobthecow/mustache.php/issues", + "source": "https://github.com/bobthecow/mustache.php/tree/v2.14.2" + }, + "time": "2022-08-23T13:07:01+00:00" + }, { "name": "netresearch/jsonmapper", "version": "v4.1.0", @@ -1880,6 +2192,70 @@ ], "time": "2023-01-20T17:44:14+00:00" }, + { + "name": "symfony/finder", + "version": "v6.3.5", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/a1b31d88c0e998168ca7792f222cbecee47428c4", + "reference": "a1b31d88c0e998168ca7792f222cbecee47428c4", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "symfony/filesystem": "^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Finds files and directories via an intuitive fluent interface", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/finder/tree/v6.3.5" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-09-26T12:56:25+00:00" + }, { "name": "symfony/polyfill-ctype", "version": "v1.28.0", @@ -2659,6 +3035,258 @@ }, "time": "2022-06-03T18:03:27+00:00" }, + { + "name": "wp-cli/i18n-command", + "version": "v2.4.4", + "source": { + "type": "git", + "url": "https://github.com/wp-cli/i18n-command.git", + "reference": "7d82e675f271359b1af614e6325d8eeaeb7d7474" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/7d82e675f271359b1af614e6325d8eeaeb7d7474", + "reference": "7d82e675f271359b1af614e6325d8eeaeb7d7474", + "shasum": "" + }, + "require": { + "eftec/bladeone": "3.52", + "gettext/gettext": "^4.8", + "mck89/peast": "^1.13.11", + "wp-cli/wp-cli": "^2.5" + }, + "require-dev": { + "wp-cli/scaffold-command": "^1.2 || ^2", + "wp-cli/wp-cli-tests": "^4" + }, + "suggest": { + "ext-json": "Used for reading and generating JSON translation files", + "ext-mbstring": "Used for calculating include/exclude matches in code extraction" + }, + "type": "wp-cli-package", + "extra": { + "branch-alias": { + "dev-main": "2.x-dev" + }, + "bundled": true, + "commands": [ + "i18n", + "i18n make-pot", + "i18n make-json", + "i18n make-mo", + "i18n update-po" + ] + }, + "autoload": { + "files": [ + "i18n-command.php" + ], + "psr-4": { + "WP_CLI\\I18n\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Pascal Birchler", + "homepage": "https://pascalbirchler.com/" + } + ], + "description": "Provides internationalization tools for WordPress projects.", + "homepage": "https://github.com/wp-cli/i18n-command", + "support": { + "issues": "https://github.com/wp-cli/i18n-command/issues", + "source": "https://github.com/wp-cli/i18n-command/tree/v2.4.4" + }, + "time": "2023-08-30T18:00:10+00:00" + }, + { + "name": "wp-cli/mustangostang-spyc", + "version": "0.6.3", + "source": { + "type": "git", + "url": "https://github.com/wp-cli/spyc.git", + "reference": "6aa0b4da69ce9e9a2c8402dab8d43cf32c581cc7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wp-cli/spyc/zipball/6aa0b4da69ce9e9a2c8402dab8d43cf32c581cc7", + "reference": "6aa0b4da69ce9e9a2c8402dab8d43cf32c581cc7", + "shasum": "" + }, + "require": { + "php": ">=5.3.1" + }, + "require-dev": { + "phpunit/phpunit": "4.3.*@dev" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.5.x-dev" + } + }, + "autoload": { + "files": [ + "includes/functions.php" + ], + "psr-4": { + "Mustangostang\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "mustangostang", + "email": "vlad.andersen@gmail.com" + } + ], + "description": "A simple YAML loader/dumper class for PHP (WP-CLI fork)", + "homepage": "https://github.com/mustangostang/spyc/", + "support": { + "source": "https://github.com/wp-cli/spyc/tree/autoload" + }, + "time": "2017-04-25T11:26:20+00:00" + }, + { + "name": "wp-cli/php-cli-tools", + "version": "v0.11.21", + "source": { + "type": "git", + "url": "https://github.com/wp-cli/php-cli-tools.git", + "reference": "b3457a8d60cd0b1c48cab76ad95df136d266f0b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wp-cli/php-cli-tools/zipball/b3457a8d60cd0b1c48cab76ad95df136d266f0b6", + "reference": "b3457a8d60cd0b1c48cab76ad95df136d266f0b6", + "shasum": "" + }, + "require": { + "php": ">= 5.3.0" + }, + "require-dev": { + "roave/security-advisories": "dev-latest", + "wp-cli/wp-cli-tests": "^4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.11.x-dev" + } + }, + "autoload": { + "files": [ + "lib/cli/cli.php" + ], + "psr-0": { + "cli": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Daniel Bachhuber", + "email": "daniel@handbuilt.co", + "role": "Maintainer" + }, + { + "name": "James Logsdon", + "email": "jlogsdon@php.net", + "role": "Developer" + } + ], + "description": "Console utilities for PHP", + "homepage": "http://github.com/wp-cli/php-cli-tools", + "keywords": [ + "cli", + "console" + ], + "support": { + "issues": "https://github.com/wp-cli/php-cli-tools/issues", + "source": "https://github.com/wp-cli/php-cli-tools/tree/v0.11.21" + }, + "time": "2023-09-29T15:28:10+00:00" + }, + { + "name": "wp-cli/wp-cli", + "version": "v2.9.0", + "source": { + "type": "git", + "url": "https://github.com/wp-cli/wp-cli.git", + "reference": "8a3befba2d947fbf5cc6d1941edf2dd99da4d4b7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wp-cli/wp-cli/zipball/8a3befba2d947fbf5cc6d1941edf2dd99da4d4b7", + "reference": "8a3befba2d947fbf5cc6d1941edf2dd99da4d4b7", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "mustache/mustache": "^2.14.1", + "php": "^5.6 || ^7.0 || ^8.0", + "symfony/finder": ">2.7", + "wp-cli/mustangostang-spyc": "^0.6.3", + "wp-cli/php-cli-tools": "~0.11.2" + }, + "require-dev": { + "roave/security-advisories": "dev-latest", + "wp-cli/db-command": "^1.3 || ^2", + "wp-cli/entity-command": "^1.2 || ^2", + "wp-cli/extension-command": "^1.1 || ^2", + "wp-cli/package-command": "^1 || ^2", + "wp-cli/wp-cli-tests": "^4.0.1" + }, + "suggest": { + "ext-readline": "Include for a better --prompt implementation", + "ext-zip": "Needed to support extraction of ZIP archives when doing downloads or updates" + }, + "bin": [ + "bin/wp", + "bin/wp.bat" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.9.x-dev" + } + }, + "autoload": { + "psr-0": { + "WP_CLI\\": "php/" + }, + "classmap": [ + "php/class-wp-cli.php", + "php/class-wp-cli-command.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "WP-CLI framework", + "homepage": "https://wp-cli.org", + "keywords": [ + "cli", + "wordpress" + ], + "support": { + "docs": "https://make.wordpress.org/cli/handbook/", + "issues": "https://github.com/wp-cli/wp-cli/issues", + "source": "https://github.com/wp-cli/wp-cli" + }, + "time": "2023-10-25T09:06:37+00:00" + }, { "name": "wp-coding-standards/wpcs", "version": "3.0.1", @@ -2735,5 +3363,5 @@ "php": "^7.0 || ^8.0" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/gulpfile.js b/gulpfile.js index 19f22f55..f15c6e6a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -11,7 +11,6 @@ const rename = require('gulp-rename'); const shell = require('gulp-shell'); const terser = require('gulp-terser'); const ts = require('gulp-typescript'); -const wpPot = require('gulp-wp-pot'); gulp.task('build:css:main', () => gulp @@ -186,26 +185,15 @@ gulp.task( gulp.task( 'update-translations:generate-pot', - gulp.series( - () => - gulp - .src('src/php/**/*.php') - .pipe( - wpPot({ - bugReport: - 'https://github.com/skaut/crdm-modern/issues', - copyrightText: '# Copyright (C) Junák – český skaut', - domain: 'crdm-modern', - package: 'crdm-modern', - relativeTo: 'src/php', - includePOTCreationDate: false, - }) - ) - .pipe(gulp.dest('src/languages/crdm-modern.pot')), - shell.task( - 'msgmerge -U src/languages/crdm-modern.pot src/languages/crdm-modern.pot' - ) - ) + gulp.series((cb) => { + const exec = require('child_process').exec; + exec( + './vendor/bin/wp i18n make-pot src/ src/languages/crdm-modern.pot --slug="crdm-modern" --headers=\'{"Report-Msgid-Bugs-To": "https://github.com/skaut/crdm-modern/issues", "POT-Creation-Date": "", "Last-Translator": "Marek Dědič ", "Language-Team": ""}\' --file-comment="Copyright (C) Junák – český skaut" --package-name="crdm-modern"', + (err) => { + cb(err); + } + ); + }) ); gulp.task('update-translations:update-po', () => diff --git a/package-lock.json b/package-lock.json index 2484c43d..941dd4b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,6 @@ "gulp-shell": "^0.8.0", "gulp-terser": "^2.1.0", "gulp-typescript": "^6.0.0-alpha.1", - "gulp-wp-pot": "^2.5.0", "merge-stream": "^2.0.0", "npm-run-all": "^4.1.5", "rimraf": "^5.0.5", @@ -7318,20 +7317,6 @@ "node": ">= 0.9" } }, - "node_modules/gulp-wp-pot": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/gulp-wp-pot/-/gulp-wp-pot-2.5.0.tgz", - "integrity": "sha512-3IIVEsgAaRFi4DWv5hRZcM7VEsCtGD4ZxgPL8qPdX+yrSpwD8I2+Q1cP3olXhn7KLJsnGSNuqor5sxo97H5pmQ==", - "dev": true, - "dependencies": { - "plugin-error": "^1.0.1", - "vinyl": "^2.2.1", - "wp-pot": "^1.9.6" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/gulplog": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", @@ -9041,42 +9026,6 @@ "node": ">=0.10.0" } }, - "node_modules/matched": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/matched/-/matched-5.0.1.tgz", - "integrity": "sha512-E1fhSTPRyhAlNaNvGXAgZQlq1hL0bgYMTk/6bktVlIhzUnX/SZs7296ACdVeNJE8xFNGSuvd9IpI7vSnmcqLvw==", - "dev": true, - "dependencies": { - "glob": "^7.1.6", - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/matched/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/mathml-tag-names": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", @@ -10242,12 +10191,6 @@ "node": "14 || >=16.14" } }, - "node_modules/path-sort": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/path-sort/-/path-sort-0.1.0.tgz", - "integrity": "sha512-70MSq7edKtbODYKkqXYzSMQxtYMjDgP3K6D15Fu4KUvpyBPlxDWPvv8JI9GjNDF2K5baPHFEtlg818dOmf2ifg==", - "dev": true - }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -10266,12 +10209,6 @@ "through": "~2.3" } }, - "node_modules/php-parser": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/php-parser/-/php-parser-3.1.5.tgz", - "integrity": "sha512-jEY2DcbgCm5aclzBdfW86GM6VEIWcSlhTBSHN1qhJguVePlYe28GhwS0yoeLYXpM2K8y6wzLwrbq814n2PHSoQ==", - "dev": true - }, "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", @@ -13629,21 +13566,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/wp-pot": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/wp-pot/-/wp-pot-1.10.2.tgz", - "integrity": "sha512-NJ9+dsSilghAYMiuGdURJSbKFf9Z2mH+P6ojT8Nw1Pp8KuwvHdRTFTYK73THlYzohUEXlQGpvKkz+mJb8K1ToA==", - "dev": true, - "dependencies": { - "espree": "^9.3.1", - "matched": "^5.0.1", - "path-sort": "^0.1.0", - "php-parser": "^3.0.3" - }, - "engines": { - "node": ">=14" - } - }, "node_modules/wrap-ansi": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", diff --git a/package.json b/package.json index caecb77e..46f1124f 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,6 @@ "gulp-shell": "^0.8.0", "gulp-terser": "^2.1.0", "gulp-typescript": "^6.0.0-alpha.1", - "gulp-wp-pot": "^2.5.0", "merge-stream": "^2.0.0", "npm-run-all": "^4.1.5", "rimraf": "^5.0.5", diff --git a/src/languages/crdm-modern.pot b/src/languages/crdm-modern.pot index d66e7a4e..01e18f77 100644 --- a/src/languages/crdm-modern.pot +++ b/src/languages/crdm-modern.pot @@ -1,216 +1,225 @@ # Copyright (C) Junák – český skaut msgid "" msgstr "" -"Project-Id-Version: crdm-modern\n" +"Project-Id-Version: crdm-modern 1.0.4\n" "Report-Msgid-Bugs-To: https://github.com/skaut/crdm-modern/issues\n" +"Last-Translator: Marek Dědič \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Basepath: ..\n" -"X-Poedit-KeywordsList: __;_e;_ex:1,2c;_n:1,2;_n_noop:1,2;_nx:1,2,4c;" -"_nx_noop:1,2,3c;_x:1,2c;esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;" -"esc_html_e;esc_html_x:1,2c\n" -"X-Poedit-SearchPath-0: .\n" -"X-Poedit-SearchPathExcluded-0: *.js\n" -"X-Poedit-SourceCharset: UTF-8\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: functions.php:163 -msgid "CRDM - Modern theme requires at least WordPress 5.0" +"POT-Creation-Date: \n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"X-Generator: WP-CLI 2.9.0\n" +"X-Domain: crdm-modern\n" + +#. Theme Name of the theme +msgid "CRDM - Modern" msgstr "" -#: functions.php:176 -msgid "CRDM - Modern theme requires at least PHP 7.0" +#. Theme URI of the theme +msgid "https://github.com/skaut/crdm-modern" msgstr "" -#: functions.php:188 -msgid "CRDM - Modern theme requires GeneratePress Premium" +#. Description of the theme +msgid "A modern WordPress theme made for children's organizations" msgstr "" -#: functions.php:200 -msgid "" -"Failed to copy CRDM - Modern theme images to WordPress Media. The theme will " -"work fine, but you won't be able to re-select the default images outside of " -"the theme presets." +#. Author of the theme +msgid "Junák - český skaut" +msgstr "" + +#. Author URI of the theme +msgid "https://github.com/skaut" msgstr "" -#: admin/customizer.php:52 +#: php/admin/customizer.php:52 msgid "Body" msgstr "" -#: admin/preset-on-activation.php:54, -#: admin/customizer/controls/class-preset-customize-control.php:129 -msgid "Apply" +#: php/admin/customizer/class-preset-registry.php:85 +msgid "Blue" msgstr "" -#: admin/preset-on-activation.php:55 -msgid "Dismiss this notice." +#: php/admin/customizer/class-preset-registry.php:136 +#: php/admin/customizer/class-preset-registry.php:436 +#: php/admin/customizer/class-preset-registry.php:737 +msgid "Read more >" msgstr "" -#: admin/preset-on-activation.php:56 -msgid "Applying the preset failed." +#: php/admin/customizer/class-preset-registry.php:385 +msgid "Green" msgstr "" -#: admin/preset-on-activation.php:57 -msgid "" -"You can choose to apply one of the presets of this theme as a starting point " -"for your website. This will change a lot of the settings of this theme and " -"of GeneratePress, so it is advised to do this only if you are starting " -"fresh. This can be done later in the Customizer as well." +#: php/admin/customizer/class-preset-registry.php:686 +msgid "Beige" msgstr "" -#: admin/preset-on-activation.php:59 -msgid "Skip" +#: php/admin/customizer/colors.php:54 +msgid "Widget Separator" msgstr "" -#: admin/preset-on-activation.php:60 -msgid "Successfully applied the preset." +#: php/admin/customizer/colors.php:78 +msgid "Excerpt Border" msgstr "" -#: admin/preset-on-activation.php:61 -msgid "Theme preset selection" +#: php/admin/customizer/colors.php:102 +msgid "Excerpt Background Hover" msgstr "" -#. translators: %s: Theme name. -#: admin/update.php:22 -msgid "The theme %s is not available for updating." +#: php/admin/customizer/colors.php:126 +msgid "Excerpt Text Hover" msgstr "" -#. translators: %s: Theme name. -#: admin/update.php:24 -msgid "The GitHub API request for updates for the theme %s has failed." +#: php/admin/customizer/colors.php:150 +msgid "\"Read more\" Link" msgstr "" -#: admin/update.php:25 -msgid "Error message:" +#: php/admin/customizer/colors.php:173 +msgid "\"Read more\" Link Hover" msgstr "" -#. translators: %s: Theme name. -#: admin/update.php:27 -msgid "The GitHub API response for the theme %s is invalid." +#: php/admin/customizer/controls/class-preset-customize-control.php:126 +msgid "Applying the preset overrides a lot of the theme options. You can always go back by closing the customizer before saving." msgstr "" -#. translators: %s: Theme name. -#: admin/update.php:29 -msgid "The latest version of the theme %s does not contain an update zip file." +#: php/admin/customizer/controls/class-preset-customize-control.php:129 +#: php/admin/preset-on-activation.php:54 +msgid "Apply" msgstr "" -#: admin/update.php:30 -msgid "New version" +#: php/admin/customizer/layout.php:54 +msgid "Navigation spacing" msgstr "" -#: admin/update.php:31 -msgid "No more info available." +#: php/admin/customizer/layout.php:86 +msgid "Navigation shadow" msgstr "" -#: frontend/class-title-widget.php:72 -msgid "Title Widget" +#: php/admin/customizer/layout.php:108 +msgid "Sidebar widget separator width" msgstr "" -#: frontend/class-title-widget.php:72 -msgid "A widget containing the site logo, title and tagline." +#: php/admin/customizer/layout.php:142 +msgid "Sidebar widget separator spacing" msgstr "" -#: admin/customizer/class-preset-registry.php:136, -#: admin/customizer/class-preset-registry.php:436, -#: admin/customizer/class-preset-registry.php:737 -msgid "Read more >" +#: php/admin/customizer/layout.php:168 +msgid "Featured Posts" msgstr "" -#: admin/customizer/class-preset-registry.php:85 -msgid "Blue" +#: php/admin/customizer/layout.php:187 +msgid "Number of featured posts" msgstr "" -#: admin/customizer/class-preset-registry.php:385 -msgid "Green" +#: php/admin/customizer/preset.php:37 +msgid "Preset" msgstr "" -#: admin/customizer/class-preset-registry.php:686 -msgid "Beige" +#: php/admin/customizer/site-identity.php:53 +msgid "Header Image" msgstr "" -#: admin/customizer/colors.php:54 -msgid "Widget Separator" +#: php/admin/customizer/site-identity.php:83 +msgid "Header Image Height" msgstr "" -#: admin/customizer/colors.php:78 -msgid "Excerpt Border" +#: php/admin/customizer/site-identity.php:116 +msgid "Header Image Top Position" msgstr "" -#: admin/customizer/colors.php:102 -msgid "Excerpt Background Hover" +#: php/admin/customizer/site-identity.php:149 +msgid "Header Image Right Position" msgstr "" -#: admin/customizer/colors.php:126 -msgid "Excerpt Text Hover" +#: php/admin/customizer/site-identity.php:181 +msgid "Minimum Width to Show Header Image" msgstr "" -#: admin/customizer/colors.php:150 -msgid "\"Read more\" Link" +#: php/admin/customizer/typography.php:42 +msgid "Blog" msgstr "" -#: admin/customizer/colors.php:173 -msgid "\"Read more\" Link Hover" +#: php/admin/customizer/typography.php:98 +msgid "Font size" msgstr "" -#: admin/customizer/layout.php:54 -msgid "Navigation spacing" +#: php/admin/preset-on-activation.php:55 +msgid "Dismiss this notice." msgstr "" -#: admin/customizer/layout.php:86 -msgid "Navigation shadow" +#: php/admin/preset-on-activation.php:56 +msgid "Applying the preset failed." msgstr "" -#: admin/customizer/layout.php:108 -msgid "Sidebar widget separator width" +#: php/admin/preset-on-activation.php:57 +msgid "You can choose to apply one of the presets of this theme as a starting point for your website. This will change a lot of the settings of this theme and of GeneratePress, so it is advised to do this only if you are starting fresh. This can be done later in the Customizer as well." msgstr "" -#: admin/customizer/layout.php:142 -msgid "Sidebar widget separator spacing" +#: php/admin/preset-on-activation.php:59 +msgid "Skip" msgstr "" -#: admin/customizer/layout.php:168 -msgid "Featured Posts" +#: php/admin/preset-on-activation.php:60 +msgid "Successfully applied the preset." msgstr "" -#: admin/customizer/layout.php:187 -msgid "Number of featured posts" +#: php/admin/preset-on-activation.php:61 +msgid "Theme preset selection" msgstr "" -#: admin/customizer/preset.php:37 -msgid "Preset" +#. translators: %s: Theme name. +#: php/admin/update.php:22 +msgid "The theme %s is not available for updating." msgstr "" -#: admin/customizer/site-identity.php:53 -msgid "Header Image" +#. translators: %s: Theme name. +#: php/admin/update.php:24 +msgid "The GitHub API request for updates for the theme %s has failed." msgstr "" -#: admin/customizer/site-identity.php:83 -msgid "Header Image Height" +#: php/admin/update.php:25 +msgid "Error message:" msgstr "" -#: admin/customizer/site-identity.php:116 -msgid "Header Image Top Position" +#. translators: %s: Theme name. +#: php/admin/update.php:27 +msgid "The GitHub API response for the theme %s is invalid." msgstr "" -#: admin/customizer/site-identity.php:149 -msgid "Header Image Right Position" +#. translators: %s: Theme name. +#: php/admin/update.php:29 +msgid "The latest version of the theme %s does not contain an update zip file." msgstr "" -#: admin/customizer/site-identity.php:181 -msgid "Minimum Width to Show Header Image" +#: php/admin/update.php:30 +msgid "New version" msgstr "" -#: admin/customizer/typography.php:42 -msgid "Blog" +#: php/admin/update.php:31 +msgid "No more info available." msgstr "" -#: admin/customizer/typography.php:98 -msgid "Font size" +#: php/frontend/class-title-widget.php:72 +msgid "Title Widget" msgstr "" -#: admin/customizer/controls/class-preset-customize-control.php:126 -msgid "" -"Applying the preset overrides a lot of the theme options. You can always go " -"back by closing the customizer before saving." +#: php/frontend/class-title-widget.php:72 +msgid "A widget containing the site logo, title and tagline." +msgstr "" + +#: php/functions.php:163 +msgid "CRDM - Modern theme requires at least WordPress 5.0" +msgstr "" + +#: php/functions.php:176 +msgid "CRDM - Modern theme requires at least PHP 7.0" +msgstr "" + +#: php/functions.php:188 +msgid "CRDM - Modern theme requires GeneratePress Premium" +msgstr "" + +#: php/functions.php:200 +msgid "Failed to copy CRDM - Modern theme images to WordPress Media. The theme will work fine, but you won't be able to re-select the default images outside of the theme presets." msgstr "" From 00ed78e7b0a176626040eeead9d8594660c0d4e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20D=C4=9Bdi=C4=8D?= Date: Wed, 8 Nov 2023 17:16:04 +0100 Subject: [PATCH 2/6] Updating po files with wp-cli --- gulpfile.js | 18 +- package-lock.json | 110 ----------- package.json | 1 - src/languages/crdm-modern-cs_CZ.po | 286 ++++++++++++++--------------- 4 files changed, 153 insertions(+), 262 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index f15c6e6a..44c5f67d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -8,7 +8,6 @@ const inject = require('gulp-inject-string'); const merge = require('merge-stream'); const potomo = require('gulp-potomo'); const rename = require('gulp-rename'); -const shell = require('gulp-shell'); const terser = require('gulp-terser'); const ts = require('gulp-typescript'); @@ -196,12 +195,17 @@ gulp.task( }) ); -gulp.task('update-translations:update-po', () => - gulp - .src('src/languages/*.po', { read: false }) - .pipe( - shell('msgmerge -U <%= file.path %> src/languages/crdm-modern.pot') - ) +gulp.task( + 'update-translations:update-po', + gulp.series((cb) => { + const exec = require('child_process').exec; + exec( + './vendor/bin/wp i18n update-po src/languages/crdm-modern.pot src/languages/', + (err) => { + cb(err); + } + ); + }) ); gulp.task( diff --git a/package-lock.json b/package-lock.json index 941dd4b5..7090e0bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,6 @@ "gulp-inject-string": "^1.1.2", "gulp-potomo": "^1.1.0", "gulp-rename": "^2.0.0", - "gulp-shell": "^0.8.0", "gulp-terser": "^2.1.0", "gulp-typescript": "^6.0.0-alpha.1", "merge-stream": "^2.0.0", @@ -7000,96 +6999,6 @@ "node": ">=4" } }, - "node_modules/gulp-shell": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/gulp-shell/-/gulp-shell-0.8.0.tgz", - "integrity": "sha512-wHNCgmqbWkk1c6Gc2dOL5SprcoeujQdeepICwfQRo91DIylTE7a794VEE+leq3cE2YDoiS5ulvRfKVIEMazcTQ==", - "dev": true, - "dependencies": { - "chalk": "^3.0.0", - "fancy-log": "^1.3.3", - "lodash.template": "^4.5.0", - "plugin-error": "^1.0.1", - "through2": "^3.0.1", - "tslib": "^1.10.0" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/gulp-shell/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/gulp-shell/node_modules/chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/gulp-shell/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/gulp-shell/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/gulp-shell/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/gulp-shell/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/gulp-shell/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/gulp-terser": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.1.0.tgz", @@ -8757,25 +8666,6 @@ "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==", "dev": true }, - "node_modules/lodash.template": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz", - "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", - "dev": true, - "dependencies": { - "lodash._reinterpolate": "^3.0.0", - "lodash.templatesettings": "^4.0.0" - } - }, - "node_modules/lodash.templatesettings": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz", - "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==", - "dev": true, - "dependencies": { - "lodash._reinterpolate": "^3.0.0" - } - }, "node_modules/lodash.truncate": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", diff --git a/package.json b/package.json index 46f1124f..e35f7bc4 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,6 @@ "gulp-inject-string": "^1.1.2", "gulp-potomo": "^1.1.0", "gulp-rename": "^2.0.0", - "gulp-shell": "^0.8.0", "gulp-terser": "^2.1.0", "gulp-typescript": "^6.0.0-alpha.1", "merge-stream": "^2.0.0", diff --git a/src/languages/crdm-modern-cs_CZ.po b/src/languages/crdm-modern-cs_CZ.po index 3054b3dd..5f918f66 100644 --- a/src/languages/crdm-modern-cs_CZ.po +++ b/src/languages/crdm-modern-cs_CZ.po @@ -1,227 +1,225 @@ -# Copyright (C) 2022 crdm-modern -# This file is distributed under the same license as the crdm-modern package. msgid "" msgstr "" -"Project-Id-Version: crdm-modern\n" +"Project-Id-Version: crdm-modern 1.0.4\n" "Report-Msgid-Bugs-To: https://github.com/skaut/crdm-modern/issues\n" +"Last-Translator: Marek Dědič \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Basepath: ..\n" -"X-Poedit-KeywordsList: __;_e;_ex:1,2c;_n:1,2;_n_noop:1,2;_nx:1,2,4c;" -"_nx_noop:1,2,3c;_x:1,2c;esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;" -"esc_html_e;esc_html_x:1,2c\n" -"X-Poedit-SearchPath-0: .\n" -"X-Poedit-SearchPathExcluded-0: *.js\n" -"X-Poedit-SourceCharset: UTF-8\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: functions.php:163 -msgid "CRDM - Modern theme requires at least WordPress 5.0" -msgstr "Šablona CRDM - Modern vyžaduje alespoň WordPress 5.0" - -#: functions.php:176 -msgid "CRDM - Modern theme requires at least PHP 7.0" -msgstr "Šablona CRDM - Modern vyžaduje alespoň PHP 7.0" - -#: functions.php:188 -msgid "CRDM - Modern theme requires GeneratePress Premium" -msgstr "Šablona CRDM - Modern vyžaduje premium verzi GeneratePress" - -#: functions.php:200 -msgid "" -"Failed to copy CRDM - Modern theme images to WordPress Media. The theme will " -"work fine, but you won't be able to re-select the default images outside of " -"the theme presets." -msgstr "" -"Nepodařilo se zkopírovat obrázky šablony CRDM - Modern do WordPress Médií. " -"Šablona bude fungovat v pořádku i tak, ale nebudete moct znovu použít její " -"výchozí obrázky jinak, než použitím předvolby šablony." - -#: admin/customizer.php:52 -msgid "Body" -msgstr "Tělo" - -#: admin/preset-on-activation.php:54, -#: admin/customizer/controls/class-preset-customize-control.php:129 -msgid "Apply" -msgstr "Použít" - -#: admin/preset-on-activation.php:55 -msgid "Dismiss this notice." -msgstr "Skrýt toto upozornění." - -#: admin/preset-on-activation.php:56 -msgid "Applying the preset failed." -msgstr "Použití předvolby šablony se nezdařilo." - -#: admin/preset-on-activation.php:57 -msgid "" -"You can choose to apply one of the presets of this theme as a starting point " -"for your website. This will change a lot of the settings of this theme and " -"of GeneratePress, so it is advised to do this only if you are starting " -"fresh. This can be done later in the Customizer as well." -msgstr "" -"Můžete vybrat a použít jednu z předvoleb šablony jako výchozí bod vašeho " -"webu. Použití předvolby změní velké množství nastavení této šablony a " -"šablony GeneratePress a tedy je doporučeno pouze pokud začínáte s touto " -"šablonou. Předvolby šablony jde použít i později na stránce Přizpůsobení " -"vzhledu webu." - -#: admin/preset-on-activation.php:59 -msgid "Skip" -msgstr "Přeskočit" - -#: admin/preset-on-activation.php:60 -msgid "Successfully applied the preset." -msgstr "Úspěšně použita předvolba šablony." +"POT-Creation-Date: \n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Language: cs_CZ\n" +"X-Generator: WP-CLI 2.9.0\n" +"X-Domain: crdm-modern\n" -#: admin/preset-on-activation.php:61 -msgid "Theme preset selection" -msgstr "Výběr předvolby šablony" - -#. translators: %s: Theme name. -#: admin/update.php:22 -msgid "The theme %s is not available for updating." -msgstr "Šablona %s není dostupná k aktualizaci" - -#. translators: %s: Theme name. -#: admin/update.php:24 -msgid "The GitHub API request for updates for the theme %s has failed." -msgstr "Požadavek na GitHub API pro aktualizaci šablony %s selhal." - -#: admin/update.php:25 -msgid "Error message:" -msgstr "Chybová hláška:" +#. Theme Name of the theme +msgid "CRDM - Modern" +msgstr "CRDM - Modern" -#. translators: %s: Theme name. -#: admin/update.php:27 -msgid "The GitHub API response for the theme %s is invalid." -msgstr "Odpověď GitHub API pro aktualizaci šablony %s je neplatná." +#. Theme URI of the theme +msgid "https://github.com/skaut/crdm-modern" +msgstr "https://github.com/skaut/crdm-modern" -#. translators: %s: Theme name. -#: admin/update.php:29 -msgid "The latest version of the theme %s does not contain an update zip file." -msgstr "Nejnovější verze šablony %s neobsahuje soubor zip s aktualizací." +#. Description of the theme +msgid "A modern WordPress theme made for children's organizations" +msgstr "Moderní WordPressová šablona pro organizace dětí a mládeže" -#: admin/update.php:30 -msgid "New version" -msgstr "Nová verze" +#. Author of the theme +msgid "Junák - český skaut" +msgstr "Junák - český skaut" -#: admin/update.php:31 -msgid "No more info available." -msgstr "Žádné další informace nejsou k dispozici." +#. Author URI of the theme +msgid "https://github.com/skaut" +msgstr "https://github.com/skaut" -#: frontend/class-title-widget.php:72 -msgid "Title Widget" -msgstr "Widget názvu webu" +#: php/admin/customizer.php:52 +msgid "Body" +msgstr "Tělo" -#: frontend/class-title-widget.php:72 -msgid "A widget containing the site logo, title and tagline." -msgstr "Widget obsahující logo, název a popis webu." +#: php/admin/customizer/class-preset-registry.php:85 +msgid "Blue" +msgstr "Modrá" -#: admin/customizer/class-preset-registry.php:136, -#: admin/customizer/class-preset-registry.php:436, -#: admin/customizer/class-preset-registry.php:737 +#: php/admin/customizer/class-preset-registry.php:136 +#: php/admin/customizer/class-preset-registry.php:436 +#: php/admin/customizer/class-preset-registry.php:737 msgid "Read more >" msgstr "Číst více >" -#: admin/customizer/class-preset-registry.php:85 -msgid "Blue" -msgstr "Modrá" - -#: admin/customizer/class-preset-registry.php:385 +#: php/admin/customizer/class-preset-registry.php:385 msgid "Green" msgstr "Zelená" -#: admin/customizer/class-preset-registry.php:686 +#: php/admin/customizer/class-preset-registry.php:686 msgid "Beige" msgstr "Béžová" -#: admin/customizer/colors.php:54 +#: php/admin/customizer/colors.php:54 msgid "Widget Separator" msgstr "Oddělovač widgetů" -#: admin/customizer/colors.php:78 +#: php/admin/customizer/colors.php:78 msgid "Excerpt Border" msgstr "Rámeček úryvku" -#: admin/customizer/colors.php:102 +#: php/admin/customizer/colors.php:102 msgid "Excerpt Background Hover" msgstr "Pozadí úryvku při přejetí myší" -#: admin/customizer/colors.php:126 +#: php/admin/customizer/colors.php:126 msgid "Excerpt Text Hover" msgstr "Text úryvku při přejetí myší" -#: admin/customizer/colors.php:150 +#: php/admin/customizer/colors.php:150 msgid "\"Read more\" Link" msgstr "Odkaz \"Číst více\"" -#: admin/customizer/colors.php:173 +#: php/admin/customizer/colors.php:173 msgid "\"Read more\" Link Hover" msgstr "Odkaz \"Číst více\" při přejetí myší" -#: admin/customizer/layout.php:54 +#: php/admin/customizer/controls/class-preset-customize-control.php:126 +msgid "Applying the preset overrides a lot of the theme options. You can always go back by closing the customizer before saving." +msgstr "Požitím předvolby se změní velké množství nastavení šablony. Vždy se můžete vrátit zpět zavřením přizpůsobování webu před uložením nového nastavení." + +#: php/admin/customizer/controls/class-preset-customize-control.php:129 +#: php/admin/preset-on-activation.php:54 +msgid "Apply" +msgstr "Použít" + +#: php/admin/customizer/layout.php:54 msgid "Navigation spacing" msgstr "Rozestupy navigace" -#: admin/customizer/layout.php:86 +#: php/admin/customizer/layout.php:86 msgid "Navigation shadow" msgstr "Stín navigace" -#: admin/customizer/layout.php:108 +#: php/admin/customizer/layout.php:108 msgid "Sidebar widget separator width" msgstr "Šířka oddělovače widgetů v postranním panelu" -#: admin/customizer/layout.php:142 +#: php/admin/customizer/layout.php:142 msgid "Sidebar widget separator spacing" msgstr "Rozestup oddělovače widgetů v postranním panelu" -#: admin/customizer/layout.php:168 +#: php/admin/customizer/layout.php:168 msgid "Featured Posts" msgstr "Zvýrazněné příspěvky" -#: admin/customizer/layout.php:187 +#: php/admin/customizer/layout.php:187 msgid "Number of featured posts" msgstr "Počet zvýrazněných příspěvků" -#: admin/customizer/preset.php:37 +#: php/admin/customizer/preset.php:37 msgid "Preset" msgstr "Předvolby šablony" -#: admin/customizer/site-identity.php:53 +#: php/admin/customizer/site-identity.php:53 msgid "Header Image" msgstr "Obrázek v záhlaví" -#: admin/customizer/site-identity.php:83 +#: php/admin/customizer/site-identity.php:83 msgid "Header Image Height" msgstr "Výška obrázku v záhlaví" -#: admin/customizer/site-identity.php:116 +#: php/admin/customizer/site-identity.php:116 msgid "Header Image Top Position" msgstr "Odsazení obrázku v záhlaví zeshora" -#: admin/customizer/site-identity.php:149 +#: php/admin/customizer/site-identity.php:149 msgid "Header Image Right Position" msgstr "Odsazení obrázku v záhlaví zprava" -#: admin/customizer/site-identity.php:181 +#: php/admin/customizer/site-identity.php:181 msgid "Minimum Width to Show Header Image" msgstr "Minimální šířka pro zobrazení obrázku v záhlaví" -#: admin/customizer/typography.php:42 +#: php/admin/customizer/typography.php:42 msgid "Blog" msgstr "Blog" -#: admin/customizer/typography.php:98 +#: php/admin/customizer/typography.php:98 msgid "Font size" msgstr "Velikost písma" -#: admin/customizer/controls/class-preset-customize-control.php:126 -msgid "" -"Applying the preset overrides a lot of the theme options. You can always go " -"back by closing the customizer before saving." -msgstr "" -"Požitím předvolby se změní velké množství nastavení šablony. Vždy se můžete " -"vrátit zpět zavřením přizpůsobování webu před uložením nového nastavení." +#: php/admin/preset-on-activation.php:55 +msgid "Dismiss this notice." +msgstr "Skrýt toto upozornění." + +#: php/admin/preset-on-activation.php:56 +msgid "Applying the preset failed." +msgstr "Použití předvolby šablony se nezdařilo." + +#: php/admin/preset-on-activation.php:57 +msgid "You can choose to apply one of the presets of this theme as a starting point for your website. This will change a lot of the settings of this theme and of GeneratePress, so it is advised to do this only if you are starting fresh. This can be done later in the Customizer as well." +msgstr "Můžete vybrat a použít jednu z předvoleb šablony jako výchozí bod vašeho webu. Použití předvolby změní velké množství nastavení této šablony a šablony GeneratePress a tedy je doporučeno pouze pokud začínáte s touto šablonou. Předvolby šablony jde použít i později na stránce Přizpůsobení vzhledu webu." + +#: php/admin/preset-on-activation.php:59 +msgid "Skip" +msgstr "Přeskočit" + +#: php/admin/preset-on-activation.php:60 +msgid "Successfully applied the preset." +msgstr "Úspěšně použita předvolba šablony." + +#: php/admin/preset-on-activation.php:61 +msgid "Theme preset selection" +msgstr "Výběr předvolby šablony" + +#. translators: %s: Theme name. +#: php/admin/update.php:22 +msgid "The theme %s is not available for updating." +msgstr "Šablona %s není dostupná k aktualizaci" + +#. translators: %s: Theme name. +#: php/admin/update.php:24 +msgid "The GitHub API request for updates for the theme %s has failed." +msgstr "Požadavek na GitHub API pro aktualizaci šablony %s selhal." + +#: php/admin/update.php:25 +msgid "Error message:" +msgstr "Chybová hláška:" + +#. translators: %s: Theme name. +#: php/admin/update.php:27 +msgid "The GitHub API response for the theme %s is invalid." +msgstr "Odpověď GitHub API pro aktualizaci šablony %s je neplatná." + +#. translators: %s: Theme name. +#: php/admin/update.php:29 +msgid "The latest version of the theme %s does not contain an update zip file." +msgstr "Nejnovější verze šablony %s neobsahuje soubor zip s aktualizací." + +#: php/admin/update.php:30 +msgid "New version" +msgstr "Nová verze" + +#: php/admin/update.php:31 +msgid "No more info available." +msgstr "Žádné další informace nejsou k dispozici." + +#: php/frontend/class-title-widget.php:72 +msgid "Title Widget" +msgstr "Widget názvu webu" + +#: php/frontend/class-title-widget.php:72 +msgid "A widget containing the site logo, title and tagline." +msgstr "Widget obsahující logo, název a popis webu." + +#: php/functions.php:163 +msgid "CRDM - Modern theme requires at least WordPress 5.0" +msgstr "Šablona CRDM - Modern vyžaduje alespoň WordPress 5.0" + +#: php/functions.php:176 +msgid "CRDM - Modern theme requires at least PHP 7.0" +msgstr "Šablona CRDM - Modern vyžaduje alespoň PHP 7.0" + +#: php/functions.php:188 +msgid "CRDM - Modern theme requires GeneratePress Premium" +msgstr "Šablona CRDM - Modern vyžaduje premium verzi GeneratePress" + +#: php/functions.php:200 +msgid "Failed to copy CRDM - Modern theme images to WordPress Media. The theme will work fine, but you won't be able to re-select the default images outside of the theme presets." +msgstr "Nepodařilo se zkopírovat obrázky šablony CRDM - Modern do WordPress Médií. Šablona bude fungovat v pořádku i tak, ale nebudete moct znovu použít její výchozí obrázky jinak, než použitím předvolby šablony." From 1fb249297ba83187193defc5893e2e7fd1cd7fe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20D=C4=9Bdi=C4=8D?= Date: Wed, 8 Nov 2023 17:42:10 +0100 Subject: [PATCH 3/6] Removed unneeded gulp.series --- gulpfile.js | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 44c5f67d..dee96711 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -10,6 +10,7 @@ const potomo = require('gulp-potomo'); const rename = require('gulp-rename'); const terser = require('gulp-terser'); const ts = require('gulp-typescript'); +const exec = require('child_process').exec; gulp.task('build:css:main', () => gulp @@ -182,31 +183,23 @@ gulp.task( ) ); -gulp.task( - 'update-translations:generate-pot', - gulp.series((cb) => { - const exec = require('child_process').exec; - exec( - './vendor/bin/wp i18n make-pot src/ src/languages/crdm-modern.pot --slug="crdm-modern" --headers=\'{"Report-Msgid-Bugs-To": "https://github.com/skaut/crdm-modern/issues", "POT-Creation-Date": "", "Last-Translator": "Marek Dědič ", "Language-Team": ""}\' --file-comment="Copyright (C) Junák – český skaut" --package-name="crdm-modern"', - (err) => { - cb(err); - } - ); - }) -); - -gulp.task( - 'update-translations:update-po', - gulp.series((cb) => { - const exec = require('child_process').exec; - exec( - './vendor/bin/wp i18n update-po src/languages/crdm-modern.pot src/languages/', - (err) => { - cb(err); - } - ); - }) -); +gulp.task('update-translations:generate-pot', (cb) => { + exec( + './vendor/bin/wp i18n make-pot src/ src/languages/crdm-modern.pot --slug="crdm-modern" --headers=\'{"Report-Msgid-Bugs-To": "https://github.com/skaut/crdm-modern/issues", "POT-Creation-Date": "", "Last-Translator": "Marek Dědič ", "Language-Team": ""}\' --file-comment="Copyright (C) Junák – český skaut" --package-name="crdm-modern"', + (err) => { + cb(err); + } + ); +}); + +gulp.task('update-translations:update-po', (cb) => { + exec( + './vendor/bin/wp i18n update-po src/languages/crdm-modern.pot src/languages/', + (err) => { + cb(err); + } + ); +}); gulp.task( 'update-translations', From 4322f6d286a65889025984f31077e4eb4c96d9c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20D=C4=9Bdi=C4=8D?= Date: Wed, 8 Nov 2023 17:59:02 +0100 Subject: [PATCH 4/6] Building mo files with wp-cli --- gulpfile.js | 41 ++-- package-lock.json | 533 ---------------------------------------------- package.json | 1 - 3 files changed, 28 insertions(+), 547 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index dee96711..df1dc6fb 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -6,7 +6,6 @@ const cleanCSS = require('gulp-clean-css'); const concat = require('gulp-concat'); const inject = require('gulp-inject-string'); const merge = require('merge-stream'); -const potomo = require('gulp-potomo'); const rename = require('gulp-rename'); const terser = require('gulp-terser'); const ts = require('gulp-typescript'); @@ -124,18 +123,34 @@ gulp.task('build:js', () => ) ); -gulp.task('build:mo', () => - gulp - .src('src/languages/*.po') - .pipe(potomo({ verbose: false })) - .pipe( - rename((path) => { - path.basename = path.basename.substring( - path.basename.lastIndexOf('-') + 1 - ); - }) - ) - .pipe(gulp.dest('dist/languages/')) +gulp.task( + 'build:mo', + gulp.series( + (cb) => { + exec( + './vendor/bin/wp i18n make-mo src/languages/ dist/languages/ ', + (err) => { + cb(err); + } + ); + }, + () => + gulp + .src('dist/languages/*.mo') + .pipe( + rename((path) => { + path.basename = path.basename.substring( + path.basename.lastIndexOf('-') + 1 + ); + }) + ) + .pipe(gulp.dest('dist/languages/')), + (cb) => { + exec('rm dist/languages/crdm-modern-*.mo', (err) => { + cb(err); + }); + } + ) ); gulp.task('build:php:root', () => diff --git a/package-lock.json b/package-lock.json index 7090e0bc..234850ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,6 @@ "gulp-clean-css": "^4.3.0", "gulp-concat": "^2.6.1", "gulp-inject-string": "^1.1.2", - "gulp-potomo": "^1.1.0", "gulp-rename": "^2.0.0", "gulp-terser": "^2.1.0", "gulp-typescript": "^6.0.0-alpha.1", @@ -3012,15 +3011,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/array-differ": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", - "integrity": "sha512-LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/array-each": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", @@ -3124,15 +3114,6 @@ "node": ">=8" } }, - "node_modules/array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/array-unique": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", @@ -3505,15 +3486,6 @@ "node": ">=0.10.0" } }, - "node_modules/beeper": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", - "integrity": "sha512-3vqtKL1N45I5dV0RdssXZG7X6pCqQrWPNOlBPZPrd+QkE2HEhR57Z04m0KtpbsZH73j+a3F8UD1TQnn+ExTvIA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/big-integer": { "version": "1.6.51", "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", @@ -4205,15 +4177,6 @@ "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==", "dev": true }, - "node_modules/dateformat": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz", - "integrity": "sha512-GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw==", - "dev": true, - "engines": { - "node": "*" - } - }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -4605,39 +4568,6 @@ "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", "dev": true }, - "node_modules/duplexer2": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", - "integrity": "sha512-+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==", - "dev": true, - "dependencies": { - "readable-stream": "~1.1.9" - } - }, - "node_modules/duplexer2/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", - "dev": true - }, - "node_modules/duplexer2/node_modules/readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==", - "dev": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "node_modules/duplexer2/node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==", - "dev": true - }, "node_modules/duplexify": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz", @@ -6374,51 +6304,6 @@ "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==", "dev": true }, - "node_modules/fs-extra": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", - "integrity": "sha512-UvSPKyhMn6LEd/WpUaV9C9t3zATuqoqfWc3QdPhPLb58prN9tqYPlPWi8Krxi44loBoUzlobqZ3+8tGpxxSzwA==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0", - "klaw": "^1.0.0", - "path-is-absolute": "^1.0.0", - "rimraf": "^2.2.8" - } - }, - "node_modules/fs-extra/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/fs-extra/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, "node_modules/fs-mkdirp-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", @@ -6911,85 +6796,6 @@ "plugin-error": "^1.0.1" } }, - "node_modules/gulp-potomo": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/gulp-potomo/-/gulp-potomo-1.1.0.tgz", - "integrity": "sha512-lEsFoqZkZvCoWq1vk2ykWhjejbtA5hE15asLAUeBjiL2azpqBbe2zZJW9SfPkV5+6Y45K7SagcMw92PYqgF6mQ==", - "dev": true, - "dependencies": { - "chalk": "^1.1.3", - "fs-extra": "^0.30.0", - "gulp-util": "^3.0.7", - "ramda": "^0.21.0", - "shelljs": "^0.6.0", - "through2": "^2.0.1" - } - }, - "node_modules/gulp-potomo/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-potomo/node_modules/ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-potomo/node_modules/chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==", - "dev": true, - "dependencies": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-potomo/node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-potomo/node_modules/supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/gulp-potomo/node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, "node_modules/gulp-rename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz", @@ -7075,157 +6881,6 @@ "node": ">= 8" } }, - "node_modules/gulp-util": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", - "integrity": "sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==", - "deprecated": "gulp-util is deprecated - replace it, following the guidelines at https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5", - "dev": true, - "dependencies": { - "array-differ": "^1.0.0", - "array-uniq": "^1.0.2", - "beeper": "^1.0.0", - "chalk": "^1.0.0", - "dateformat": "^2.0.0", - "fancy-log": "^1.1.0", - "gulplog": "^1.0.0", - "has-gulplog": "^0.1.0", - "lodash._reescape": "^3.0.0", - "lodash._reevaluate": "^3.0.0", - "lodash._reinterpolate": "^3.0.0", - "lodash.template": "^3.0.0", - "minimist": "^1.1.0", - "multipipe": "^0.1.2", - "object-assign": "^3.0.0", - "replace-ext": "0.0.1", - "through2": "^2.0.0", - "vinyl": "^0.5.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/gulp-util/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-util/node_modules/ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-util/node_modules/chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==", - "dev": true, - "dependencies": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-util/node_modules/clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", - "dev": true, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/gulp-util/node_modules/clone-stats": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", - "integrity": "sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==", - "dev": true - }, - "node_modules/gulp-util/node_modules/lodash.template": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", - "integrity": "sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==", - "dev": true, - "dependencies": { - "lodash._basecopy": "^3.0.0", - "lodash._basetostring": "^3.0.0", - "lodash._basevalues": "^3.0.0", - "lodash._isiterateecall": "^3.0.0", - "lodash._reinterpolate": "^3.0.0", - "lodash.escape": "^3.0.0", - "lodash.keys": "^3.0.0", - "lodash.restparam": "^3.0.0", - "lodash.templatesettings": "^3.0.0" - } - }, - "node_modules/gulp-util/node_modules/lodash.templatesettings": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", - "integrity": "sha512-TcrlEr31tDYnWkHFWDCV3dHYroKEXpJZ2YJYvJdhN+y4AkWMDZ5I4I8XDtUKqSAyG81N7w+I1mFEJtcED+tGqQ==", - "dev": true, - "dependencies": { - "lodash._reinterpolate": "^3.0.0", - "lodash.escape": "^3.0.0" - } - }, - "node_modules/gulp-util/node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-util/node_modules/supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==", - "dev": true, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/gulp-util/node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "node_modules/gulp-util/node_modules/vinyl": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", - "integrity": "sha512-P5zdf3WB9uzr7IFoVQ2wZTmUwHL8cMZWJGzLBNCHNZ3NB6HTMsYABtt7z8tAGIINLXyAob9B9a1yzVGMFOYKEA==", - "dev": true, - "dependencies": { - "clone": "^1.0.0", - "clone-stats": "^0.0.1", - "replace-ext": "0.0.1" - }, - "engines": { - "node": ">= 0.9" - } - }, "node_modules/gulplog": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", @@ -7259,27 +6914,6 @@ "node": ">= 0.4.0" } }, - "node_modules/has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==", - "dev": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-ansi/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/has-bigints": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", @@ -7298,18 +6932,6 @@ "node": ">=4" } }, - "node_modules/has-gulplog": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", - "integrity": "sha512-+F4GzLjwHNNDEAJW2DC1xXfEoPkRDmUdJ7CBYw4MpqtDwOnqdImJl7GWlpqx+Wko6//J8uKTnIe4wZSv7yCqmw==", - "dev": true, - "dependencies": { - "sparkles": "^1.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/has-property-descriptors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", @@ -8286,15 +7908,6 @@ "node": ">=6" } }, - "node_modules/jsonfile": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", - "integrity": "sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==", - "dev": true, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, "node_modules/jsx-ast-utils": { "version": "3.3.5", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", @@ -8334,15 +7947,6 @@ "node": ">=0.10.0" } }, - "node_modules/klaw": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", - "integrity": "sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==", - "dev": true, - "optionalDependencies": { - "graceful-fs": "^4.1.9" - } - }, "node_modules/known-css-properties": { "version": "0.26.0", "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz", @@ -8556,98 +8160,12 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "node_modules/lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==", - "dev": true - }, - "node_modules/lodash._basetostring": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", - "integrity": "sha512-mTzAr1aNAv/i7W43vOR/uD/aJ4ngbtsRaCubp2BfZhlGU/eORUjg/7F6X0orNMdv33JOrdgGybtvMN/po3EWrA==", - "dev": true - }, - "node_modules/lodash._basevalues": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", - "integrity": "sha512-H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg==", - "dev": true - }, - "node_modules/lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==", - "dev": true - }, - "node_modules/lodash._isiterateecall": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==", - "dev": true - }, - "node_modules/lodash._reescape": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", - "integrity": "sha512-Sjlavm5y+FUVIF3vF3B75GyXrzsfYV8Dlv3L4mEpuB9leg8N6yf/7rU06iLPx9fY0Mv3khVp9p7Dx0mGV6V5OQ==", - "dev": true - }, - "node_modules/lodash._reevaluate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", - "integrity": "sha512-OrPwdDc65iJiBeUe5n/LIjd7Viy99bKwDdk7Z5ljfZg0uFRFlfQaCy9tZ4YMAag9WAZmlVpe1iZrkIMMSMHD3w==", - "dev": true - }, - "node_modules/lodash._reinterpolate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==", - "dev": true - }, - "node_modules/lodash._root": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", - "integrity": "sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ==", - "dev": true - }, "node_modules/lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", "dev": true }, - "node_modules/lodash.escape": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", - "integrity": "sha512-n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ==", - "dev": true, - "dependencies": { - "lodash._root": "^3.0.0" - } - }, - "node_modules/lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==", - "dev": true - }, - "node_modules/lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==", - "dev": true - }, - "node_modules/lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==", - "dev": true, - "dependencies": { - "lodash._getnative": "^3.0.0", - "lodash.isarguments": "^3.0.0", - "lodash.isarray": "^3.0.0" - } - }, "node_modules/lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -8660,12 +8178,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "node_modules/lodash.restparam": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", - "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==", - "dev": true - }, "node_modules/lodash.truncate": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", @@ -9248,15 +8760,6 @@ "node": ">=8" } }, - "node_modules/multipipe": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", - "integrity": "sha512-7ZxrUybYv9NonoXgwoOqtStIu18D1c3eFZj27hqgf5kBrBF8Q+tE8V0MW8dKM5QLkQPh1JhhbKgHLY9kifov4Q==", - "dev": true, - "dependencies": { - "duplexer2": "0.0.2" - } - }, "node_modules/mute-stdout": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz", @@ -9597,15 +9100,6 @@ "node": ">=0.10.0" } }, - "node_modules/object-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/object-copy": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", @@ -10464,12 +9958,6 @@ "node": ">=8" } }, - "node_modules/ramda": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.21.0.tgz", - "integrity": "sha512-HGd5aczYKQXGILB+abY290V7Xz62eFajpa6AtMdwEmQSakJmgSO7ks4eI3HdR34j+X2Vz4Thp9VAJbrCAMbO2w==", - "dev": true - }, "node_modules/react": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", @@ -11010,15 +10498,6 @@ "node": ">=0.10" } }, - "node_modules/replace-ext": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", - "integrity": "sha512-AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/replace-homedir": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz", @@ -11445,18 +10924,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/shelljs": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.6.1.tgz", - "integrity": "sha512-B1vvzXQlJ77SURr3SIUQ/afh+LwecDKAVKE1wqkBlr2PCHoZDaF6MFD+YX1u9ddQjR4z2CKx1tdqvS2Xfs5h1A==", - "dev": true, - "bin": { - "shjs": "bin/shjs" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", diff --git a/package.json b/package.json index e35f7bc4..161c8242 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,6 @@ "gulp-clean-css": "^4.3.0", "gulp-concat": "^2.6.1", "gulp-inject-string": "^1.1.2", - "gulp-potomo": "^1.1.0", "gulp-rename": "^2.0.0", "gulp-terser": "^2.1.0", "gulp-typescript": "^6.0.0-alpha.1", From afbabdb56567f7f220f4f2f8d8b1727249b08da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20D=C4=9Bdi=C4=8D?= Date: Wed, 8 Nov 2023 18:00:10 +0100 Subject: [PATCH 5/6] Installing composer dependencies instead of gettext in CI --- .github/workflows/CI.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index bc85d162..8121a717 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -14,9 +14,19 @@ jobs: - name: "Checkout" uses: actions/checkout@v4 - - name: "Install gettext" + - name: "Cache Composer dependencies" + uses: actions/cache@v3 + with: + path: "~/.composer/cache" + key: composer-dependencies-${{ runner.os }}-${{ env.cache-version }}-${{ hashFiles('composer.json') }} + restore-keys: | + composer-dependencies-${{ runner.os }}-${{ env.cache-version }}-${{ hashFiles('composer.json') }} + composer-dependencies-${{ runner.os }}-${{ env.cache-version }}- + composer-dependencies-${{ runner.os }}- + + - name: "Install Composer dependencies" run: | - sudo apt-get install gettext + composer install -n --prefer-dist - name: "Cache NPM dependencies" uses: actions/cache@v3 @@ -47,10 +57,6 @@ jobs: - name: "Checkout" uses: actions/checkout@v4 - - name: "Install gettext" - run: | - sudo apt-get install gettext - - name: "Setup PHP" uses: shivammathur/setup-php@v2 with: From 9b7dc1eeefaf7ce6c7d12c463a3b551a39219643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20D=C4=9Bdi=C4=8D?= Date: Thu, 9 Nov 2023 09:51:31 +0100 Subject: [PATCH 6/6] Renamed po files to not include slug --- gulpfile.js | 35 ++++--------------- .../{crdm-modern-cs_CZ.po => cs_CZ.po} | 0 2 files changed, 7 insertions(+), 28 deletions(-) rename src/languages/{crdm-modern-cs_CZ.po => cs_CZ.po} (100%) diff --git a/gulpfile.js b/gulpfile.js index df1dc6fb..b68e3a76 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -123,35 +123,14 @@ gulp.task('build:js', () => ) ); -gulp.task( - 'build:mo', - gulp.series( - (cb) => { - exec( - './vendor/bin/wp i18n make-mo src/languages/ dist/languages/ ', - (err) => { - cb(err); - } - ); - }, - () => - gulp - .src('dist/languages/*.mo') - .pipe( - rename((path) => { - path.basename = path.basename.substring( - path.basename.lastIndexOf('-') + 1 - ); - }) - ) - .pipe(gulp.dest('dist/languages/')), - (cb) => { - exec('rm dist/languages/crdm-modern-*.mo', (err) => { - cb(err); - }); +gulp.task('build:mo', (cb) => { + exec( + './vendor/bin/wp i18n make-mo src/languages/ dist/languages/ ', + (err) => { + cb(err); } - ) -); + ); +}); gulp.task('build:php:root', () => gulp.src('src/php/*.php').pipe(gulp.dest('dist/')) diff --git a/src/languages/crdm-modern-cs_CZ.po b/src/languages/cs_CZ.po similarity index 100% rename from src/languages/crdm-modern-cs_CZ.po rename to src/languages/cs_CZ.po