From 09169709510308e94b3419889bf253dc2c1fda76 Mon Sep 17 00:00:00 2001 From: Raissa North Date: Mon, 18 Dec 2017 16:26:05 +1300 Subject: [PATCH 1/5] ENHANCEMENT Add codesniffer ruleset --- phpcs.xml.dist | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 phpcs.xml.dist diff --git a/phpcs.xml.dist b/phpcs.xml.dist new file mode 100644 index 0000000..0be077b --- /dev/null +++ b/phpcs.xml.dist @@ -0,0 +1,9 @@ + + + CodeSniffer ruleset for SilverStripe coding conventions. + + + + + + From 285b46fafb986da163faf92eec99db4bb67ad5ca Mon Sep 17 00:00:00 2001 From: Raissa North Date: Mon, 18 Dec 2017 16:30:49 +1300 Subject: [PATCH 2/5] FIX Add and optimise namespaces --- lang/en.yml | 10 +++++----- src/Controllers/WidgetController.php | 2 -- src/Model/Widget.php | 1 - src/Model/WidgetArea.php | 1 - tests/WidgetAreaEditorTest.php | 5 +---- tests/WidgetControllerTest.php | 8 +------- tests/WidgetControllerTest/TestWidgetController.php | 2 +- 7 files changed, 8 insertions(+), 21 deletions(-) diff --git a/lang/en.yml b/lang/en.yml index 4d96be6..d42321f 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -1,19 +1,19 @@ en: - Widget: + SilverStripe\Widgets\Model\Widget: PLURALNAME: Widgets SINGULARNAME: Widget - WidgetArea: + SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'Widget Areas' SINGULARNAME: 'Widget Area' - WidgetAreaEditor_ss: + SilverStripe\Widgets\Templates\SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 'Available Widgets' AVAILWIDGETS: 'Click a widget title below to use it on this page.' INUSE: 'Widgets currently used' NOAVAIL: 'There are currently no widgets available.' TOSORT: 'To sort currently used widgets on this page, drag them up and down.' - WidgetDescription_ss: + SilverStripe\Widgets\Templates\WidgetDescription_ss: CLICKTOADDWIDGET: 'Click to add this widget' - WidgetEditor_ss: + SilverStripe\Widgets\Templates\WidgetEditor_ss: DELETE: Delete WidgetPageExtension: INHERITSIDEBAR: 'Inherit Sidebar From Parent' diff --git a/src/Controllers/WidgetController.php b/src/Controllers/WidgetController.php index be09e7a..0dbc6aa 100644 --- a/src/Controllers/WidgetController.php +++ b/src/Controllers/WidgetController.php @@ -6,8 +6,6 @@ use SilverStripe\Admin\LeftAndMain; use SilverStripe\Control\Controller; use SilverStripe\Control\Director; use SilverStripe\Core\ClassInfo; -use SilverStripe\i18n\i18n; -use SilverStripe\Security\Member; use SilverStripe\Widgets\Model\Widget; /** diff --git a/src/Model/Widget.php b/src/Model/Widget.php index 210f552..cec10c0 100644 --- a/src/Model/Widget.php +++ b/src/Model/Widget.php @@ -10,7 +10,6 @@ use SilverStripe\Forms\FieldList; use SilverStripe\Forms\HiddenField; use SilverStripe\Forms\TextField; use SilverStripe\ORM\DataObject; -use SilverStripe\Widgets\Model\WidgetArea; /** * Widgets let CMS authors drag and drop small pieces of functionality into diff --git a/src/Model/WidgetArea.php b/src/Model/WidgetArea.php index c371ca3..dbd862f 100644 --- a/src/Model/WidgetArea.php +++ b/src/Model/WidgetArea.php @@ -4,7 +4,6 @@ namespace SilverStripe\Widgets\Model; use SilverStripe\ORM\ArrayList; use SilverStripe\ORM\DataObject; -use SilverStripe\Widgets\Model\Widget; /** * Represents a set of widgets shown on a page. diff --git a/tests/WidgetAreaEditorTest.php b/tests/WidgetAreaEditorTest.php index b67dc3f..0945ac4 100644 --- a/tests/WidgetAreaEditorTest.php +++ b/tests/WidgetAreaEditorTest.php @@ -2,17 +2,14 @@ namespace SilverStripe\Widgets\Tests; -use Page; use SilverStripe\CMS\Controllers\ContentController; use SilverStripe\CMS\Model\SiteTree; use SilverStripe\Control\HTTPRequest; +use SilverStripe\Dev\SapphireTest; use SilverStripe\Forms\FieldList; use SilverStripe\Forms\Form; -use SilverStripe\Dev\SapphireTest; -use SilverStripe\Dev\TestOnly; use SilverStripe\Widgets\Extensions\WidgetPageExtension; use SilverStripe\Widgets\Forms\WidgetAreaEditor; -use SilverStripe\Widgets\Model\Widget; use SilverStripe\Widgets\Tests\WidgetAreaEditorTest\FakePage; use SilverStripe\Widgets\Tests\WidgetAreaEditorTest\TestWidget; diff --git a/tests/WidgetControllerTest.php b/tests/WidgetControllerTest.php index f207fa5..1f6e47d 100644 --- a/tests/WidgetControllerTest.php +++ b/tests/WidgetControllerTest.php @@ -3,13 +3,7 @@ namespace SilverStripe\Widgets\Tests; use SilverStripe\Dev\FunctionalTest; -use SilverStripe\Widgets\Model\Widget; -use SilverStripe\Dev\TestOnly; -use SilverStripe\Forms\TextField; -use SilverStripe\Forms\FieldList; -use SilverStripe\Forms\FormAction; use SilverStripe\Forms\Form; -use SilverStripe\Widgets\Controllers\WidgetController; use SilverStripe\Widgets\Tests\WidgetControllerTest\TestPage; use SilverStripe\Widgets\Tests\WidgetControllerTest\TestWidget; @@ -35,7 +29,7 @@ class WidgetControllerTest extends FunctionalTest $response = $this->get($page->URLSegment); - $formAction = sprintf('%s/widget/%d/Form', $page->URLSegment, $widget->ID); + $formAction = sprintf('%s/widget/%d/%s', $page->URLSegment, $widget->ID, 'Form'); $this->assertContains( $formAction, $response->getBody(), diff --git a/tests/WidgetControllerTest/TestWidgetController.php b/tests/WidgetControllerTest/TestWidgetController.php index 18831a6..41b3b49 100644 --- a/tests/WidgetControllerTest/TestWidgetController.php +++ b/tests/WidgetControllerTest/TestWidgetController.php @@ -23,7 +23,7 @@ class TestWidgetController extends WidgetController implements TestOnly { $widgetform = new Form( $this, - 'Form', + __FUNCTION__, new FieldList( new TextField('TestValue') ), From 58e26969a3961dce841655367c42364c36a0206f Mon Sep 17 00:00:00 2001 From: Raissa North Date: Tue, 19 Dec 2017 09:59:35 +1300 Subject: [PATCH 3/5] FIX Update documentation and turn into vendor module --- .gitattributes | 1 + .travis.yml | 2 +- README.md | 13 ++++++------- composer.json | 2 +- license.md | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitattributes b/.gitattributes index 475f5f2..89eb187 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,3 +4,4 @@ /.gitignore export-ignore /.travis.yml export-ignore /.scrutinizer.yml export-ignore +/codecov.yml export-ignore diff --git a/.travis.yml b/.travis.yml index aad900e..505e8d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: php env: global: - - COMPOSER_ROOT_VERSION="4.0.x-dev" + - COMPOSER_ROOT_VERSION="2.0.x-dev" matrix: include: diff --git a/README.md b/README.md index 4d68583..a112a81 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,8 @@ # Widgets Module -[![Build Status](http://img.shields.io/travis/silverstripe/silverstripe-widgets.svg?style=flat-square)](https://travis-ci.org/silverstripe/silverstripe-widgets) -[![Code Quality](http://img.shields.io/scrutinizer/g/silverstripe/silverstripe-widgets.svg?style=flat-square)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-widgets) -[![Code Coverage](https://codecov.io/gh/silverstripe/silverstripe-widgets/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/silverstripe-widgets) -[![Version](http://img.shields.io/packagist/v/silverstripe/widgets.svg?style=flat-square)](https://packagist.org/packages/silverstripe/widgets) -[![License](http://img.shields.io/packagist/l/silverstripe/widgets.svg?style=flat-square)](LICENSE.md) +[![Build Status](http://img.shields.io/travis/silverstripe/silverstripe-widgets.svg)](https://travis-ci.org/silverstripe/silverstripe-widgets) +[![Code Quality](http://img.shields.io/scrutinizer/g/silverstripe/silverstripe-widgets.svg)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-widgets) +[![Code Coverage](https://img.shields.io/codecov/c/github/silverstripe/silverstripe-widgets.svg)](https://codecov.io/gh/silverstripe/silverstripe-widgets) ## Overview @@ -13,8 +11,9 @@ the sidebar of your website. ## Requirements - * SilverStripe 4.0 - +* SilverStripe 4.0 + +**Note:** this version is compatible with SilverStripe 4. For SilverStripe 3, please see [the 1.x release line](https://github.com/silverstripe/silverstripe-widgets/tree/1.3). ### Installation diff --git a/composer.json b/composer.json index 0434fb9..d6f702d 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "silverstripe/widgets", "description": "Widgets are small pieces of functionality such as showing the latest Comments or Flickr Photos. They normally display on the sidebar of your website.", - "type": "silverstripe-module", + "type": "silverstripe-vendormodule", "keywords": ["silverstripe", "widgets", "blog"], "authors": [ { diff --git a/license.md b/license.md index 9445c8e..8794670 100644 --- a/license.md +++ b/license.md @@ -1,4 +1,4 @@ -Copyright (c) 2016, SilverStripe Limited +Copyright (c) 2017, SilverStripe Limited All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: From de7473e9eab54c53b6908df07f54834ab94a00c1 Mon Sep 17 00:00:00 2001 From: Raissa North Date: Tue, 19 Dec 2017 10:28:59 +1300 Subject: [PATCH 4/5] FIX Update translations --- lang/ar.yml | 4 ++-- lang/de.yml | 4 ++-- lang/en.yml | 4 ++-- lang/eo.yml | 4 ++-- lang/fa_IR.yml | 4 ++-- lang/fi.yml | 4 ++-- lang/hr.yml | 4 ++-- lang/it_IT.yml | 4 ++-- lang/ru.yml | 4 ++-- lang/sk.yml | 4 ++-- lang/sv.yml | 4 ++-- lang/zh.yml | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lang/ar.yml b/lang/ar.yml index ba3faa9..95761e5 100644 --- a/lang/ar.yml +++ b/lang/ar.yml @@ -1,8 +1,8 @@ ar: - Widget: + SilverStripe\Widgets\Model\Widget: PLURALNAME: 'تطبيقات مصغرة' SINGULARNAME: 'تطبيق مصغر' - WidgetArea: + SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'مساحات التطبيقات المصغرة' SINGULARNAME: 'مساحة التطبيقات المصغرة' WidgetAreaEditor_ss: diff --git a/lang/de.yml b/lang/de.yml index bfaeaed..1a69b74 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -1,8 +1,8 @@ de: - Widget: + SilverStripe\Widgets\Model\Widget: PLURALNAME: Widgets SINGULARNAME: Widget - WidgetArea: + SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: Widgetbereiche SINGULARNAME: Widgetbereich WidgetAreaEditor_ss: diff --git a/lang/en.yml b/lang/en.yml index d42321f..856bc25 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -1,4 +1,6 @@ en: + SilverStripe\Widgets\Extensions\WidgetPageExtension: + INHERITSIDEBAR: 'Inherit Sidebar From Parent' SilverStripe\Widgets\Model\Widget: PLURALNAME: Widgets SINGULARNAME: Widget @@ -15,5 +17,3 @@ en: CLICKTOADDWIDGET: 'Click to add this widget' SilverStripe\Widgets\Templates\WidgetEditor_ss: DELETE: Delete - WidgetPageExtension: - INHERITSIDEBAR: 'Inherit Sidebar From Parent' diff --git a/lang/eo.yml b/lang/eo.yml index 9f59308..15929eb 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -1,8 +1,8 @@ eo: - Widget: + SilverStripe\Widgets\Model\Widget: PLURALNAME: Fenestraĵoj SINGULARNAME: Fenestraĵo - WidgetArea: + SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'Fenestraĵaj zonoj' SINGULARNAME: 'Fenestraĵa zono' WidgetAreaEditor_ss: diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml index 4782275..5b31c5e 100644 --- a/lang/fa_IR.yml +++ b/lang/fa_IR.yml @@ -1,8 +1,8 @@ fa_IR: - Widget: + SilverStripe\Widgets\Model\Widget: PLURALNAME: 'ویجت ها' SINGULARNAME: ویجت - WidgetArea: + SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'محیط ویجت ها' SINGULARNAME: 'محیط ویجت' WidgetAreaEditor_ss: diff --git a/lang/fi.yml b/lang/fi.yml index a19b31c..25bf255 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -1,8 +1,8 @@ fi: - Widget: + SilverStripe\Widgets\Model\Widget: PLURALNAME: Vimpaimet SINGULARNAME: Vimpain - WidgetArea: + SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'Vimpain alueet' SINGULARNAME: 'Vimpain alue' WidgetAreaEditor_ss: diff --git a/lang/hr.yml b/lang/hr.yml index 73aa32e..e860d5f 100644 --- a/lang/hr.yml +++ b/lang/hr.yml @@ -1,8 +1,8 @@ hr: - Widget: + SilverStripe\Widgets\Model\Widget: PLURALNAME: Widgeti SINGULARNAME: Widget - WidgetArea: + SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'Zone widgeta' SINGULARNAME: 'Zona widgeta' WidgetAreaEditor_ss: diff --git a/lang/it_IT.yml b/lang/it_IT.yml index 50a8a55..a82ce18 100644 --- a/lang/it_IT.yml +++ b/lang/it_IT.yml @@ -1,8 +1,8 @@ it_IT: - Widget: + SilverStripe\Widgets\Model\Widget: PLURALNAME: Widgets SINGULARNAME: Widget - WidgetArea: + SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'Aree Widget' SINGULARNAME: 'Area Widget' WidgetAreaEditor_ss: diff --git a/lang/ru.yml b/lang/ru.yml index 04959f6..b379c7a 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -1,8 +1,8 @@ ru: - Widget: + SilverStripe\Widgets\Model\Widget: PLURALNAME: Виджеты SINGULARNAME: Виджет - WidgetArea: + SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'Области виджетов' SINGULARNAME: 'Область виджета' WidgetAreaEditor_ss: diff --git a/lang/sk.yml b/lang/sk.yml index d896c60..3e295ce 100644 --- a/lang/sk.yml +++ b/lang/sk.yml @@ -1,8 +1,8 @@ sk: - Widget: + SilverStripe\Widgets\Model\Widget: PLURALNAME: Widgety SINGULARNAME: Widget - WidgetArea: + SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'Oblasti widgetu' SINGULARNAME: 'Oblasť widgetu' WidgetAreaEditor_ss: diff --git a/lang/sv.yml b/lang/sv.yml index f6d0157..e82dfca 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -1,8 +1,8 @@ sv: - Widget: + SilverStripe\Widgets\Model\Widget: PLURALNAME: Widgets SINGULARNAME: Widget - WidgetArea: + SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: Widgetområden SINGULARNAME: Widgetområde WidgetAreaEditor_ss: diff --git a/lang/zh.yml b/lang/zh.yml index 5ce6487..1d87607 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -1,8 +1,8 @@ zh: - Widget: + SilverStripe\Widgets\Model\Widget: PLURALNAME: 小工具 SINGULARNAME: 小工具 - WidgetArea: + SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 小工具区域 SINGULARNAME: 小工具区域 WidgetAreaEditor_ss: From a2f459459714a32345e87d96664037c21a73001c Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 19 Dec 2017 14:33:16 +1300 Subject: [PATCH 5/5] FIX Update legacy translation tags in templates, run text collector, update other langs --- .travis.yml | 2 +- lang/ar.yml | 2 +- lang/de.yml | 2 +- lang/en.yml | 24 ++++++++++++------- lang/eo.yml | 2 +- lang/fa_IR.yml | 2 +- lang/fi.yml | 2 +- lang/hr.yml | 2 +- lang/it_IT.yml | 2 +- lang/nl.yml | 2 +- lang/pl_PL.yml | 2 +- lang/ro_RO.yml | 2 +- lang/ru.yml | 2 +- lang/sk.yml | 2 +- lang/sv.yml | 2 +- lang/zh.yml | 2 +- .../Widgets/Forms/WidgetAreaEditor.ss | 12 +++++----- .../SilverStripe/Widgets/Model/WidgetArea.ss | 4 ++-- templates/WidgetDescription.ss | 2 +- templates/WidgetEditor.ss | 2 +- templates/WidgetHolder.ss | 4 ++-- 21 files changed, 42 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index 505e8d2..7a70cdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: php env: global: - - COMPOSER_ROOT_VERSION="2.0.x-dev" + - COMPOSER_ROOT_VERSION="2.x-dev" matrix: include: diff --git a/lang/ar.yml b/lang/ar.yml index 95761e5..cedef65 100644 --- a/lang/ar.yml +++ b/lang/ar.yml @@ -5,7 +5,7 @@ ar: SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'مساحات التطبيقات المصغرة' SINGULARNAME: 'مساحة التطبيقات المصغرة' - WidgetAreaEditor_ss: + SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 'التطبيقات المصغرة المتاحة' AVAILWIDGETS: 'اضغط على عنوان تطبيق مصغر بالأسفل لاستخدامه بهذه الصفحة.' INUSE: 'التطبيقات المصغرة المستخدمة حاليا' diff --git a/lang/de.yml b/lang/de.yml index 1a69b74..437a3ed 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -5,7 +5,7 @@ de: SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: Widgetbereiche SINGULARNAME: Widgetbereich - WidgetAreaEditor_ss: + SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 'Vorhandene Widgets' AVAILWIDGETS: 'Klicke den Widget Titel, um es zu benutzen.' INUSE: 'Benutzte Widgets' diff --git a/lang/en.yml b/lang/en.yml index 856bc25..5d797f3 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -1,19 +1,25 @@ en: SilverStripe\Widgets\Extensions\WidgetPageExtension: INHERITSIDEBAR: 'Inherit Sidebar From Parent' - SilverStripe\Widgets\Model\Widget: - PLURALNAME: Widgets - SINGULARNAME: Widget - SilverStripe\Widgets\Model\WidgetArea: - PLURALNAME: 'Widget Areas' - SINGULARNAME: 'Widget Area' - SilverStripe\Widgets\Templates\SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: + SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 'Available Widgets' AVAILWIDGETS: 'Click a widget title below to use it on this page.' INUSE: 'Widgets currently used' NOAVAIL: 'There are currently no widgets available.' TOSORT: 'To sort currently used widgets on this page, drag them up and down.' - SilverStripe\Widgets\Templates\WidgetDescription_ss: + SilverStripe\Widgets\Model\Widget: + PLURALNAME: Widgets + PLURALS: + one: 'A Widget' + other: '{count} Widgets' + SINGULARNAME: Widget + SilverStripe\Widgets\Model\WidgetArea: + PLURALNAME: 'Widget Areas' + PLURALS: + one: 'A Widget Area' + other: '{count} Widget Areas' + SINGULARNAME: 'Widget Area' + WidgetDescription_ss: CLICKTOADDWIDGET: 'Click to add this widget' - SilverStripe\Widgets\Templates\WidgetEditor_ss: + WidgetEditor_ss: DELETE: Delete diff --git a/lang/eo.yml b/lang/eo.yml index 15929eb..28c0559 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -5,7 +5,7 @@ eo: SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'Fenestraĵaj zonoj' SINGULARNAME: 'Fenestraĵa zono' - WidgetAreaEditor_ss: + SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 'Disponeblaj fenestraĵoj' AVAILWIDGETS: 'Alklaku sube titolon de fenestraĵo por uzi ĝin en ĉi tiu paĝo.' INUSE: 'Fenestraĵoj aktuale uzataj' diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml index 5b31c5e..004259f 100644 --- a/lang/fa_IR.yml +++ b/lang/fa_IR.yml @@ -5,7 +5,7 @@ fa_IR: SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'محیط ویجت ها' SINGULARNAME: 'محیط ویجت' - WidgetAreaEditor_ss: + SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 'ویجت های موجود' AVAILWIDGETS: 'بر روی عنوان یک ویجت در پایین کلیک کنید تا آن را در این صفحه بکار بگیرید.' INUSE: 'ویجت هایی که در حال حاضر استفاده می شوند' diff --git a/lang/fi.yml b/lang/fi.yml index 25bf255..97e5309 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -5,7 +5,7 @@ fi: SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'Vimpain alueet' SINGULARNAME: 'Vimpain alue' - WidgetAreaEditor_ss: + SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 'Käytettävissä olevat vimpaimet' AVAILWIDGETS: 'Napsauta vimpaimen otsikkoa alla ottaaksesi se käyttöön tällä sivulla.' INUSE: 'Käytössä olevat vimpaimet' diff --git a/lang/hr.yml b/lang/hr.yml index e860d5f..64add83 100644 --- a/lang/hr.yml +++ b/lang/hr.yml @@ -5,7 +5,7 @@ hr: SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'Zone widgeta' SINGULARNAME: 'Zona widgeta' - WidgetAreaEditor_ss: + SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 'Dostupni widgeti' AVAILWIDGETS: 'Kliknite na naziv widgeta ispod za korištenje na ovoj stranici' INUSE: 'Trenutno korišteni widgeti' diff --git a/lang/it_IT.yml b/lang/it_IT.yml index a82ce18..a5f387f 100644 --- a/lang/it_IT.yml +++ b/lang/it_IT.yml @@ -5,7 +5,7 @@ it_IT: SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'Aree Widget' SINGULARNAME: 'Area Widget' - WidgetAreaEditor_ss: + SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 'Widgets disponibili' AVAILWIDGETS: 'Clicca sul titolo di un widget qui sotto per usarlo in questa pagina' INUSE: 'Widgets attualmente utilizzati' diff --git a/lang/nl.yml b/lang/nl.yml index dd52b82..830631a 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -1,5 +1,5 @@ nl: - WidgetAreaEditor_ss: + SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 'Beschikbare Widgets' AVAILWIDGETS: 'Klik op een widget titel hieronder, om de widget te gebruiken op deze pagina.' INUSE: 'Huidige gebruikte Widgets' diff --git a/lang/pl_PL.yml b/lang/pl_PL.yml index 5b76731..8910d94 100644 --- a/lang/pl_PL.yml +++ b/lang/pl_PL.yml @@ -1,5 +1,5 @@ pl_PL: - WidgetAreaEditor_ss: + SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 'Dostępne widżety' AVAILWIDGETS: 'Kliknij w tytuł widżetu, aby używać go na tej stronie.' INUSE: 'Obecnie stosowane widżety' diff --git a/lang/ro_RO.yml b/lang/ro_RO.yml index b279ce9..cf397c6 100644 --- a/lang/ro_RO.yml +++ b/lang/ro_RO.yml @@ -1,5 +1,5 @@ ro_RO: - WidgetAreaEditor_ss: + SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 'Widget-uri disponibile' AVAILWIDGETS: 'Faceți clic pe un titlu widget de mai jos pentru a-l folosi pe aceasta pagina.' INUSE: 'Widget-uri utilizate în prezent' diff --git a/lang/ru.yml b/lang/ru.yml index b379c7a..1cc0956 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -5,7 +5,7 @@ ru: SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'Области виджетов' SINGULARNAME: 'Область виджета' - WidgetAreaEditor_ss: + SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 'Доступные виджеты' AVAILWIDGETS: 'Щелкните заголовок виджета ниже, чтобы использовать его на этой странице.' INUSE: 'Используемые виджеты' diff --git a/lang/sk.yml b/lang/sk.yml index 3e295ce..71ae736 100644 --- a/lang/sk.yml +++ b/lang/sk.yml @@ -5,7 +5,7 @@ sk: SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 'Oblasti widgetu' SINGULARNAME: 'Oblasť widgetu' - WidgetAreaEditor_ss: + SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 'Dostupné widgety' AVAILWIDGETS: 'Kliknite na názov widgetu pre jeho použitie na tejto stránke.' INUSE: 'Momentálne používané widgety.' diff --git a/lang/sv.yml b/lang/sv.yml index e82dfca..89809d2 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -5,7 +5,7 @@ sv: SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: Widgetområden SINGULARNAME: Widgetområde - WidgetAreaEditor_ss: + SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 'Tillgängliga widgets' AVAILWIDGETS: 'Klicka på en widget nedan för att använda den på sidan.' INUSE: 'Använda widgets' diff --git a/lang/zh.yml b/lang/zh.yml index 1d87607..af291cb 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -5,7 +5,7 @@ zh: SilverStripe\Widgets\Model\WidgetArea: PLURALNAME: 小工具区域 SINGULARNAME: 小工具区域 - WidgetAreaEditor_ss: + SilverStripe\Widgets\Forms\WidgetAreaEditor_ss: AVAILABLE: 可用的小工具 AVAILWIDGETS: 点击下方的小工具名称即可在此页上使用。 INUSE: 当前使用的小工具 diff --git a/templates/SilverStripe/Widgets/Forms/WidgetAreaEditor.ss b/templates/SilverStripe/Widgets/Forms/WidgetAreaEditor.ss index 0455fa4..d17ac32 100644 --- a/templates/SilverStripe/Widgets/Forms/WidgetAreaEditor.ss +++ b/templates/SilverStripe/Widgets/Forms/WidgetAreaEditor.ss @@ -1,8 +1,8 @@ -
maxwidgets="$MaxWidgets"<% end_if %>> +
maxwidgets="$MaxWidgets"<% end_if %>>
-

<% _t('WidgetAreaEditor_ss.AVAILABLE', 'Available Widgets') %>

-

<% _t('WidgetAreaEditor_ss.AVAILWIDGETS', 'Click a widget title below to use it on this page.') %>

+

<%t SilverStripe\\Widgets\\Forms\\WidgetAreaEditor_ss.AVAILABLE 'Available Widgets' %>

+

<%t SilverStripe\\Widgets\\Forms\\WidgetAreaEditor_ss.AVAILWIDGETS 'Click a widget title below to use it on this page.' %>

<% if $AvailableWidgets %> <% loop $AvailableWidgets %> @@ -10,14 +10,14 @@ <% end_loop %> <% else %>
-

<% _t('WidgetAreaEditor_ss.NOAVAIL', 'There are currently no widgets available.') %>

+

<%t SilverStripe\\Widgets\\Forms\\WidgetAreaEditor_ss.NOAVAIL 'There are currently no widgets available.' %>

<% end_if %>
-

<% _t('WidgetAreaEditor_ss.INUSE', 'Widgets currently used') %>

-

<% _t('WidgetAreaEditor_ss.TOSORT', 'To sort currently used widgets on this page, drag them up and down.') %>

+

<%t SilverStripe\\Widgets\\Forms\\WidgetAreaEditor_ss.INUSE 'Widgets currently used' %>

+

<%t SilverStripe\\Widgets\\Forms\\WidgetAreaEditor_ss.TOSORT 'To sort currently used widgets on this page, drag them up and down.' %>

<% if $UsedWidgets %> diff --git a/templates/SilverStripe/Widgets/Model/WidgetArea.ss b/templates/SilverStripe/Widgets/Model/WidgetArea.ss index 27a5000..32ca772 100644 --- a/templates/SilverStripe/Widgets/Model/WidgetArea.ss +++ b/templates/SilverStripe/Widgets/Model/WidgetArea.ss @@ -1,3 +1,3 @@ -<% loop WidgetControllers %> +<% loop $WidgetControllers %> $WidgetHolder -<% end_loop %> \ No newline at end of file +<% end_loop %> diff --git a/templates/WidgetDescription.ss b/templates/WidgetDescription.ss index e7acc6f..dd4ddef 100644 --- a/templates/WidgetDescription.ss +++ b/templates/WidgetDescription.ss @@ -1,5 +1,5 @@
-

$CMSTitle

+

$CMSTitle

$Description

diff --git a/templates/WidgetEditor.ss b/templates/WidgetEditor.ss index d1f2e4c..992b1dd 100644 --- a/templates/WidgetEditor.ss +++ b/templates/WidgetEditor.ss @@ -10,5 +10,5 @@ <% end_if %> -

<% _t('WidgetEditor_ss.DELETE', 'Delete') %>

+

<%t WidgetEditor_ss.DELETE 'Delete' %>

diff --git a/templates/WidgetHolder.ss b/templates/WidgetHolder.ss index e6787fd..d923897 100644 --- a/templates/WidgetHolder.ss +++ b/templates/WidgetHolder.ss @@ -1,4 +1,4 @@ -
- <% if Title %>

$Title

<% end_if %> +
+ <% if $Title %>

$Title

<% end_if %> $Content