Merge branch '3.4' into 3
This commit is contained in:
commit
668f90d2f9
41
.travis.yml
41
.travis.yml
|
@ -1,39 +1,4 @@
|
||||||
language: php
|
version: ~> 1.0
|
||||||
dist: trusty
|
|
||||||
|
|
||||||
matrix:
|
import:
|
||||||
include:
|
- silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml
|
||||||
- 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
|
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
"silverstripe/cms": "The SilverStripe Content Management System"
|
"silverstripe/cms": "The SilverStripe Content Management System"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^5.7",
|
"sminnee/phpunit": "^5.7",
|
||||||
"squizlabs/php_codesniffer": "^3.0"
|
"squizlabs/php_codesniffer": "^3.0"
|
||||||
},
|
},
|
||||||
"extra": {
|
"extra": {
|
||||||
|
|
|
@ -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'
|
14
lang/eo.yml
14
lang/eo.yml
|
@ -18,6 +18,10 @@ eo:
|
||||||
CommentsInterface_pendingcomment_ss:
|
CommentsInterface_pendingcomment_ss:
|
||||||
AWAITINGMODERATION: 'Via komento afiŝiĝis kaj nun atendas kontrolon.'
|
AWAITINGMODERATION: 'Via komento afiŝiĝis kaj nun atendas kontrolon.'
|
||||||
CommentsInterface_singlecomment_ss:
|
CommentsInterface_singlecomment_ss:
|
||||||
|
APPROVE: 'Aprobi ĝin'
|
||||||
|
ISNTSPAM: 'Ne spamo'
|
||||||
|
ISSPAM: 'Trakti kiel spamon'
|
||||||
|
REMCOM: 'Malakcepti ĝin'
|
||||||
REPLYTO: 'Respondi al'
|
REPLYTO: 'Respondi al'
|
||||||
CommentsInterface_ss:
|
CommentsInterface_ss:
|
||||||
AWAITINGMODERATION: 'Via komento afiŝiĝis kaj nun atendas kontrolon.'
|
AWAITINGMODERATION: 'Via komento afiŝiĝis kaj nun atendas kontrolon.'
|
||||||
|
@ -46,9 +50,17 @@ eo:
|
||||||
COMMENTAPPROVED: 'Komento aprobita.'
|
COMMENTAPPROVED: 'Komento aprobita.'
|
||||||
COMMENTMARKEDSPAM: 'Markis komenton kiel spamon'
|
COMMENTMARKEDSPAM: 'Markis komenton kiel spamon'
|
||||||
SPAM: Spamo
|
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:
|
SilverStripe\Comments\Admin\CommentsGridFieldConfig:
|
||||||
APPROVE: Aprobi
|
APPROVE: Aprobi
|
||||||
SPAM: Spamo
|
SPAM: Spamo
|
||||||
|
SilverStripe\Comments\Admin\CommentsGridFieldSpamAction:
|
||||||
|
COMMENTMARKEDSPAM: 'Markis komenton kiel spamon'
|
||||||
|
SPAM: Spamo
|
||||||
SilverStripe\Comments\Controllers\CommentingController:
|
SilverStripe\Comments\Controllers\CommentingController:
|
||||||
COMMENTS: Komentoj
|
COMMENTS: Komentoj
|
||||||
EMAILADDRESS: 'Via retadreso (ne publikiĝos)'
|
EMAILADDRESS: 'Via retadreso (ne publikiĝos)'
|
||||||
|
@ -63,12 +75,14 @@ eo:
|
||||||
MODERATIONREQUIRED_NONMEMBERSONLY: 'Kontroli nur nemembrojn'
|
MODERATIONREQUIRED_NONMEMBERSONLY: 'Kontroli nur nemembrojn'
|
||||||
MODERATIONREQUIRED_REQUIRED: 'Kontroli ĉiujn komentojn'
|
MODERATIONREQUIRED_REQUIRED: 'Kontroli ĉiujn komentojn'
|
||||||
SilverStripe\Comments\Model\Comment:
|
SilverStripe\Comments\Model\Comment:
|
||||||
|
ALLOWCOMMENTS: 'Ebligi komentojn'
|
||||||
COMMENT: Komento
|
COMMENT: Komento
|
||||||
COMMENTBY: 'Komento de %s'
|
COMMENTBY: 'Komento de %s'
|
||||||
CREATED: 'Dato de afiŝo'
|
CREATED: 'Dato de afiŝo'
|
||||||
EMAIL: Retpoŝto
|
EMAIL: Retpoŝto
|
||||||
ISSPAM: 'Ĉu spamo?'
|
ISSPAM: 'Ĉu spamo?'
|
||||||
MODERATED: 'Ĉu kontrolata?'
|
MODERATED: 'Ĉu kontrolata?'
|
||||||
|
NAME: 'Nomo de aŭtoro'
|
||||||
'ON': en
|
'ON': en
|
||||||
OPTIONS: Agordoj
|
OPTIONS: Agordoj
|
||||||
OPTION_DESCRIPTION: 'Ne vidigos nekontrolitajn aŭ spamajn komentojn antaŭ aprobo'
|
OPTION_DESCRIPTION: 'Ne vidigos nekontrolitajn aŭ spamajn komentojn antaŭ aprobo'
|
||||||
|
|
|
@ -2,6 +2,9 @@
|
||||||
<ruleset name="SilverStripe">
|
<ruleset name="SilverStripe">
|
||||||
<description>CodeSniffer ruleset for SilverStripe coding conventions.</description>
|
<description>CodeSniffer ruleset for SilverStripe coding conventions.</description>
|
||||||
|
|
||||||
|
<file>src</file>
|
||||||
|
<file>tests</file>
|
||||||
|
|
||||||
<!-- base rules are PSR-2 -->
|
<!-- base rules are PSR-2 -->
|
||||||
<rule ref="PSR2" >
|
<rule ref="PSR2" >
|
||||||
<!-- Current exclusions -->
|
<!-- Current exclusions -->
|
||||||
|
|
Loading…
Reference in New Issue