Added additional missing editor translations

- Also merged StyleCI fixes

As per #3342

diff --git a/resources/lang/en/editor.php b/resources/lang/en/editor.php
index 7160af22da50d3edea11b33d1c1b99f4f194ebc7..82712029210ebeec005dbf5530d8ad4c0918c042 100644 (file)
--- a/resources/lang/en/editor.php
+++ b/resources/lang/en/editor.php
@@ -24,6 +24,7 @@ return [
     'width' => 'Width',
     'height' => 'Height',
     'More' => 'More',
     'width' => 'Width',
     'height' => 'Height',
     'More' => 'More',

+    'select' => 'Select...',

 
     // Toolbar
     'formats' => 'Formats',
 
     // Toolbar
     'formats' => 'Formats',


@@ -92,7 +93,10 @@ return [
     'cell_properties_title' => 'Cell Properties',
     'cell_type' => 'Cell type',
     'cell_type_cell' => 'Cell',
     'cell_properties_title' => 'Cell Properties',
     'cell_type' => 'Cell type',
     'cell_type_cell' => 'Cell',

+    'cell_scope' => 'Scope',

     'cell_type_header' => 'Header cell',
     'cell_type_header' => 'Header cell',

+    'merge_cells' => 'Merge cells',
+    'split_cell' => 'Split cell',

     'table_row_group' => 'Row Group',
     'table_column_group' => 'Column Group',
     'horizontal_align' => 'Horizontal align',
     'table_row_group' => 'Row Group',
     'table_column_group' => 'Column Group',
     'horizontal_align' => 'Horizontal align',


@@ -120,6 +124,16 @@ return [
     'caption' => 'Caption',
     'show_caption' => 'Show caption',
     'constrain' => 'Constrain proportions',
     'caption' => 'Caption',
     'show_caption' => 'Show caption',
     'constrain' => 'Constrain proportions',

+    'cell_border_solid' => 'Solid',
+    'cell_border_dotted' => 'Dotted',
+    'cell_border_dashed' => 'Dashed',
+    'cell_border_double' => 'Double',
+    'cell_border_groove' => 'Groove',
+    'cell_border_ridge' => 'Ridge',
+    'cell_border_inset' => 'Inset',
+    'cell_border_outset' => 'Outset',
+    'cell_border_none' => 'None',
+    'cell_border_hidden' => 'Hidden',

 
     // Images, links, details/summary & embed
     'source' => 'Source',
 
     // Images, links, details/summary & embed
     'source' => 'Source',


@@ -140,6 +154,7 @@ return [
     'toggle_label' => 'Toggle label',
 
     // About view
     'toggle_label' => 'Toggle label',
 
     // About view

+    'about' => 'About the editor',

     'about_title' => 'About the WYSIWYG Editor',
     'editor_license' => 'Editor License & Copyright',
     'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under an LGPL v2.1 license.',
     'about_title' => 'About the WYSIWYG Editor',
     'editor_license' => 'Editor License & Copyright',
     'editor_tiny_license' => 'This editor is built using :tinyLink which is provided under an LGPL v2.1 license.',

diff --git a/tests/Entity/ExportTest.php b/tests/Entity/ExportTest.php
index f96ff97faddd6c7822a492ea41eaecbef9d9e9eb..141f072f8f27b3ff5bb695f9110adb2bf23d19bd 100644 (file)
--- a/tests/Entity/ExportTest.php
+++ b/tests/Entity/ExportTest.php
@@ -435,7 +435,7 @@ class ExportTest extends TestCase
         $pageB->save();
 
         $resp = $this->get($book->getUrl('/export/markdown'));
         $pageB->save();
 
         $resp = $this->get($book->getUrl('/export/markdown'));

-        $resp->assertDontSee("hello tester# The second page in this test");
+        $resp->assertDontSee('hello tester# The second page in this test');

         $resp->assertSee("hello tester\n\n# The second page in this test");
     }
 
         $resp->assertSee("hello tester\n\n# The second page in this test");
     }