From 2a36be9bedc33596f06db40b18aefb16e57406c8 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Fri, 15 Jun 2018 15:29:59 +1200 Subject: [PATCH 1/2] Remove obsolete branch-alias --- composer.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 6cd5c8fd..c0287b85 100644 --- a/composer.json +++ b/composer.json @@ -31,10 +31,6 @@ "phpunit/phpunit": "^5.7" }, "extra": { - "branch-alias": { - "4.x-dev": "4.2.x-dev", - "dev-master": "5.x-dev" - }, "expose": [ "javascript" ] @@ -51,4 +47,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} +} \ No newline at end of file From 75dfeb2b471bafccc319adf0ef118c3c75443177 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Fri, 15 Jun 2018 15:39:16 +1200 Subject: [PATCH 2/2] Update translations --- lang/sv.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 lang/sv.yml diff --git a/lang/sv.yml b/lang/sv.yml new file mode 100644 index 00000000..ce219356 --- /dev/null +++ b/lang/sv.yml @@ -0,0 +1,7 @@ +sv: + SilverStripe\Reports\ReportAdmin: + MENUTITLE: Rapporter + ReportTitle: Titel + SilverStripe\Reports\SideReport: + OtherGroupTitle: Annat + REPEMPTY: 'Rapporten {title} är tom.'