From df4844d45f55c56f8a7e1910357a51daf946ec82 Mon Sep 17 00:00:00 2001 From: Brett Tasker Date: Thu, 9 Feb 2017 11:28:52 +1300 Subject: [PATCH 1/7] Update translations --- lang/ar.yml | 2 +- lang/zh.yml | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lang/ar.yml b/lang/ar.yml index 3ebf0ed..ba3faa9 100644 --- a/lang/ar.yml +++ b/lang/ar.yml @@ -14,4 +14,4 @@ ar: WidgetDescription_ss: CLICKTOADDWIDGET: 'اضغط لإضافة هذا التطبيق المصغر' WidgetEditor_ss: - DELETE: 'مسح' + DELETE: مسح diff --git a/lang/zh.yml b/lang/zh.yml index 420719c..5ce6487 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -1,17 +1,17 @@ zh: Widget: - PLURALNAME: '小工具' - SINGULARNAME: '小工具' + PLURALNAME: 小工具 + SINGULARNAME: 小工具 WidgetArea: - PLURALNAME: '小工具区域' - SINGULARNAME: '小工具区域' + PLURALNAME: 小工具区域 + SINGULARNAME: 小工具区域 WidgetAreaEditor_ss: - AVAILABLE: '可用的小工具' - AVAILWIDGETS: '点击下方的小工具名称即可在此页上使用。' - INUSE: '当前使用的小工具' - NOAVAIL: '目前没有可用小工具。' - TOSORT: '要对本页当前使用的小工具进行排序，请像上下拖拽。' + AVAILABLE: 可用的小工具 + AVAILWIDGETS: 点击下方的小工具名称即可在此页上使用。 + INUSE: 当前使用的小工具 + NOAVAIL: 目前没有可用小工具。 + TOSORT: 要对本页当前使用的小工具进行排序，请像上下拖拽。 WidgetDescription_ss: - CLICKTOADDWIDGET: '点击添加该小工具' + CLICKTOADDWIDGET: 点击添加该小工具 WidgetEditor_ss: - DELETE: '删除' + DELETE: 删除 From 80029afafb79c41b9eeb3f991d590d4d5ca70e6f Mon Sep 17 00:00:00 2001 From: Rastislav Brandobur Date: Thu, 6 Apr 2017 11:01:33 +0200 Subject: [PATCH 2/7] added missing _t() function --- code/extension/WidgetPageExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/extension/WidgetPageExtension.php b/code/extension/WidgetPageExtension.php index 33aed4e..27f6fc2 100644 --- a/code/extension/WidgetPageExtension.php +++ b/code/extension/WidgetPageExtension.php @@ -26,7 +26,7 @@ class WidgetPageExtension extends DataExtension { $fields->addFieldToTab( "Root.Widgets", - new CheckboxField("InheritSideBar", 'Inherit Sidebar From Parent') + new CheckboxField("InheritSideBar", _t('WidgetPageExtension.INHERITSIDEBAR', 'Inherit Sidebar From Parent')) ); $fields->addFieldToTab( "Root.Widgets", From 8f0427922be7fbac32967def1da9da3c09957fad Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 15 Jun 2017 11:49:57 +1200 Subject: [PATCH 3/7] Add PHP7 + SS3.6 build to Travis configuration --- .travis.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 75d02b3..b3dfb12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details +# See https://github.com/silverstripe/silverstripe-travis-support for setup details sudo: false @@ -8,24 +8,22 @@ php: - 5.3 - 5.4 - 5.5 - - 5.6 - - 7.0 env: - - DB=MYSQL CORE_RELEASE=3.2 + - DB=MYSQL CORE_RELEASE=3.5 matrix: include: - php: 5.6 env: DB=MYSQL CORE_RELEASE=3 - php: 5.6 - env: DB=PGSQL CORE_RELEASE=3.2 - allow_failures: - - php: 7.0 + env: DB=PGSQL CORE_RELEASE=3.4 + - php: 7.1 + env: DB=MYSQL CORE_RELEASE=3.6 before_script: - composer self-update || true - - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support + - git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss - cd ~/builds/ss - composer install From a434245cfa0e5f1e775de66983be7261c7ce90e4 Mon Sep 17 00:00:00 2001 From: Rastislav Brandobur Date: Thu, 15 Jun 2017 01:54:19 +0200 Subject: [PATCH 4/7] added WidgetPageExtension.INHERITSIDEBAR definition to lang subfolder --- lang/en.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lang/en.yml b/lang/en.yml index b9c429a..4d96be6 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -15,3 +15,5 @@ en: CLICKTOADDWIDGET: 'Click to add this widget' WidgetEditor_ss: DELETE: Delete + WidgetPageExtension: + INHERITSIDEBAR: 'Inherit Sidebar From Parent' From 33ef8b9d2c956429a76d27332638544840c76f72 Mon Sep 17 00:00:00 2001 From: maks feltrin Date: Sun, 9 Jul 2017 10:17:44 +0200 Subject: [PATCH 5/7] use already fetched values --- javascript/WidgetAreaEditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javascript/WidgetAreaEditor.js b/javascript/WidgetAreaEditor.js index 0a83c51..9466466 100644 --- a/javascript/WidgetAreaEditor.js +++ b/javascript/WidgetAreaEditor.js @@ -5,7 +5,7 @@ var parentName=$(this).attr('name'); this.rewriteWidgetAreaAttributes(); - var availableWidgets=$('#availableWidgets-'+$(this).attr('name')).children().each(function() { + var availableWidgets=$('#availableWidgets-'+parentName).children().each(function() { // Don't run on comments, whitespace, etc if($(this)[0].nodeType==1) { // Gotta change their ID's because otherwise we get clashes between two tabs From c28c3c1d8d3dc7cc7ce023660fb4b8d7af06c1f2 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 19 Dec 2017 10:17:25 +1300 Subject: [PATCH 6/7] Remove Transifex configuration. Commit directly to lang files for SS3. --- .travis.yml | 2 +- .tx/config | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 .tx/config diff --git a/.travis.yml b/.travis.yml index b51d45f..3255290 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: php php: - - 5.3 + - 5.6 env: - DB=MYSQL CORE_RELEASE=3.1 diff --git a/.tx/config b/.tx/config deleted file mode 100644 index fe5880f..0000000 --- a/.tx/config +++ /dev/null @@ -1,8 +0,0 @@ -[main] -host = https://www.transifex.com - -[silverstripe-widgets.master] -file_filter = lang/.yml -source_file = lang/en.yml -source_lang = en -type = YML \ No newline at end of file From c5511726ef630f3e21193dae3caf3d643d0f7c99 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 19 Dec 2017 10:19:48 +1300 Subject: [PATCH 7/7] Update branch alias for 1.x-dev --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 0cc07a6..e83644e 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,7 @@ }, "extra": { "branch-alias": { + "1.x-dev": "1.4.x-dev" } }, "license": "BSD-3-Clause"