diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php index ca2d126a..2b697cac 100644 --- a/code/model/SiteTree.php +++ b/code/model/SiteTree.php @@ -1846,7 +1846,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid ), $tabMeta = new Tab('Metadata', $urlsegment, - new HeaderField('MetaTagsHeader',$this->fieldLabel('MetaTagsHeader')), new TextField("MetaTitle", $this->fieldLabel('MetaTitle')), new TextareaField("MetaKeywords", $this->fieldLabel('MetaKeywords'), 1), new TextareaField("MetaDescription", $this->fieldLabel('MetaDescription')), @@ -2006,10 +2005,9 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid $labels['Title'] = _t('SiteTree.PAGETITLE', "Page name"); $labels['MenuTitle'] = _t('SiteTree.MENUTITLE', "Navigation label"); - $labels['MetaTagsHeader'] = _t('SiteTree.METAHEADER', "Search Engine Meta-tags"); - $labels['MetaTitle'] = _t('SiteTree.METATITLE', "Title"); - $labels['MetaDescription'] = _t('SiteTree.METADESC', "Description"); - $labels['MetaKeywords'] = _t('SiteTree.METAKEYWORDS', "Keywords"); + $labels['MetaTitle'] = _t('SiteTree.METATITLE', "Meta Title"); + $labels['MetaDescription'] = _t('SiteTree.METADESC', "Meta Description"); + $labels['MetaKeywords'] = _t('SiteTree.METAKEYWORDS', "Meta Keywords"); $labels['ExtraMeta'] = _t('SiteTree.METAEXTRA', "Custom Meta Tags"); $labels['ClassName'] = _t('SiteTree.PAGETYPE', "Page type", PR_MEDIUM, 'Classname of a page object'); $labels['ParentType'] = _t('SiteTree.PARENTTYPE', "Page location", PR_MEDIUM); diff --git a/lang/en_US.php b/lang/en_US.php index b12df5ea..4f78c536 100644 --- a/lang/en_US.php +++ b/lang/en_US.php @@ -374,11 +374,10 @@ $lang['en_US']['SiteTree']['HomepageForDomain'] = 'Hompage for this domain'; $lang['en_US']['SiteTree']['INHERIT'] = 'Inherit from parent page'; $lang['en_US']['SiteTree']['LINKCHANGENOTE'] = 'Changing this page\'s link will also affect the links of all child pages.'; $lang['en_US']['SiteTree']['MENUTITLE'] = 'Navigation label'; -$lang['en_US']['SiteTree']['METADESC'] = 'Description'; +$lang['en_US']['SiteTree']['METADESC'] = 'Meta Description'; $lang['en_US']['SiteTree']['METAEXTRA'] = 'Custom Meta Tags'; -$lang['en_US']['SiteTree']['METAHEADER'] = 'Search Engine Meta-tags'; -$lang['en_US']['SiteTree']['METAKEYWORDS'] = 'Keywords'; -$lang['en_US']['SiteTree']['METATITLE'] = 'Title'; +$lang['en_US']['SiteTree']['METAKEYWORDS'] = 'Meta Keywords'; +$lang['en_US']['SiteTree']['METATITLE'] = 'Meta Title'; $lang['en_US']['SiteTree']['MODIFIEDONDRAFT'] = 'Modified on draft site'; $lang['en_US']['SiteTree']['NOTEUSEASHOMEPAGE'] = 'Use this page as the \'home page\' for the following domains: (separate multiple domains with commas)';