[4.0] Markdown content entry

[jgerman-bot]

New language relevant PR in upstream repo: joomla/joomla-cms#31911 Here are the upstream changes:

Click to expand the diff!

diff --git a/administrator/language/en-GB/plg_editors_tinymce.ini b/administrator/language/en-GB/plg_editors_tinymce.ini
index 48cb89a26f61..773f9fed2239 100644
--- a/administrator/language/en-GB/plg_editors_tinymce.ini
+++ b/administrator/language/en-GB/plg_editors_tinymce.ini
@@ -50,6 +50,9 @@ PLG_TINY_FIELD_SKIN_ADMIN_LABEL="Administrator Skin"
 PLG_TINY_FIELD_SKIN_INFO_DESC="Copy your new skins to: /media/editors/tinymce/skins/ui."
 PLG_TINY_FIELD_SKIN_INFO_LABEL="For customised skins go to: <a href=\"http://skin.tiny.cloud\" target=\"_blank\">Skin Creator</a>"
 PLG_TINY_FIELD_SKIN_LABEL="Site Skin"
+;do not translate the word Markdown
+PLG_TINY_FIELD_TEXTPATTERN_DESC="Use Markdown syntax to compose content with links, lists, and other styles."
+PLG_TINY_FIELD_TEXTPATTERN_LABEL="Markdown"
 PLG_TINY_FIELD_TOOLBAR_MODE_LABEL="Toolbar Mode"
 PLG_TINY_FIELD_URLS_LABEL="URLs"
 PLG_TINY_FIELD_VALIDELEMENTS_DESC="Defines which elements will stay in the edited text when the editor saves (the default rule set for this option is a mixture of the full HTML5 and HTML4 specification)."
diff --git a/plugins/editors/tinymce/forms/setoptions.xml b/plugins/editors/tinymce/forms/setoptions.xml
index 387538e63455..4e348cd74fb0 100644
--- a/plugins/editors/tinymce/forms/setoptions.xml
+++ b/plugins/editors/tinymce/forms/setoptions.xml
@@ -234,6 +234,18 @@
 		<option value="1">JON</option>
 	</field>
 
+	<field
+		name="textpattern"
+		type="radio"
+		label="PLG_TINY_FIELD_TEXTPATTERN_LABEL"
+		description="PLG_TINY_FIELD_TEXTPATTERN_DESC"
+		layout="joomla.form.field.radio.switcher"
+		default="0"
+		>
+		<option value="0">JOFF</option>
+		<option value="1">JON</option>
+	</field>
+
 	<field
 		name="image_advtab"
 		type="radio"
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index 0dbd851f819f..5ada1c099cb1 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -500,7 +500,7 @@ public function onDisplay(
 		}
 
 		// Check for extra plugins, from the setoptions form
-		foreach (array('wordcount' => 1, 'advlist' => 1, 'autosave' => 1) as $pName => $def)
+		foreach (array('wordcount' => 1, 'advlist' => 1, 'autosave' => 1, 'textpattern' => 0) as $pName => $def)
 		{
 			if ($levelParams->get($pName, $def))
 			{