Permalink
Browse files

Merge remote-tracking branch 'origin/3.0' into 3.1

Conflicts:
	javascript/CMSMain.Tree.js
  • Loading branch information...
2 parents 206f09a + 2809b00 commit bd86ff848c22d3c588b1a3273e008152bf65ac66 @chillu chillu committed May 31, 2013
Showing with 21 additions and 13 deletions.
  1. +2 −2 README.md
  2. +8 −0 _config/i18n.yml
  3. +11 −11 javascript/CMSMain.Tree.js
View
@@ -2,7 +2,7 @@
[![Build Status](https://secure.travis-ci.org/silverstripe/silverstripe-cms.png?branch=3.1)](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)
View
@@ -0,0 +1,8 @@
+---
+Name: cmsi18n
+Before: '/i18n'
+After: '/i18n#basei18n'
+---
+i18n:
+ module_priority:
+ - cms
View
@@ -9,15 +9,15 @@
'items': function(node) {
var menuitems = {
- 'edit': {
- 'label': ss.i18n._t('Tree.EditPage'),
- 'action': function(obj) {
- $('.cms-container').entwine('.ss').loadPanel(ss.i18n.sprintf(
- self.data('urlEditpage'), obj.data('id')
- ));
+ 'edit': {
+ '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')
+ ));
+ }
}
- }
- };
+ };
// Add "show as list"
if(!node.hasClass('nochildren')) {
@@ -72,9 +72,9 @@
if(hasAllowedChildren) {
menuitems['addsubpage'] = {
- 'label': ss.i18n._t('Tree.AddSubPage'),
- 'submenu': menuAllowedChildren
- };
+ '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': menuAllowedChildren
+ };
}
menuitems['duplicate'] = {

0 comments on commit bd86ff8

Please sign in to comment.