mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-09-06 09:41:12 +02:00
Merge remote-tracking branch 'origin/3.0'
This commit is contained in:
commit
0cb1c60a05
@ -845,8 +845,11 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
|
||||
$id = $id . $suffix;
|
||||
}
|
||||
|
||||
$newItem->Title = _t('CMSMain.NEW',"New ",'"New " followed by a className').$className;
|
||||
$newItem->URLSegment = "new-" . strtolower($className);
|
||||
$newItem->Title = _t(
|
||||
'CMSMain.NEWPAGE',
|
||||
"New {pagetype}",'followed by a page type title',
|
||||
array('pagetype' => singleton($className)->i18n_singular_name())
|
||||
);
|
||||
$newItem->ClassName = $className;
|
||||
$newItem->ParentID = $parentID;
|
||||
|
||||
|
@ -2709,14 +2709,17 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
|
||||
function provideI18nEntities() {
|
||||
$entities = parent::provideI18nEntities();
|
||||
|
||||
if(isset($entities['Page.SINGULARNAME'])) $entities['Page.SINGULARNAME'][3] = FRAMEWORK_DIR;
|
||||
if(isset($entities['Page.PLURALNAME'])) $entities['Page.PLURALNAME'][3] = FRAMEWORK_DIR;
|
||||
if(isset($entities['Page.SINGULARNAME'])) $entities['Page.SINGULARNAME'][3] = CMS_DIR;
|
||||
if(isset($entities['Page.PLURALNAME'])) $entities['Page.PLURALNAME'][3] = CMS_DIR;
|
||||
|
||||
$entities[$this->class . '.DESCRIPTION'] = array(
|
||||
$this->stat('description'),
|
||||
'Description of the page type (shown in the "add page" dialog)'
|
||||
);
|
||||
|
||||
$entities['SiteTree.SINGULARNAME'][0] = 'Page';
|
||||
$entities['SiteTree.PLURALNAME'][0] = 'Pages';
|
||||
|
||||
return $entities;
|
||||
}
|
||||
|
||||
|
@ -82,7 +82,7 @@ en:
|
||||
EMAIL: Email
|
||||
EditTree: 'Edit Tree'
|
||||
ListFiltered: 'Filtered list.'
|
||||
NEW: 'New '
|
||||
NEWPAGE: 'New {pagetype}'
|
||||
PAGENOTEXISTS: 'This page doesn''t exist'
|
||||
PAGES: Pages
|
||||
PAGETYPEANYOPT: Any
|
||||
@ -333,7 +333,7 @@ en:
|
||||
PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page'
|
||||
PERMISSION_GRANTACCESS_DESCRIPTION: 'Manage access rights for content'
|
||||
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'
|
||||
PageTypeNotAllowed: 'Page type "{type}" not allowed as child of this parent page'
|
||||
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.'
|
||||
SHOWINMENUS: 'Show in menus?'
|
||||
SHOWINSEARCH: 'Show in search?'
|
||||
SINGULARNAME: 'Site Tree'
|
||||
SINGULARNAME: Page
|
||||
TABBEHAVIOUR: Behavior
|
||||
TABCONTENT: 'Main Content'
|
||||
TABDEPENDENT: 'Dependent pages'
|
||||
|
Loading…
Reference in New Issue
Block a user