From 739b211afb165417ff4e325ae83bae6d6bd5e9e7 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 18 Nov 2020 12:56:01 +1300 Subject: [PATCH 1/2] ENH Update translations --- lang/cs_CZ.yml | 17 +++++++++++++++++ lang/eo.yml | 14 ++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 lang/cs_CZ.yml diff --git a/lang/cs_CZ.yml b/lang/cs_CZ.yml new file mode 100644 index 0000000..9357285 --- /dev/null +++ b/lang/cs_CZ.yml @@ -0,0 +1,17 @@ +cs_CZ: + CommentInterface: + COMMENT_MESSAGE_REQUIRED: 'Prosím vložte Váš komentář' + COMMENT_MESSAGE_URL: 'Prosím zadejte platnou URL adresu' + EMAILADDRESS_MESSAGE_EMAIL: 'Prosím zadejte platnou emailovou adresu' + EMAILADDRESS_MESSAGE_REQUIRED: 'Prosím zadejte Vaší emailovou adresu' + PREVIEW: Náhled + PREVIEWLABEL: Náhled + YOURNAME: 'Vaše jméno' + YOURNAME_MESSAGE_REQUIRED: 'Prosím zadejte Vaše jméno' + Comments: + COMMENTSREQUIRELOGIN: 'Vyžadováno přihlášení pro komentování' + CommentsAdmin: + NewComments: Nový + SpamComments: Spam + CommentsInterface_singlecomment_ss: + ISNTSPAM: 'Není spam' diff --git a/lang/eo.yml b/lang/eo.yml index 1c88c26..c54dc56 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -18,6 +18,10 @@ eo: CommentsInterface_pendingcomment_ss: AWAITINGMODERATION: 'Via komento afiŝiĝis kaj nun atendas kontrolon.' CommentsInterface_singlecomment_ss: + APPROVE: 'Aprobi ĝin' + ISNTSPAM: 'Ne spamo' + ISSPAM: 'Trakti kiel spamon' + REMCOM: 'Malakcepti ĝin' REPLYTO: 'Respondi al' CommentsInterface_ss: AWAITINGMODERATION: 'Via komento afiŝiĝis kaj nun atendas kontrolon.' @@ -46,9 +50,17 @@ eo: COMMENTAPPROVED: 'Komento aprobita.' COMMENTMARKEDSPAM: 'Markis komenton kiel spamon' SPAM: Spamo + SilverStripe\Comments\Admin\CommentsGridFieldApproveAction: + APPROVE: Aprobi + COMMENTAPPROVED: 'Komento aprobita.' + SilverStripe\Comments\Admin\CommentsGridFieldBulkAction\CommentHandler: + CHANGES_APPLIED: 'Aplikis la ŝanĝojn' SilverStripe\Comments\Admin\CommentsGridFieldConfig: APPROVE: Aprobi SPAM: Spamo + SilverStripe\Comments\Admin\CommentsGridFieldSpamAction: + COMMENTMARKEDSPAM: 'Markis komenton kiel spamon' + SPAM: Spamo SilverStripe\Comments\Controllers\CommentingController: COMMENTS: Komentoj EMAILADDRESS: 'Via retadreso (ne publikiĝos)' @@ -63,12 +75,14 @@ eo: MODERATIONREQUIRED_NONMEMBERSONLY: 'Kontroli nur nemembrojn' MODERATIONREQUIRED_REQUIRED: 'Kontroli ĉiujn komentojn' SilverStripe\Comments\Model\Comment: + ALLOWCOMMENTS: 'Ebligi komentojn' COMMENT: Komento COMMENTBY: 'Komento de %s' CREATED: 'Dato de afiŝo' EMAIL: Retpoŝto ISSPAM: 'Ĉu spamo?' MODERATED: 'Ĉu kontrolata?' + NAME: 'Nomo de aŭtoro' 'ON': en OPTIONS: Agordoj OPTION_DESCRIPTION: 'Ne vidigos nekontrolitajn aŭ spamajn komentojn antaŭ aprobo' From c065d0c5de983346ca2a2db7df194d42d5887dc2 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 1 Dec 2020 20:34:24 +1300 Subject: [PATCH 2/2] MNT Travis shared config, use sminnee/phpunit --- .travis.yml | 41 +++-------------------------------------- composer.json | 2 +- phpcs.xml.dist | 3 +++ 3 files changed, 7 insertions(+), 39 deletions(-) diff --git a/.travis.yml b/.travis.yml index e211979..c244c3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,39 +1,4 @@ -language: php -dist: trusty +version: ~> 1.0 -matrix: - include: - - php: 5.6 - env: DB=MYSQL INSTALLER_VERSION=4.2.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 - - php: 7.0 - env: DB=PGSQL INSTALLER_VERSION=4.2.x-dev PHPUNIT_TEST=1 - - php: 7.1 - env: DB=MYSQL INSTALLER_VERSION=4.3.x-dev PHPUNIT_COVERAGE_TEST=1 - - php: 7.2 - env: DB=MYSQL INSTALLER_VERSION=4.3.x-dev PHPUNIT_TEST=1 - - php: 7.3 - env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1 NPM_TEST=1 - - php: 7.3 - env: DB=MYSQL INSTALLER_VERSION=4.5.x-dev PHPUNIT_TEST=1 - - php: 7.3 - env: DB=MYSQL INSTALLER_VERSION=4.x-dev PHPUNIT_TEST=1 - -before_script: - - phpenv rehash - - phpenv config-rm xdebug.ini - - composer validate - - composer require silverstripe/installer:"$INSTALLER_VERSION" ezyang/htmlpurifier:* --no-update - - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.2.x-dev; fi - - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile - - if [[ $NPM_TEST ]]; then nvm install $TRAVIS_NODE_VERSION && nvm use $TRAVIS_NODE_VERSION && npm install -g yarn && yarn install --network-concurrency 1 && yarn run build; fi - -script: - - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi - - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi - - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/ *.php; fi - - if [[ $NPM_TEST ]]; then git diff-files --quiet -w --relative=client; fi - - if [[ $NPM_TEST ]]; then git diff -w --no-color --relative=client; fi - - if [[ $NPM_TEST ]]; then yarn run lint; fi - -after_success: - - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi +import: + - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml diff --git a/composer.json b/composer.json index 2f75049..769e9ee 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "silverstripe/cms": "The SilverStripe Content Management System" }, "require-dev": { - "phpunit/phpunit": "^5.7", + "sminnee/phpunit": "^5.7", "squizlabs/php_codesniffer": "^3.0" }, "extra": { diff --git a/phpcs.xml.dist b/phpcs.xml.dist index d834f9a..9c1b121 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -2,6 +2,9 @@ CodeSniffer ruleset for SilverStripe coding conventions. + src + tests +