From 9822807a58c30299fc355af632c1794a1f026f62 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Tue, 26 Sep 2017 14:49:05 +1300
Subject: [PATCH] FIX Add localisation for missing SITECONTENTLEFT and run text
 collector

---
 lang/en.yml                           | 31 +++++++++++++++------------
 src/Extension/LeftAndMainSubsites.php |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/lang/en.yml b/lang/en.yml
index 981a53a..4b53441 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -3,17 +3,12 @@ en:
     SUBSITENOTICE: 'Folders and files created in the main site are accessible by all subsites.'
   DomainNameField:
     INVALID_DOMAIN: 'Invalid domain name'
-  GridFieldAddFromTemplateButton:
-    AddFromTemplate: 'Add New from Template'
-  LeftAndMain_Menu:
-    Hello: Hi
-    LOGOUT: 'Log out'
   SilverStripe\CMS\Model\VirtualPage:
     EDITCONTENT: 'Click here to edit the content'
   SilverStripe\Subsites\Admin\SubsiteAdmin:
     MENUTITLE: Subsites
   SilverStripe\Subsites\Controller\SubsiteXHRController:
-    MENUTITLE: SubsiteXHRController
+    MENUTITLE: SilverStripe\Subsites\Controller\SubsiteXHRController
   SilverStripe\Subsites\Extensions\FileSubsites:
     AllSitesDropdownOpt: 'All sites'
     SubsiteFieldLabel: Subsite
@@ -26,6 +21,7 @@ en:
     MANAGE_SUBSITES_HELP: 'Ability to limit the permissions for a group to one or more subsites.'
     SECURITYTABTITLE: Subsites
   SilverStripe\Subsites\Extensions\LeftAndMainSubsites:
+    SITECONTENTLEFT: 'Site Content'
     Saved: 'Saved, please update related pages.'
   SilverStripe\Subsites\Extensions\SiteTreeSubsites:
     CopyAction: Copy
@@ -33,30 +29,31 @@ en:
     CopyToSubsiteWithChildren: 'Include children pages?'
     SubsiteOperations: 'Subsite Operations'
   SilverStripe\Subsites\Model\Subsite:
-    COPYSTRUCTURE: 'Copy structure from:'
     CopyMessage: 'Created a copy of {title}'
     CustomExtraMeta: 'Custom Meta Tags'
     CustomMetaDescription: Description
     CustomMetaKeywords: Keywords
     CustomMetaTitle: Title
-    DOMAINSAVEFIRST: 'You can only add domains after saving for the first time'
-    DomainsHeadline: 'Domains for this subsite'
     DomainsListTitle: Domains
-    IsPublicHeaderField: 'Active subsite'
-    NOTEMPLATE: 'No template'
     PLURALNAME: Subsites
+    PLURALS:
+      one: 'A Subsite'
+      other: '{count} Subsites'
     PageTypeBlacklistField: 'Disallow page types?'
     SINGULARNAME: Subsite
     SiteConfigSubtitle: 'Your tagline here'
     SiteConfigTitle: 'Your Site Name'
     SubsiteConfigurationHeader: 'Subsite Configuration'
-    TabTitleConfig: Configuration
+    ThemeFieldEmptyString: '-'
     ValidateTitle: 'Please add a "Title"'
   SilverStripe\Subsites\Model\SubsiteDomain:
     DOMAIN: Domain
     DOMAIN_DESCRIPTION: 'Hostname of this subsite (exclude protocol). Allows wildcards (*).'
     IS_PRIMARY: 'Is Primary Domain?'
     PLURALNAME: 'Subsite Domains'
+    PLURALS:
+      one: 'A Subsite Domain'
+      other: '{count} Subsite Domains'
     PROTOCOL_AUTOMATIC: Automatic
     PROTOCOL_DESCRIPTION: 'Mark this as the default domain for this subsite'
     PROTOCOL_HTTP: 'http://'
@@ -65,11 +62,18 @@ en:
     SINGULARNAME: 'Subsite Domain'
   SilverStripe\Subsites\Pages\SubsitesVirtualPage:
     DESCRIPTION: 'Displays the content of a page on another subsite'
-    PLURALNAME: 'Base Pages'
+    OverrideNote: 'Overrides inherited value from the source'
+    PLURALNAME: 'Subsites Virtual Pages'
+    PLURALS:
+      one: 'A Subsites Virtual Page'
+      other: '{count} Subsites Virtual Pages'
     SINGULARNAME: 'Subsites Virtual Page'
     SubsiteField: Subsite
   SilverStripe\Subsites\Reports\SubsiteReportWrapper:
     ReportDropdown: Sites
+  Subsite:
+    COPYSTRUCTURE: 'Copy structure from:'
+    NOTEMPLATE: 'No template'
   Subsites:
     DefaultSiteFieldLabel: 'Default site'
     DomainFieldLabel: Domain
@@ -79,6 +83,5 @@ en:
     PageTypeBlacklistFieldLabel: 'Page Type Blacklist'
     PrimaryDomainFieldLabel: 'Primary Domain'
     RedirectURLFieldLabel: 'Redirect URL'
-    ThemeFieldEmptyString: ''
     ThemeFieldLabel: Theme
     TitleFieldLabel: 'Subsite Name'
diff --git a/src/Extension/LeftAndMainSubsites.php b/src/Extension/LeftAndMainSubsites.php
index f4c3ad9..f86e3a4 100644
--- a/src/Extension/LeftAndMainSubsites.php
+++ b/src/Extension/LeftAndMainSubsites.php
@@ -54,7 +54,7 @@ class LeftAndMainSubsites extends LeftAndMainExtension
     public function getCMSTreeTitle()
     {
         $subsite = Subsite::currentSubsite();
-        return $subsite ? Convert::raw2xml($subsite->Title) : _t('SilverStripe\\Admin\\LeftAndMain.SITECONTENTLEFT');
+        return $subsite ? Convert::raw2xml($subsite->Title) : _t(__CLASS__.'.SITECONTENTLEFT', 'Site Content');
     }
 
     public function updatePageOptions(&$fields)