From 0d4a512a0b8f9942d83fba1df096805edadff676 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 17 Nov 2016 10:15:58 +1300 Subject: [PATCH 1/7] Remove obsolete branch-alias --- composer.json | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index aa44403..ac6bf16 100644 --- a/composer.json +++ b/composer.json @@ -1,22 +1,20 @@ { - "name": "silverstripe/iframe", - "description": "Add an iFrame pagetype to SilverStripe, to show content from another website", - "type": "silverstripe-module", - "keywords": ["silverstripe"], - "license": "BSD-3-Clause", - "authors": [ - { - "name": "Mateusz Uzdowski", - "email": "mateusz@silverstripe.com" - } - ], - "require": { - "silverstripe/framework": "3.*", - "silverstripe/cms": "3.*" - }, - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - } -} + "name": "silverstripe/iframe", + "description": "Add an iFrame pagetype to SilverStripe, to show content from another website", + "type": "silverstripe-module", + "keywords": [ + "silverstripe" + ], + "license": "BSD-3-Clause", + "authors": [ + { + "name": "Mateusz Uzdowski", + "email": "mateusz@silverstripe.com" + } + ], + "require": { + "silverstripe/framework": "3.*", + "silverstripe/cms": "3.*" + }, + "extra": [] +} \ No newline at end of file From 03712317d807c4c43ecf2bbf2dbca3d2dc30e4ef Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 17 Nov 2016 12:39:49 +1300 Subject: [PATCH 2/7] Update translations --- lang/fi.yml | 2 +- lang/fi_FI.yml | 2 +- lang/mi.yml | 2 +- lang/zh.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/fi.yml b/lang/fi.yml index dc34f3a..2d67aee 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -1,7 +1,7 @@ fi: IFramePage: DESCRIPTION: 'Upottaa iframen sivulle.' - PLURALNAME: 'Pohjasivut' + PLURALNAME: Pohjasivut SINGULARNAME: 'I Frame sivu' IframePage: ExternalNote: 'Huomioithan, että seuraava sisältöosio on upotettu ulkopuolisesta lähteestä (HTML-kielen IFRAME-käskyllä) ja saattaa aiheuttaa odottamattoman käyttökokemuksen selaimessa.' diff --git a/lang/fi_FI.yml b/lang/fi_FI.yml index 17f109a..879ece0 100644 --- a/lang/fi_FI.yml +++ b/lang/fi_FI.yml @@ -1,3 +1,3 @@ fi_FI: IFramePage: - PLURALNAME: 'Pohjasivut' + PLURALNAME: Pohjasivut diff --git a/lang/mi.yml b/lang/mi.yml index a50a0fb..2a07c14 100644 --- a/lang/mi.yml +++ b/lang/mi.yml @@ -7,5 +7,5 @@ mi: ExternalNote: 'Me mōhio ka tukuna pea te wāhanga ihirangi e whai nei i tētahi pūtake ā-waho (he Ī-TĀPARE e pā ana ki te HTML), ā, ka whakarato pea i ngā wheako rerekē mō ngā pūpānui mata.' Loading: 'Uta ihirangi ana...' SiteTree: - PLURALNAME: Ngā Whārangi + PLURALNAME: 'Ngā Whārangi' SINGULARNAME: Whārangi diff --git a/lang/zh.yml b/lang/zh.yml index a6b95b0..ccee855 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -1,7 +1,7 @@ zh: IFramePage: DESCRIPTION: '将 iframe 嵌入页面主体' - PLURALNAME: '基页' + PLURALNAME: 基页 SINGULARNAME: 'IFRAME 页面' IframePage: ExternalNote: '请注意，下列内容可能来自外部来源（HTML 中的 IFRAME 框架），在屏幕上阅读时可能会产生不一致的体验。' From 6781d0413f70bf60b9947e9bde45ac39d949548a Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Fri, 9 Dec 2016 12:15:25 +0000 Subject: [PATCH 3/7] Adding explicit use of database to tests --- tests/IFramePageTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/IFramePageTest.php b/tests/IFramePageTest.php index 1e8052f..d1ba53b 100644 --- a/tests/IFramePageTest.php +++ b/tests/IFramePageTest.php @@ -2,6 +2,8 @@ class IFramePageTest extends SapphireTest { + protected $usesDatabase = true; + public function setUp() { parent::setUp(); From becc701abf1f4a5684235f4be59853062a982b9e Mon Sep 17 00:00:00 2001 From: Brett Tasker Date: Thu, 9 Feb 2017 11:28:52 +1300 Subject: [PATCH 4/7] Update translations --- lang/fi.yml | 2 ++ lang/nl.yml | 13 +++++++++++++ lang/zh.yml | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 lang/nl.yml diff --git a/lang/fi.yml b/lang/fi.yml index 2d67aee..8597ea5 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -3,6 +3,8 @@ fi: DESCRIPTION: 'Upottaa iframen sivulle.' PLURALNAME: Pohjasivut SINGULARNAME: 'I Frame sivu' + VALIDATION: + BANNEDURLSCHEME: 'Tämä URL-skeema ei ole sallittu.' IframePage: ExternalNote: 'Huomioithan, että seuraava sisältöosio on upotettu ulkopuolisesta lähteestä (HTML-kielen IFRAME-käskyllä) ja saattaa aiheuttaa odottamattoman käyttökokemuksen selaimessa.' Loading: 'Ladataan sisältöä...' diff --git a/lang/nl.yml b/lang/nl.yml new file mode 100644 index 0000000..9bda6b9 --- /dev/null +++ b/lang/nl.yml @@ -0,0 +1,13 @@ +nl: + IFramePage: + DESCRIPTION: 'Voegt een iframe toe aan de pagina.' + PLURALNAME: 'Basis pagina''s' + SINGULARNAME: 'I Frame Pagina' + VALIDATION: + BANNEDURLSCHEME: 'Dit URL schema is niet toegestaan.' + IframePage: + ExternalNote: 'Gelieve op te merken dat de volgende sectie mogelijk kan aangeleverd worden door een externe bron (IFRAME in HTML termen) en dat dit een ongewone ervaring kan leveren voor scherm lezers.' + Loading: 'Laden van inhoud...' + SiteTree: + PLURALNAME: 'Pagina''s' + SINGULARNAME: Pagina diff --git a/lang/zh.yml b/lang/zh.yml index ccee855..393408b 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -5,7 +5,7 @@ zh: SINGULARNAME: 'IFRAME 页面' IframePage: ExternalNote: '请注意，下列内容可能来自外部来源（HTML 中的 IFRAME 框架），在屏幕上阅读时可能会产生不一致的体验。' - Loading: '正在加载内容……' + Loading: 正在加载内容…… SiteTree: PLURALNAME: 页面 SINGULARNAME: 页面 From 8b04cf2ee9b5f5c7ced1f380bc4e5822e4120596 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 11 May 2017 08:28:40 +1200 Subject: [PATCH 5/7] Don't test on unsupported releases --- .travis.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index e0b9e21..7ff6d15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,10 @@ php: - 5.4 - 5.5 - 5.6 - - 7.0 env: global: - - DB=MYSQL CORE_RELEASE=3.2 + - DB=MYSQL CORE_RELEASE=3 - MODULE_PATH=iframe - COVERAGE=0 @@ -22,16 +21,11 @@ matrix: - php: 5.6 env: DB=MYSQL CORE_RELEASE=3 - php: 5.6 - env: DB=MYSQL CORE_RELEASE=3.1 - - php: 5.6 - env: DB=PGSQL CORE_RELEASE=3.2 - - php: 5.6 - env: DB=MYSQL CORE_RELEASE=3.3 + env: DB=PGSQL CORE_RELEASE=3 # Allowed to fail, meaning delayed code coverage reports - php: 5.5.9 - env: DB=MYSQL CORE_RELEASE=3.2 COVERAGE=1 + env: DB=MYSQL CORE_RELEASE=3 COVERAGE=1 allow_failures: - - php: 7.0 - php: 5.5.9 fast_finish: true From ed00f5a4f046976903aec56bca8e6b937ec6b3ef Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Fri, 12 May 2017 15:06:51 +1200 Subject: [PATCH 6/7] Update translations --- lang/zh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/zh.yml b/lang/zh.yml index 393408b..ccee855 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -5,7 +5,7 @@ zh: SINGULARNAME: 'IFRAME 页面' IframePage: ExternalNote: '请注意，下列内容可能来自外部来源（HTML 中的 IFRAME 框架），在屏幕上阅读时可能会产生不一致的体验。' - Loading: 正在加载内容…… + Loading: '正在加载内容……' SiteTree: PLURALNAME: 页面 SINGULARNAME: 页面 From 892d97ad6caa13348f5894a33d3c7173f39e853f Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 22 Nov 2017 17:56:13 +1300 Subject: [PATCH 7/7] Freeze Transifex translations for SS3. Please commit directly to lang files. --- .tx/config | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .tx/config diff --git a/.tx/config b/.tx/config deleted file mode 100644 index b7b8a89..0000000 --- a/.tx/config +++ /dev/null @@ -1,8 +0,0 @@ -[main] -host = https://www.transifex.com - -[silverstripe-iframe.master] -file_filter = lang/.yml -source_file = lang/en.yml -source_lang = en -type = YML \ No newline at end of file