Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Better i18n for "new page" label (fixes #7796)

Also using better standard name for auto generated
page names ("Page" instead of "Site Tree",  "Pages" instead of "Site Tres" [sic])
  • Loading branch information...
commit 2e791abad2edf665792bebcfbcd8fcda1387ad4a 1 parent e6e2ab4
Ingo Schommer chillu authored
7 code/controllers/CMSMain.php
View
@@ -845,8 +845,11 @@ public function getNewItem($id, $setID = true) {
$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;
7 code/model/SiteTree.php
View
@@ -2709,14 +2709,17 @@ function i18n_singular_name() {
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;
}
6 lang/en.yml
View
@@ -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'
Please sign in to comment.
Something went wrong with that request. Please try again.