From 436899adbff73c11e92942fd84ee8c5deaca99b5 Mon Sep 17 00:00:00 2001 From: Hamish Friedlander Date: Tue, 28 Aug 2012 17:23:48 +1200 Subject: [PATCH 1/5] Add config fragment for new i18n ordering system --- _config/i18n.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 _config/i18n.yml diff --git a/_config/i18n.yml b/_config/i18n.yml new file mode 100644 index 00000000..4989e86b --- /dev/null +++ b/_config/i18n.yml @@ -0,0 +1,8 @@ +--- +Name: cmsi18n +Before: '/i18n' +After: '/i18n#basei18n' +--- +i18n: + module_priority: + - cms From f212ebe0f05945992585fcfd268b671f0be9e588 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 28 Mar 2013 21:07:47 +0100 Subject: [PATCH 2/5] Simplified travis builds (external setup scripts) --- .travis.yml | 9 +++++---- tests/travis/before_script | 10 ---------- 2 files changed, 5 insertions(+), 14 deletions(-) delete mode 100755 tests/travis/before_script diff --git a/.travis.yml b/.travis.yml index 000cc5fd..4207d749 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,15 +3,16 @@ php: - 5.3 env: - - TESTDB=MYSQL - - TESTDB=PGSQL + - DB=MYSQL CORE_RELEASE=2.4 + - DB=PGSQL CORE_RELEASE=2.4 before_script: - - ./tests/travis/before_script ~/builds/ss + - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support + - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss - cd ~/builds/ss script: - - php sapphire/cli-script.php dev/tests/module/cms + - phpunit cms/tests branches: except: diff --git a/tests/travis/before_script b/tests/travis/before_script deleted file mode 100755 index ac9a6f0c..00000000 --- a/tests/travis/before_script +++ /dev/null @@ -1,10 +0,0 @@ -BUILD_DIR=$1 -git clone --depth=100 --branch 2.4 --quiet git://github.com/silverstripe/silverstripe-installer.git $BUILD_DIR -git clone --depth=100 --branch 1.2 --quiet git://github.com/silverstripe-labs/silverstripe-sqlite3.git $BUILD_DIR/sqlite3 -git clone --depth=100 --branch 1.0 --quiet git://github.com/silverstripe/silverstripe-postgresql.git $BUILD_DIR/postgresql -git clone --depth=100 --quiet --branch 2.4 git://github.com/silverstripe/sapphire.git $BUILD_DIR/sapphire -cp $BUILD_DIR/sapphire/tests/travis/_ss_environment.php $BUILD_DIR -cp $BUILD_DIR/sapphire/tests/travis/_config.php $BUILD_DIR/mysite -cp -r . $BUILD_DIR/cms - -cd $BUILD_DIR From f8cfb5afd62404856623e886863b3b9d69435592 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 30 Apr 2013 19:09:16 +0300 Subject: [PATCH 3/5] composer/installers dep workaround Moved to end of requirements, to work around a bug in composer - see https://github.com/composer/composer/issues/1147. This caused the dependencies to be installed in the wrong folder because the custom 'silverstripe-module' instructions hadn't been loaded at the time the core modules were installed via composer. --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 12e1d781..5d3a6916 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.2.4", - "composer/installers": "*", - "silverstripe/framework": "2.4.*" + "silverstripe/framework": "2.4.*", + "composer/installers": "*" } -} \ No newline at end of file +} From 041a8bd5a7375608205b48680d2e47a26d781c7f Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 17 May 2013 13:30:33 +0200 Subject: [PATCH 4/5] Update github path --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d2af61e9..98a1b401 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://secure.travis-ci.org/silverstripe/silverstripe-cms.png?branch=3.0)](http://travis-ci.org/silverstripe/silverstripe-cms) -PHP5 Content Management System (CMS), see [http://silverstripe.org](http://silverstripe.org). Requires the [`framework`](http://github.com/silverstripe/sapphire) module and a [`silverstripe-installer`](http://github.com/silverstripe/silverstripe-installer) base project. +PHP5 Content Management System (CMS), see [http://silverstripe.org](http://silverstripe.org). Requires the [`framework`](http://github.com/silverstripe/silverstripe-framework) module and a [`silverstripe-installer`](http://github.com/silverstripe/silverstripe-installer) base project. ## Installation ## @@ -22,7 +22,7 @@ If you would like to make changes to the SilverStripe core codebase, we have an * [Requirements](http://doc.silverstripe.org/framework/en/installation/server-requirements) * [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/) - * [Bugtracker: Framework](https://github.com/silverstripe/sapphire/issues) + * [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues) * [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues) * [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues) * [Forums](http://silverstripe.org/forums) From 3cc6485c14bd8eb88b512131fa62f21e1d731228 Mon Sep 17 00:00:00 2001 From: Matt Peel Date: Tue, 21 May 2013 14:57:29 +1200 Subject: [PATCH 5/5] Add default params to _t() calls to ensure if a translation isn't found, it falls back to a useful English string --- javascript/CMSMain.Tree.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/javascript/CMSMain.Tree.js b/javascript/CMSMain.Tree.js index 73b41c5c..fb1b634f 100644 --- a/javascript/CMSMain.Tree.js +++ b/javascript/CMSMain.Tree.js @@ -29,7 +29,7 @@ var menuitems = { 'edit': { - 'label': ss.i18n._t('Tree.EditPage'), + 'label': ss.i18n._t('Tree.EditPage', 'Edit page', 100, 'Used in the context menu when right-clicking on a page node in the CMS tree'), 'action': function(obj) { $('.cms-container').entwine('.ss').loadPanel(ss.i18n.sprintf( self.data('urlEditpage'), obj.data('id') @@ -40,7 +40,7 @@ // Test if there are any allowed Children and thus the possibility of adding some if(allowedChildren.hasOwnProperty('allowedchildren-0')) { menuitems['addsubpage'] = { - 'label': ss.i18n._t('Tree.AddSubPage'), + 'label': ss.i18n._t('Tree.AddSubPage', 'Add page under this page', 100, 'Used in the context menu when right-clicking on a page node in the CMS tree'), 'submenu': allowedChildren }; }