Merge remote-tracking branch 'origin/4.0'

2017-07-04 09:19:35 +12:00 · 2017-07-04 09:19:35 +12:00 · 894663ad37
parent e532d01821 fdbd6015d8
commit 894663ad37
9 changed files with 92 additions and 43 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -6,7 +6,7 @@ language: php

 env:
  global:
-    - COMPOSER_ROOT_VERSION=1.0.x-dev
+    - COMPOSER_ROOT_VERSION=4.0.x-dev
    - CORE_RELEASE=master

 matrix:
--- a/composer.json
+++ b/composer.json
@ -1,45 +1,45 @@
 {
-  "name": "silverstripe/reports",
-  "type": "silverstripe-module",
-  "description": "Reports module for SilverStripe CMS",
-  "homepage": "http://silverstripe.org",
-  "license": "BSD-3-Clause",
-  "keywords": ["silverstripe", "cms", "reports"],
-  "authors": [
-    {
-      "name": "SilverStripe",
-      "homepage": "http://silverstripe.com"
+    "name": "silverstripe/reports",
+    "type": "silverstripe-module",
+    "description": "Reports module for SilverStripe CMS",
+    "homepage": "http://silverstripe.org",
+    "license": "BSD-3-Clause",
+    "keywords": [
+        "silverstripe",
+        "cms",
+        "reports"
+    ],
+    "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"
    },
-    {
-      "name": "The SilverStripe Community",
-      "homepage": "http://silverstripe.org"
-    }
-  ],
-  "require": {
-    "silverstripe/framework": "4.0.x-dev",
-    "silverstripe/admin": "1.0.x-dev",
-    "silverstripe/versioned": "1.0.x-dev",
-    "silverstripe/config": "1.0.x-dev",
-    "silverstripe/assets": "1.0.x-dev"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "^5.7"
-  },
-  "extra": {
-    "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
+    "require-dev": {
+        "phpunit/phpunit": "^5.7"
+    },
+    "extra": [],
+    "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
 }
--- a/lang/bg.yml
+++ b/lang/bg.yml
@ -0,0 +1,7 @@
+bg:
+  SilverStripe\Reports\ReportAdmin:
+    MENUTITLE: Отчети
+    ReportTitle: Заглавие
+  SilverStripe\Reports\SideReport:
+    OtherGroupTitle: Други
+    REPEMPTY: 'Отчетът за {title} е празен.'
--- a/lang/cs.yml
+++ b/lang/cs.yml
@ -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ý.'
--- a/lang/de.yml
+++ b/lang/de.yml
@ -0,0 +1,7 @@
+de:
+  SilverStripe\Reports\ReportAdmin:
+    MENUTITLE: Berichte
+    ReportTitle: Titel
+  SilverStripe\Reports\SideReport:
+    OtherGroupTitle: Andere
+    REPEMPTY: 'Der Bericht {title} ist leer.'
--- a/lang/eo.yml
+++ b/lang/eo.yml
@ -0,0 +1,7 @@
+eo:
+  SilverStripe\Reports\ReportAdmin:
+    MENUTITLE: Raportoj
+    ReportTitle: Titoloj
+  SilverStripe\Reports\SideReport:
+    OtherGroupTitle: Aliaj
+    REPEMPTY: 'La raporto {title} estas malplena.'
--- a/lang/it.yml
+++ b/lang/it.yml
@ -0,0 +1,7 @@
+it:
+  SilverStripe\Reports\ReportAdmin:
+    MENUTITLE: Rapporti
+    ReportTitle: Titolo
+  SilverStripe\Reports\SideReport:
+    OtherGroupTitle: Altro
+    REPEMPTY: 'Il rapporto {title} è vuoto.'
--- a/lang/ru.yml
+++ b/lang/ru.yml
@ -0,0 +1,7 @@
+ru:
+  SilverStripe\Reports\ReportAdmin:
+    MENUTITLE: Отчёты
+    ReportTitle: Заголовок
+  SilverStripe\Reports\SideReport:
+    OtherGroupTitle: Другое
+    REPEMPTY: 'Отчёт {title} пустой.'
--- a/lang/sk.yml
+++ b/lang/sk.yml
@ -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.'