Merge remote-tracking branch 'origin/4.0'

This commit is contained in:
Damian Mooyman 2017-07-04 09:19:35 +12:00
commit 894663ad37
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
9 changed files with 92 additions and 43 deletions

View File

@ -6,7 +6,7 @@ language: php
env: env:
global: global:
- COMPOSER_ROOT_VERSION=1.0.x-dev - COMPOSER_ROOT_VERSION=4.0.x-dev
- CORE_RELEASE=master - CORE_RELEASE=master
matrix: matrix:

View File

@ -1,45 +1,45 @@
{ {
"name": "silverstripe/reports", "name": "silverstripe/reports",
"type": "silverstripe-module", "type": "silverstripe-module",
"description": "Reports module for SilverStripe CMS", "description": "Reports module for SilverStripe CMS",
"homepage": "http://silverstripe.org", "homepage": "http://silverstripe.org",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"keywords": ["silverstripe", "cms", "reports"], "keywords": [
"authors": [ "silverstripe",
{ "cms",
"name": "SilverStripe", "reports"
"homepage": "http://silverstripe.com" ],
"authors": [
{
"name": "SilverStripe",
"homepage": "http://silverstripe.com"
},
{
"name": "The SilverStripe Community",
"homepage": "http://silverstripe.org"
}
],
"require": {
"silverstripe/framework": "^4.0@dev",
"silverstripe/admin": "^1.0@dev",
"silverstripe/versioned": "^1.0@dev",
"silverstripe/config": "^1.0@dev",
"silverstripe/assets": "^1.0@dev"
}, },
{ "require-dev": {
"name": "The SilverStripe Community", "phpunit/phpunit": "^5.7"
"homepage": "http://silverstripe.org" },
} "extra": [],
], "autoload": {
"require": { "psr-4": {
"silverstripe/framework": "4.0.x-dev", "SilverStripe\\Reports\\": "code/",
"silverstripe/admin": "1.0.x-dev", "SilverStripe\\Reports\\Tests\\": "tests/"
"silverstripe/versioned": "1.0.x-dev", }
"silverstripe/config": "1.0.x-dev", },
"silverstripe/assets": "1.0.x-dev" "scripts": {
}, "lint": "phpcs code/ tests/",
"require-dev": { "lint-clean": "phpcbf code/ tests/"
"phpunit/phpunit": "^5.7" },
}, "minimum-stability": "dev",
"extra": { "prefer-stable": true
"branch-alias": {
"dev-master": "4.0.x-dev"
}
},
"autoload": {
"psr-4": {
"SilverStripe\\Reports\\": "code/",
"SilverStripe\\Reports\\Tests\\": "tests/"
}
},
"scripts": {
"lint": "phpcs code/ tests/",
"lint-clean": "phpcbf code/ tests/"
},
"minimum-stability": "dev",
"prefer-stable": true
} }

7
lang/bg.yml Normal file
View File

@ -0,0 +1,7 @@
bg:
SilverStripe\Reports\ReportAdmin:
MENUTITLE: Отчети
ReportTitle: Заглавие
SilverStripe\Reports\SideReport:
OtherGroupTitle: Други
REPEMPTY: 'Отчетът за {title} е празен.'

7
lang/cs.yml Normal file
View File

@ -0,0 +1,7 @@
cs:
SilverStripe\Reports\ReportAdmin:
MENUTITLE: Výkazy
ReportTitle: Titulek
SilverStripe\Reports\SideReport:
OtherGroupTitle: Jiné
REPEMPTY: 'Výkaz {title} je prázdný.'

7
lang/de.yml Normal file
View File

@ -0,0 +1,7 @@
de:
SilverStripe\Reports\ReportAdmin:
MENUTITLE: Berichte
ReportTitle: Titel
SilverStripe\Reports\SideReport:
OtherGroupTitle: Andere
REPEMPTY: 'Der Bericht {title} ist leer.'

7
lang/eo.yml Normal file
View File

@ -0,0 +1,7 @@
eo:
SilverStripe\Reports\ReportAdmin:
MENUTITLE: Raportoj
ReportTitle: Titoloj
SilverStripe\Reports\SideReport:
OtherGroupTitle: Aliaj
REPEMPTY: 'La raporto {title} estas malplena.'

7
lang/it.yml Normal file
View File

@ -0,0 +1,7 @@
it:
SilverStripe\Reports\ReportAdmin:
MENUTITLE: Rapporti
ReportTitle: Titolo
SilverStripe\Reports\SideReport:
OtherGroupTitle: Altro
REPEMPTY: 'Il rapporto {title} è vuoto.'

7
lang/ru.yml Normal file
View File

@ -0,0 +1,7 @@
ru:
SilverStripe\Reports\ReportAdmin:
MENUTITLE: Отчёты
ReportTitle: Заголовок
SilverStripe\Reports\SideReport:
OtherGroupTitle: Другое
REPEMPTY: 'Отчёт {title} пустой.'

7
lang/sk.yml Normal file
View File

@ -0,0 +1,7 @@
sk:
SilverStripe\Reports\ReportAdmin:
MENUTITLE: Výkazy
ReportTitle: Titulok
SilverStripe\Reports\SideReport:
OtherGroupTitle: Iné
REPEMPTY: 'Výkaz {title} je prázdny.'