Merge pull request #11 from open-sausages/pulls/block-type-name

Rename element type to "Media"
dynamic · Feb 14, 2019 · db4b6ab · db4b6ab
2 parents cad0576 + 025198b
commit db4b6ab
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/lang/_manifest_exclude b/lang/_manifest_exclude
diff --git a/lang/en.yml b/lang/en.yml
@@ -0,0 +1,9 @@
+en:
+  Dynamic\Elements\Oembed\Elements\ElementOembed:
+    BlockType: Media
+    PLURALNAME: Media Elements
+    PLURALS:
+      one: 'A Media Element'
+      other: '{count} Media Elements'
+    SINGULARNAME: Media Element
+    EmbeddedObjectLabel: Content from oEmbed URL
diff --git a/src/Elements/ElementOembed.php b/src/Elements/ElementOembed.php
@@ -15,16 +15,6 @@ class ElementOembed extends BaseElement
      */
     private static $icon = 'font-icon-block-media';
 
-    /**
-     * @return string
-     */
-    private static $singular_name = 'oEmbed Element';
-
-    /**
-     * @return string
-     */
-    private static $plural_name = 'oEmbed Elements';
-
     /**
      * @var string
      */
@@ -46,6 +36,14 @@ class ElementOembed extends BaseElement
      */
     private static $inline_editable = false;
 
+    public function fieldLabels($includerelations = true)
+    {
+        $labels = parent::fieldLabels($includerelations);
+        $labels['EmbeddedObject'] = _t(__CLASS__ . '.EmbeddedObjectLabel', 'Content from oEmbed URL');
+
+        return $labels;
+    }
+
     /**
      * @return FieldList
      */
@@ -55,7 +53,7 @@ public function getCMSFields()
 
         $fields->replaceField(
             'EmbeddedObjectID',
-            EmbeddedObjectField::create('EmbeddedObject', 'Content from oEmbed URL', $this->EmbeddedObject())
+            EmbeddedObjectField::create('EmbeddedObject', $this->fieldLabel('EmbeddedObject'), $this->EmbeddedObject())
         );
 
         return $fields;
@@ -88,6 +86,6 @@ protected function provideBlockSchema()
      */
     public function getType()
     {
-        return _t(__CLASS__.'.BlockType', 'oEmbed');
+        return _t(__CLASS__.'.BlockType', 'Media');
     }
 }
diff --git a/tests/Elements/ElementOembedTest.php b/tests/Elements/ElementOembedTest.php
@@ -41,6 +41,6 @@ public function testGetSummary()
     public function testGetType()
     {
         $object = $this->objFromFixture(ElementOembed::class, 'one');
-        $this->assertEquals($object->getType(), 'oEmbed');
+        $this->assertEquals($object->getType(), 'Media');
     }
 }