Skip to content

Commit 312d883

Browse files
committed
* fixed forgotten renamed a parameter
* adjusted warning text for rendering options
1 parent 3efed7e commit 312d883

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Locale/en_GB/translations.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
'WysiwygMDEditor_SETTINGS_RENDERING_DESCR' => 'Choose whether to use custom rendering for markdown fields.
5454
* Rendering feature is implemented entirely client side, it uses JavaScript and utilizes a specific editor visualization.
5555
* All markdown fields on the page will be processed, including those that are dynamically created or changed. Loading the page might be a bit slow if there are many of them.
56-
* <span style="border: 2px solid red; padding: 2px">If you have the **`MarkdownPlus`** plugin installed, then enabling this rendering feature will **`CONFLICT or OVERRIDE`** it\'s functionality, depending on the order in which the plugins are loaded !</span>',
56+
* <span style="border: 2px solid red; padding: 2px">If you have the **`MarkdownPlus`** plugin installed, then enabling this rendering feature will **`CONFLICT or OVERRIDE`** it\'s functionality,
57+
depending on the order in which the plugins are loaded !</span><br>⚠ So, **make up your mind** which one you prefer to use ! ⚠',
5758
'WysiwygMDEditor_SETTINGS_RENDERING_ENABLE_EASYMDE' => 'Enable markdown rendering with EasyMDE',
5859
'WysiwygMDEditor_SETTINGS_RENDERING_EASYMDE_DESCR' => 'Rendered markdown fields will look like the preview pane of the EasyMDE editor.
5960
* The render theme can is configured independently of the selected theme for the EasyMDE editor.

Locale/en_US/translations.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
'WysiwygMDEditor_SETTINGS_RENDERING_DESCR' => 'Choose whether to use custom rendering for markdown fields.
5454
* Rendering feature is implemented entirely client side, it uses JavaScript and utilizes a specific editor visualization.
5555
* All markdown fields on the page will be processed, including those that are dynamically created or changed. Loading the page might be a bit slow if there are many of them.
56-
* <span style="border: 2px solid red; padding: 2px">If you have the **`MarkdownPlus`** plugin installed, then enabling this rendering feature will **`CONFLICT or OVERRIDE`** it\'s functionality, depending on the order in which the plugins are loaded !</span>',
56+
* <span style="border: 2px solid red; padding: 2px">If you have the **`MarkdownPlus`** plugin installed, then enabling this rendering feature will **`CONFLICT or OVERRIDE`** it\'s functionality,
57+
depending on the order in which the plugins are loaded !</span><br>⚠ So, **make up your mind** which one you prefer to use ! ⚠',
5758
'WysiwygMDEditor_SETTINGS_RENDERING_ENABLE_EASYMDE' => 'Enable markdown rendering with EasyMDE',
5859
'WysiwygMDEditor_SETTINGS_RENDERING_EASYMDE_DESCR' => 'Rendered markdown fields will look like the preview pane of the EasyMDE editor.
5960
* The render theme can is configured independently of the selected theme for the EasyMDE editor.

Plugin.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function initialize()
4343
}
4444
}
4545

46-
if ($this->configModel->get('WysiwygMDEditor_enable_rendering_easymde', '0') == '1') {
46+
if ($this->configModel->get('WysiwygMDEditor_enable_easymde_rendering', '0') == '1') {
4747
//CSS
4848
$this->hook->on('template:layout:css', array('template' => 'plugins/WysiwygMDEditor/Assets/easymde/container.css'));
4949

0 commit comments

Comments
 (0)