Merge branch '2.8' into 2

silverstripe · Jun 12, 2023 · 8d540f0 · 8d540f0
2 parents 8301ae2 + a1259e0
commit 8d540f0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/lang/en.yml b/lang/en.yml
@@ -24,6 +24,11 @@ en:
     MainFontFamily: 'Main font family'
     NavigationBarBackground: 'Navigation bar background'
     TextLinkColor: 'Text link colour'
+  CWP\AgencyExtensions\Extensions\CarouselPageExtension:
+    ADDNEW: 'Add new'
+    NOTE: 'Carousel functionality will automatically be loaded when 2 or more items are added below'
+    TITLE: Hero/Carousel
+    TITLE_NOTE: 'Used by screen readers'
   CWP\AgencyExtensions\Model\CarouselItem:
     CONTENT_HELPTIP: 'Recommended: Use less than 50 words. For carousel slides, use a similar amount of content as other items to ensure carousel height does not vary.'
     IMAGE_HELPTIP: 'Recommended: Use high resolution images greater than 1600x900px.'
@@ -34,11 +39,6 @@ en:
     PRIMARYCALLTOACTION: 'Primary Call To Action Link'
     SECONDARYCALLTOACTION: 'Secondary Call To Action Link'
     SINGULARNAME: 'Carousel Item'
-  CarouselPageExtension:
-    php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionADDNEW: 'Add new'
-    php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionNOTE: 'NOTE: Carousel functionality will automatically be loaded when 2 or more items are added below'
-    php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionTITLE: Hero/Carousel
-    php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionTITLE_NOTE: 'Used by screen readers'
   CwpConfig:
     AppleIconField144: 'Apple Touch Web Clip and Windows 8 Tile Icon (dimensions of 144x144, PNG format)'
     FooterLogoLinkDesc: 'Please include the protocol (ie, http:// or https://) unless it is an internal link.'

diff --git a/lang/eo.yml b/lang/eo.yml
@@ -44,11 +44,6 @@ eo:
   CWP:
     SITECONFIG.EmptySearch: 'Teksto vidigota kiam mankas serĉpeto'
     SITECONFIG.NoResult: 'Teksto vidigota kiam mankas rezultoj'
-  CarouselPageExtension:
-    php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionADDNEW: 'Aldoni novan'
-    php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionNOTE: 'NOTU: Karusela funkciado aŭtomate ŝarĝiĝos kiam 2 aŭ pliaj elementoj aldoniĝos sube'
-    php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionTITLE: Heroo/Karuselo
-    php.CWP\AgencyExtensions\Extensions\CarouselPageExtensionTITLE_NOTE: 'Uzota de ekranlegiloj'
   CwpConfig:
     AppleIconField144: 'Apple Touch Web Clip kaj Windows 8 Tile emblemo (dimensioj 144x144, PNG formato)'
     FooterLogoLinkDesc: 'Bonvolu inkludi la protokolon (t.e. http:// aŭ https://) krom se ĝi estas interna ligilo.'

diff --git a/src/Extensions/CarouselPageExtension.php b/src/Extensions/CarouselPageExtension.php
@@ -48,17 +48,17 @@ public function updateCMSFields(FieldList $fields)
     {
         $gridField = GridField::create(
             'CarouselItems',
-            _t(__CLASS__ . 'TITLE', 'Hero/Carousel'),
+            _t(__CLASS__ . '.TITLE', 'Hero/Carousel'),
             $this->getCarouselItems(),
             GridFieldConfig_RelationEditor::create()
         );
         $gridField->setDescription(_t(
-            __CLASS__ . 'NOTE',
+            __CLASS__ . '.NOTE',
             'Carousel functionality will automatically be loaded when 2 or more items are added below'
         ));
         $gridConfig = $gridField->getConfig();
         $gridConfig->getComponentByType(GridFieldAddNewButton::class)->setButtonName(
-            _t(__CLASS__ . 'ADDNEW', 'Add new')
+            _t(__CLASS__ . '.ADDNEW', 'Add new')
         );
         $gridConfig->removeComponentsByType(GridFieldAddExistingAutocompleter::class);
         $gridConfig->removeComponentsByType(GridFieldDeleteAction::class);
@@ -69,12 +69,12 @@ public function updateCMSFields(FieldList $fields)
 
         $fields->findOrMakeTab(
             'Root.Carousel',
-            _t(__CLASS__ . 'TITLE', 'Hero/Carousel')
+            _t(__CLASS__ . '.TITLE', 'Hero/Carousel')
         );
 
         $titleField = TextField::create('CarouselTitle', 'Carousel Title');
         $titleField->setDescription(_t(
-            __CLASS__ . 'TITLE_NOTE',
+            __CLASS__ . '.TITLE_NOTE',
             'Used by screen readers'
         ));