tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.0'

Browse Source
This commit is contained in:
Ingo Schommer 2012-08-20 22:26:05 +02:00
commit 0cb1c60a05
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/controllers/CMSMain.php
View File

@ -845,8 +845,11 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
$id = $id . $suffix; $id = $id . $suffix;
} }
$newItem->Title = _t('CMSMain.NEW',"New ",'"New " followed by a className').$className; $newItem->Title = _t(
$newItem->URLSegment = "new-" . strtolower($className); 'CMSMain.NEWPAGE',
"New {pagetype}",'followed by a page type title',
array('pagetype' => singleton($className)->i18n_singular_name())
);
$newItem->ClassName = $className; $newItem->ClassName = $className;
$newItem->ParentID = $parentID; $newItem->ParentID = $parentID;

7
code/model/SiteTree.php
View File

@ -2709,14 +2709,17 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
function provideI18nEntities() { function provideI18nEntities() {
$entities = parent::provideI18nEntities(); $entities = parent::provideI18nEntities();
if(isset($entities['Page.SINGULARNAME'])) $entities['Page.SINGULARNAME'][3] = FRAMEWORK_DIR; if(isset($entities['Page.SINGULARNAME'])) $entities['Page.SINGULARNAME'][3] = CMS_DIR;
if(isset($entities['Page.PLURALNAME'])) $entities['Page.PLURALNAME'][3] = FRAMEWORK_DIR; if(isset($entities['Page.PLURALNAME'])) $entities['Page.PLURALNAME'][3] = CMS_DIR;
$entities[$this->class . '.DESCRIPTION'] = array( $entities[$this->class . '.DESCRIPTION'] = array(
$this->stat('description'), $this->stat('description'),
'Description of the page type (shown in the "add page" dialog)' 'Description of the page type (shown in the "add page" dialog)'
); );
$entities['SiteTree.SINGULARNAME'][0] = 'Page';
$entities['SiteTree.PLURALNAME'][0] = 'Pages';
return $entities; return $entities;
} }

6
lang/en.yml
View File

@ -82,7 +82,7 @@ en:
EMAIL: Email EMAIL: Email
EditTree: 'Edit Tree' EditTree: 'Edit Tree'
ListFiltered: 'Filtered list.' ListFiltered: 'Filtered list.'
NEW: 'New ' NEWPAGE: 'New {pagetype}'
PAGENOTEXISTS: 'This page doesn''t exist' PAGENOTEXISTS: 'This page doesn''t exist'
PAGES: Pages PAGES: Pages
PAGETYPEANYOPT: Any PAGETYPEANYOPT: Any
@ -333,7 +333,7 @@ en:
PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page' PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page'
PERMISSION_GRANTACCESS_DESCRIPTION: 'Manage access rights for content' PERMISSION_GRANTACCESS_DESCRIPTION: 'Manage access rights for content'
PERMISSION_GRANTACCESS_HELP: 'Allow setting of page-specific access restrictions in the "Pages" section.' PERMISSION_GRANTACCESS_HELP: 'Allow setting of page-specific access restrictions in the "Pages" section.'
PLURALNAME: 'Site Tres' PLURALNAME: Pages
PageTypNotAllowedOnRoot: 'Page type "{type}" is not allowed on the root level' PageTypNotAllowedOnRoot: 'Page type "{type}" is not allowed on the root level'
PageTypeNotAllowed: 'Page type "{type}" not allowed as child of this parent page' PageTypeNotAllowed: 'Page type "{type}" not allowed as child of this parent page'
REMOVEDFROMDRAFTHELP: 'Page is published, but has been deleted from draft' REMOVEDFROMDRAFTHELP: 'Page is published, but has been deleted from draft'
@ -343,7 +343,7 @@ en:
REORGANISE_HELP: 'Rearrange pages in the site tree through drag&drop.' REORGANISE_HELP: 'Rearrange pages in the site tree through drag&drop.'
SHOWINMENUS: 'Show in menus?' SHOWINMENUS: 'Show in menus?'
SHOWINSEARCH: 'Show in search?' SHOWINSEARCH: 'Show in search?'
SINGULARNAME: 'Site Tree' SINGULARNAME: Page
TABBEHAVIOUR: Behavior TABBEHAVIOUR: Behavior
TABCONTENT: 'Main Content' TABCONTENT: 'Main Content'
TABDEPENDENT: 'Dependent pages' TABDEPENDENT: 'Dependent pages'