Merge pull request #3004 from Samorai/develop

Added translation for pageTitle into MailBrandSettings

modules/system/controllers/MailBrandSettings.php

@@ -54,7 +54,7 @@ class MailBrandSettings extends Controller
     {
         parent::__construct();
 
-        $this->pageTitle = 'Customize mail appearance';
+        $this->pageTitle = 'system::lang.mail_brand.page_title';
 
         BackendMenu::setContext('October.System', 'system', 'settings');
         SettingsManager::setContext('October.System', 'mail_brand_settings');
@@ -104,6 +104,7 @@ class MailBrandSettings extends Controller
         $data = [
             'subject' => Config::get('app.name'),
             'appName' => Config::get('app.name'),
+            'texts' => Lang::get('system::lang.mail_brand.sample_template')
         ];
 
         $layout = new MailLayout;

modules/system/lang/en/lang.php

@@ -228,6 +228,53 @@ return [
     'mail_brand' => [
         'menu_label' => 'Mail branding',
         'menu_description' => 'Modify the colors and appearance of mail templates.',
+        'page_title' => 'Customize mail appearance',
+        'sample_template' => [
+            'heading' => 'Heading',
+            'paragraph' => 'This is a paragraph filled with Lorem Ipsum and a link. Cumque dicta <a>doloremque eaque</a>, enim error laboriosam pariatur possimus tenetur veritatis voluptas.',
+            'table' => [
+                'item' => 'Item',
+                'description' => 'Description',
+                'price' => 'Price',
+                'centered' => 'Centered',
+                'right_aligned' => 'Right-Aligned'
+            ],
+            'buttons' => [
+                'primary' => 'Primary button',
+                'positive' => 'Positive button',
+                'negative' => 'Negative button',
+            ],
+            'panel' => 'How awesome is this panel?',
+            'more' => 'Some more text',
+            'promotion' => 'Coupon code: OCTOBER',
+            'subcopy' => 'This is the subcopy of the email',
+            'thanks' => 'Thanks'
+        ],
+        'fields' => [
+            '_section_background' => 'Background',
+            'body_bg' => 'Body background',
+            'content_bg' => 'Content background',
+            'content_inner_bg' => 'Inner content background',
+            '_section_buttons' => 'Buttons',
+            'button_text_color' => 'Button text color',
+            'button_primary_bg' => 'Primary button background',
+            'button_positive_bg' => 'Positive button background',
+            'button_negative_bg' => 'Negative button background',
+            '_section_type' => 'Typography',
+            'header_color' => 'Header color',
+            'heading_color' => 'Headings color',
+            'text_color' => 'Text color',
+            'link_color' => 'Link color',
+            'footer_color' => 'Footer color',
+            '_section_borders' => 'Borders',
+            'body_border_color' => 'Body border color',
+            'subcopy_border_color' => 'Subcopy border color',
+            'table_border_color' => 'Table border color',
+            '_section_components' => 'Components',
+            'panel_bg' => 'Panel background',
+            'promotion_bg' => 'Promotion background',
+            'promotion_border_color' => 'Promotion border color',
+        ]
     ],
     'install' => [
         'project_label' => 'Attach to Project',

modules/system/models/mailbrandsetting/fields.yaml

@@ -12,111 +12,111 @@ secondaryTabs:
     fields:
 
         _section_background:
-            label: Background
+            label: system::lang.mail_brand.fields._section_background
             type: section
 
         body_bg:
-            label: Body background
+            label: system::lang.mail_brand.fields.body_bg
             type: colorpicker
             availableColors: []
 
         content_bg:
-            label: Content background
+            label: system::lang.mail_brand.fields.content_bg
             type: colorpicker
             availableColors: []
 
         content_inner_bg:
-            label: Inner content background
+            label: system::lang.mail_brand.fields.content_inner_bg
             type: colorpicker
             availableColors: []
 
         _section_buttons:
-            label: Buttons
+            label: system::lang.mail_brand.fields._section_buttons
             type: section
 
         button_text_color:
-            label: Button text color
+            label: system::lang.mail_brand.fields.button_text_color
             type: colorpicker
             availableColors: []
 
         button_primary_bg:
-            label: Primary button background
+            label: system::lang.mail_brand.fields.button_primary_bg
             type: colorpicker
             availableColors: []
 
         button_positive_bg:
-            label: Positive button background
+            label: system::lang.mail_brand.fields.button_positive_bg
             type: colorpicker
             availableColors: []
 
         button_negative_bg:
-            label: Negative button background
+            label: system::lang.mail_brand.fields.button_negative_bg
             type: colorpicker
             availableColors: []
 
         _section_type:
-            label: Typography
+            label: system::lang.mail_brand.fields._section_type
             type: section
 
         header_color:
-            label: Header color
+            label: system::lang.mail_brand.fields.header_color
             type: colorpicker
             availableColors: []
 
         heading_color:
-            label: Headings color
+            label: system::lang.mail_brand.fields.heading_color
             type: colorpicker
             availableColors: []
 
         text_color:
-            label: Text color
+            label: system::lang.mail_brand.fields.text_color
             type: colorpicker
             availableColors: []
 
         link_color:
-            label: Link color
+            label: system::lang.mail_brand.fields.link_color
             type: colorpicker
             availableColors: []
 
         footer_color:
-            label: Footer color
+            label: system::lang.mail_brand.fields.footer_color
             type: colorpicker
             availableColors: []
 
         _section_borders:
-            label: Borders
+            label: system::lang.mail_brand.fields._section_borders
             type: section
 
         body_border_color:
-            label: Body border color
+            label: system::lang.mail_brand.fields.body_border_color
             type: colorpicker
             availableColors: []
 
         subcopy_border_color:
-            label: Subcopy border color
+            label: system::lang.mail_brand.fields.subcopy_border_color
             type: colorpicker
             availableColors: []
 
         table_border_color:
-            label: Table border color
+            label: system::lang.mail_brand.fields.table_border_color
             type: colorpicker
             availableColors: []
 
         _section_components:
-            label: Components
+            label: system::lang.mail_brand.fields._section_components
             type: section
 
         panel_bg:
-            label: Panel background
+            label: system::lang.mail_brand.fields.panel_bg
             type: colorpicker
             availableColors: []
 
         promotion_bg:
-            label: Promotion background
+            label: system::lang.mail_brand.fields.promotion_bg
             type: colorpicker
             availableColors: []
 
         promotion_border_color:
-            label: Promotion border color
+            label: system::lang.mail_brand.fields.promotion_border_color
             type: colorpicker
             availableColors: []

modules/system/models/mailbrandsetting/sample_template.htm

@@ -1,47 +1,45 @@
-# Heading 1
+# {{texts.heading}} 1
 
-This is a paragraph filled with Lorem Ipsum and a link.
-Cumque dicta <a>doloremque eaque</a>, enim error laboriosam pariatur possimus tenetur veritatis voluptas.
+{{texts.paragraph|raw}}
 
-## Heading 2
+## {{texts.heading}} 2
 
 {% partial 'table' body %}
-| Item          | Description   | Price    |
+| {{texts.table.item}}          | {{texts.table.description}}   | {{texts.table.price}}    |
 |:------------- |:-------------:| --------:|
-| Item 1        | Centered      | $10      |
-| Item 2        | Right-Aligned | $20      |
+| {{texts.table.item}} 1        | {{texts.table.centered}}      | $10      |
+| {{texts.table.item}} 2        | {{texts.table.right_aligned}} | $20      |
 {% endpartial %}
 
-### Heading 3
+### {{texts.heading}} 3
 
-This is a paragraph filled with Lorem Ipsum and a link.
-Cumque dicta <a>doloremque eaque</a>, enim error laboriosam pariatur possimus tenetur veritatis voluptas.
+{{texts.paragraph|raw}}
 
 {% partial 'button' url='javascript:;' body %}
-Primary button
+{{texts.buttons.primary}}
 {% endpartial %}
 
 {% partial 'button' type='positive' url='javascript:;' body %}
-Positive button
+{{texts.buttons.positive}}
 {% endpartial %}
 
 {% partial 'button' type='negative' url='javascript:;' body %}
-Negative button
+{{texts.buttons.negative}}
 {% endpartial %}
 
 {% partial 'panel' body %}
-How awesome is this panel?
+{{texts.panel}}
 {% endpartial %}
 
-Some more text
+{{texts.more}}
 
 {% partial 'promotion' body %}
-Coupon code: OCTOBER
+{{texts.promotion}}
 {% endpartial %}
 
-Thanks,
+{{texts.thanks}},
 {{ appName }}
 
 {% partial 'subcopy' body %}
-This is the subcopy of the email
+{{texts.subcopy}}
 {% endpartial %}