added chinese+french translation: tested wp 5.2

Author: AndiDittrich

Dockerfile

@@ -1,4 +1,4 @@
-FROM andidittrich/wp-dev:latest
+FROM wp-dev
 
 # copy release files
-COPY --chown="www-data:www-data" dist/ /srv/app/wp-content/plugins/enlighter
+COPY --chown="www-data:www-data" dist/ /srv/app/public/wp-content/plugins/enlighter

Enlighter.php

@@ -5,7 +5,7 @@
     Domain Path: /lang
     Text Domain: enlighter
     Description: All-in-one Syntax Highlighting solution. Full Gutenberg and Classic Editor integration. Graphical theme customizer. Based on EnlighterJS.
-    Version: 3.10.0-BETA1
+    Version: 3.10.0
     Author: Andi Dittrich
     Author URI: https://andidittrich.de
     License: MIT X11-License
@@ -24,7 +24,7 @@
 */
 
 define('ENLIGHTER_INIT', true);
-define('ENLIGHTER_VERSION', '3.10.0-BETA1');
+define('ENLIGHTER_VERSION', '3.10.0');
 define('ENLIGHTER_PLUGIN_PATH', dirname(__FILE__));
 define('ENLIGHTER_PLUGIN_URL', plugins_url('/enlighter/'));
 

README.md

@@ -3,7 +3,7 @@ Contributors: Andi Dittrich, aenondynamics
 Tags: syntax highlighting, javascript, code, coding, sourcecode, mootools, jquery, customizable, visual editor, tinymce, themes, css, html, php, js, xml, c, cpp, c#, ruby, shell, java, python, sql, rust, matlab, json, ini, config, cython, lua, assembly, asm
 Donate link: https://enlighterjs.org
 Requires at least: 3.9
-Tested up to: 5.1
+Tested up to: 5.2
 Stable tag: 3.10.0
 License: MIT X11-License
 License URI: http://opensource.org/licenses/MIT
@@ -13,9 +13,12 @@ All-in-one Syntax Highlighting solution. Full Gutenberg and Classic Editor integ
 ## Description ##
 
 Enlighter is a free, easy-to-use, syntax highlighting tool for WordPress. Highlighting is powered by the [EnlighterJS](http://enlighterjs.org) javascript library to provide a beautiful code-appearance.
+
 Using it can be as simple as adding a new Enlighter Sourcecode block (Gutenberg) and insert the code which you want to highlight: Enlighter takes care of the rest!
+
 An easy to use Theme-Customizer is included to modify the build-in themes **without any css knowlegde!**
 It also supports the automatic creation of tab-panes to display code-groups together (useful for multi-language examples - e.g. html+css+js)
+
 [Theme Demo](https://enlighterjs.org/Theme.Enlighter.html "EnlighterJS Theme Browser") - [Language Examples](https://enlighterjs.org/Language.Javascript.html "EnlighterJS Language Example")
 
 ### Plugin Features ###

build.xml

@@ -105,7 +105,7 @@
 
         <!-- Run Webserver !-->
         <exec executable="docker" failonerror="true">
-            <arg line="run --name enlighter-test -p 8080:8080 --rm -e WP_DSN=${WP.DSN} --interactive enlighter-test"/>
+            <arg line="run --name enlighter-test-env -p 8080:8080 --rm -e WP_DSN=${WP.DSN} --interactive enlighter-test"/>
         </exec>
     </target>
 

class/CompatibilityModeFilter.php

@@ -7,7 +7,7 @@
     Plugin URI: http://andidittrich.de/go/enlighterjs
     License: MIT X11-License
     
-    Copyright (c) 2018, Andi Dittrich
+    Copyright (c) 2018-2019, Andi Dittrich
 
     Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
     
@@ -29,7 +29,8 @@ public function __construct($settingsUtil){
         $this->_defaultLanguage = $settingsUtil->getOption('compatDefaultLanguage');
     }
 
-    private function getCompatRegex(){
+    // used by e.g. JetPack markdown
+    private function getCompatRegexType1(){
         // opening tag, language identifier (optional)
         return '/<pre><code(?:\s+class="([a-z]+)")?>' .
 
@@ -43,6 +44,30 @@ private function getCompatRegex(){
         '/Uim';
     }
 
+    // used by e.g. Gutenberg Codeblock
+    private function getCompatRegexType2(){
+        // opening tag - no language identifier
+        return '/<pre(?:[^>]+?)?><code>' .
+
+        // arbitrary multi-line content
+        '([\S\s]*)' .
+
+        // closing tags
+        '\s*<\/code>\s*<\/pre>\s*' .
+
+        // ungreedy, case insensitive, multiline
+        '/Uim';
+    }
+
+    // used by e.g. Crayon
+    private function getCompatRegexType3(){
+        // opening tag, language identifier (optional)
+        return '/<pre\s+class="lang:([a-z]+?)([^"]*)"\s*>' .
+
+        // case insensitive, multiline
+        '/im';
+    }
+
 
     // strip the content
     // internal regex function to replace gfm code sections with placeholders
@@ -52,7 +77,7 @@ public function stripCodeFragments($content){
         $T = $this;
 
         // Block Code
-        return preg_replace_callback($this->getCompatRegex(), function ($match) use ($T){
+        return preg_replace_callback($this->getCompatRegexType1(), function ($match) use ($T){
 
             // language identifier (tagname)
             $lang = $match[1];

lang/Enlighter.pot

@@ -2,10 +2,10 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2019-01-13 16:44:28+00:00\n"
+"POT-Creation-Date: 2019-04-29 11:32:44+00:00\n"
 "PO-Revision-Date: 2019-MO-DA HO:MI+ZONE\n"
 "MIME-Version: 1.0\n"
-"Project-Id-Version: Enlighter  3.9.0\n"
+"Project-Id-Version: Enlighter  3.10.0\n"
 "Report-Msgid-Bugs-To: andi DOT dittrich AT a3non DOT org\n"
 "Last-Translator:  Andi Dittrich\n"
 

lang/enlighter-fr_FR.mo

@@ -3,52 +3,77 @@ Contributors: Andi Dittrich, aenondynamics
 Tags: syntax highlighting, javascript, code, coding, sourcecode, mootools, jquery, customizable, visual editor, tinymce, themes, css, html, php, js, xml, c, cpp, c#, ruby, shell, java, python, sql, rust, matlab, json, ini, config, cython, lua, assembly, asm
 Donate link: https://enlighterjs.org
 Requires at least: 3.9
-Tested up to: 5.0
-Stable tag: 3.9.0
+Tested up to: 5.2
+Stable tag: 3.10.0
 License: MIT X11-License
 License URI: http://opensource.org/licenses/MIT
 
 All-in-one Syntax Highlighting solution. Full Gutenberg and Classic Editor integration. Graphical theme customizer. Based on EnlighterJS.
 
 == Description ==
 
-Enlighter is a free, easy-to-use, syntax highlighting tool for WordPress. It's build in PHP and uses the Javascript based [EnlighterJS](http://enlighterjs.org) library to provide a beautiful code-appearance.
-Using it can be as simple as selecting an editor style or adding shortcode around your scripts which you want to highlight and Enlighter takes care of the rest. An easy to use Theme-Customizer is included to modify the build-in themes **without any css knowlegde!**
+Enlighter is a free, easy-to-use, syntax highlighting tool for WordPress. Highlighting is powered by the [EnlighterJS](http://enlighterjs.org) javascript library to provide a beautiful code-appearance.
+
+Using it can be as simple as adding a new Enlighter Sourcecode block (Gutenberg) and insert the code which you want to highlight: Enlighter takes care of the rest!
+
+An easy to use Theme-Customizer is included to modify the build-in themes **without any css knowlegde!**
 It also supports the automatic creation of tab-panes to display code-groups together (useful for multi-language examples - e.g. html+css+js)
+
 [Theme Demo](https://enlighterjs.org/Theme.Enlighter.html "EnlighterJS Theme Browser") - [Language Examples](https://enlighterjs.org/Language.Javascript.html "EnlighterJS Language Example")
 
 = Plugin Features =
 
-* **Full Gutenberg Editor Integration** (currently beta)
+* **Full Gutenberg Editor Integration**
 * **Full Classic Editor Integration** (TinyMCE)
-* Support for all common used languages including powerful generic highlighting
+* Support for all common used languages
+* Powerful generic highlighting engine for unknown languages
 * Theme Customizer including **LIVE Preview Mode**
 * Inline Syntax Highlighting
-* Tab-Indentation mode to align code with the `tab` key (single line and block selection)
-* Markdown fenced code blocks
 * [bbPress](https://bbpress.org/) shortcode + markdown code blocks support
-* Shortcodes within content, comments and widgets
-* Easy to use Text-Editor mode through the use of Shortcodes and QuickTags
 * Advanced configuration options (CDN usage, ..) are available within the options page.
 * Supports code-groups (displays multiple code-blocks within a tab-pane)
 * Extensible language and theme engines - add your own one.
 * Simple CSS based themes
 * Integrated CSS file caching (suitable for high traffic sites)
-* Standalone Shortcode-Processor to avoid wpautop filter issues in Text-Editor Mode
 * Webfont Loader to add missing Monospace Fonts to your website
-* Transform legacy codeblocks to Enlighter Gutenberg Blocks
 * **Full GPDR compliant** - no external resources are required, no data will be aggregated
 
-= Tutorials and Examples =
+= Gutenberg Editor Integration =
+* **Full Editor Integration** via "Enlighter Sourcecode" block
+* Automatic transformations for classic editor posts (codeblocks converted to Enlighter Sourcecode block)
+* Transform legacy codeblocks to Enlighter Gutenberg Blocks (manual transformation)
+* [Docs and Usage](https://github.com/EnlighterJS/Plugin.WordPress/blob/master/docs/Usage_GutenbergEditor.md)
+* [Editor plugin repository](https://github.com/EnlighterJS/Plugin.Gutenberg)
+
+= Classic Editor (TinyMCE) Integration =
+* **Full Editor Integration** via Enlighter buttons in the toolbar
+* Inline Syntax Highlighting
+* Tab-Indentation mode to align code with the `tab` key (single line and block selection)
+* Editor formats to highlight existing code
+* [Docs and Usage](https://github.com/EnlighterJS/Plugin.WordPress/blob/master/docs/Usage_VisualEditor.md)
+* [Editor plugin repository](https://github.com/EnlighterJS/Plugin.TinyMCE)
+* [Classic Editor Live-Demo](https://tinymce.enlighterjs.org/)
+
+= Markdown =
+* Markdown fenced code blocks
+* Inline Syntax Highlighting via backtick code (including language specific addon)
+* [Docs and Usage](https://github.com/EnlighterJS/Plugin.WordPress/blob/master/docs/Usage_Markdown.md)
+
+= Texteditor/Shortcodes (Legacy) =
+
+Shortcodes are deprecated and should be used in **text editor mode only** - never use them within Gutenberg Editor or Classic Editor! 
 
-* [Enlighter Classic Editor Usage](https://github.com/EnlighterJS/Plugin.WordPress/blob/master/docs/Usage_VisualEditor.md) - Howto add Code Snippets to your posts and pages with TinyMCE (Classic Editor)
-* [Enlighter Gutenberg Usage](https://github.com/EnlighterJS/Plugin.WordPress/blob/master/docs/Usage_GutenbergEditor.md) - Howto add Code Snippets to your posts and pages with Gutenberg
-* [Enlighter Markdown Usage](https://github.com/EnlighterJS/Plugin.WordPress/blob/master/docs/Usage_Markdown.md) - Howto use Markdown fenced codeblocks
-* [Enlighter Visual Editor Live-Demo](https://tinymce.enlighterjs.org/)
+* Easy to use Text-Editor mode through the use of Shortcodes and QuickTags
+* Shortcodes within content, comments and widgets
+* Standalone Shortcode-Processor to avoid wpautop filter issues in Text-Editor Mode
 
 = Supported Languages (build-in) =
+
+In case your language is not available try the **Generic Mode** which covers a lot of programming languages - or request a new language on [GitHub](https://github.com/EnlighterJS/EnlighterJS/issues)
+
 Click to view Language/Theme Examples
 
+* [Generic highlighting](https://enlighterjs.org/Language.Generic.html)
 * [AVR Assembly](https://enlighterjs.org/Language.AVR-Assembly.html)
 * [Generic Assembly](https://enlighterjs.org/Language.Assembly.html)
 * [C](https://enlighterjs.org/Language.C.html)
@@ -57,7 +82,6 @@ Click to view Language/Theme Examples
 * [C++](https://enlighterjs.org/Language.Cpp.html)
 * [Cython](https://enlighterjs.org/Language.Cython.html)
 * [Diff](https://enlighterjs.org/Language.Diff.html)
-* [Generic](https://enlighterjs.org/Language.Generic.html)
 * [HTML](https://enlighterjs.org/Language.HTML.html)
 * [Ini](https://enlighterjs.org/Language.Ini.html)
 * [JSON](https://enlighterjs.org/Language.JSON.html)
@@ -87,7 +111,7 @@ Click to view Language/Theme Examples
 == Compatibility ==
 
 All browsers supported by MooTools (enabled Javascript required) and with HTML5 capabilities for "data-" attributes are compatible with Enlighter. It's possible that it may work with earlier/other browsers.
-Generally Enlighter (which javascript part [EnlighterJS](http://enlighterjs.org) is based on [MooTools Javascript Framework](http://mootools.net/)) should work together with jQuery in [noConflict Mode](http://docs.jquery.com/Using_jQuery_with_Other_Libraries) - when you are using jQuery within your Wordpress Theme/Page you have to take care of it!
+Generally Enlighter (which javascript part [EnlighterJS](https://enlighterjs.org) is based on [MooTools Javascript Framework](http://mootools.net/)) should work together with jQuery in [noConflict Mode](http://docs.jquery.com/Using_jQuery_with_Other_Libraries) - when you are using jQuery within your Wordpress Theme/Page you have to take care of it!
 
 * Chrome 10+
 * Safari 5+
@@ -157,6 +181,10 @@ Added Visual-Editor (TinyMCE) Integration (will avoid auto-whitespace-removing i
 
 == Frequently Asked Questions ==
 
+= Autooptimize compatibility settings =
+To use Enlighter together with **autooptimize** it's required to exclude the Enlighter resources from autooptimize (EnlighterJS is already optimized!)
+Goto `Settings / Autooptimize / Javascript options / Exclude scripts from Autoptimize` and add `enlighter/resources/` to the end of the comma separated list.
+
 = Can i use Enlighter togehter with Crayon ? =
 No, you can't use Enlighter together with the Crayon Syntax highlighter because it may take over the Enlighter elements.
 
@@ -208,6 +236,15 @@ In case you found a security issue in this plugin - please write a message **dir
 Write a message to [Andi Dittrich](https://about.andidittrich.com/contact.html) (andi DOT dittrich AT a3non DOT O R G) or open a [New Issue on GitHub](https://github.com/EnlighterJS/Plugin.WordPress/issues)
 == Changelog ==
 
+
+= 3.10.0 =
+
+* Added: french translation - thanks to [regisenguehard on GitHub](https://github.com/EnlighterJS/Plugin.WordPress/pull/144)
+* Added: simplified chinese translation - thanks to [XFY9326 on GitHub](https://github.com/EnlighterJS/Plugin.WordPress/pull/145)
+* Changed: jsdelivr mootools version pointed to `1.6.0`
+* Changed: the DRI detection is now limited to the condition `in_the_loop() && is_main_query()`
+* Bugfix: the experimental DRI feature failed in case `the_content` filter is called multiple times within a theme - thanks to [willstocks-tech on GitHub](https://github.com/EnlighterJS/Plugin.WordPress/pull/153)
+
 = 3.9.0 =
 
 * Added: Visual Editor Plugin ([EnlighterJS.TinyMCE](https://github.com/EnlighterJS/Plugin.TinyMCE)) **v3.5.1**

lang/enlighter-zh_CN.mo

@@ -1,15 +1,7 @@
 <ul>
-<li>Added: Visual Editor Plugin (<a href="https://github.com/EnlighterJS/Plugin.TinyMCE">EnlighterJS.TinyMCE</a>) <strong>v3.5.1</strong></li>
-<li>Added: Gutenberg Editor Plugin - [EnlighterJS/Plugin.Gutenberg on GitHub] <strong>v0.4.0</strong></li>
-<li>Added: <a href="https://enlighterjs.org/" rel="nofollow">EnlighterJS v2.13.0</a></li>
-<li>Added: automatically transforms legacy Enlighter codeblocks (Classic Editor) to Gutenberg blocks in case the "Convert to Blocks" function is triggered</li>
-<li>Added: Support for jQuery Ajax content (post load) - requested by <a href="https://github.com/EnlighterJS/Plugin.WordPress/issues/126" data-hovercard-type="issue" data-hovercard-url="/EnlighterJS/Plugin.WordPress/issues/126/hovercard">wassereimer86 on GitHub</a></li>
-<li>Added: Description of possible <a href="https://github.com/EnlighterJS/Plugin.WordPress/tree/master/docs/PluginNotifications.md">Plugin Notficiations</a></li>
-<li>Changed: moved TinyMCE editor resources (editor plugin) from <code>enlighter/resources/editor</code> to <code>enlighter/resources/tinymce</code></li>
-<li>Changed: moved text editor resources (quicktags from <code>enlighter/resources/editor</code> to <code>enlighter/resources/texteditor</code></li>
-<li>Changed: moved Gutenberg Editor settings to "Visual Editor" Tab</li>
-<li>Changed: <code>data-enlighter-linenumbers</code> attribute is ignored in case it is not set (empty string) to be compatible with the new <a href="https://github.com/EnlighterJS/Plugin.Gutenberg">Gutenberg Editor Plugin</a> - explicit true/false required</li>
-<li>Changed: Gutenberg Plugin is enabled by default</li>
-<li>Bugfix: TinyMCE footer label may collide with editor content - added additional padding - thanks to <a href="https://github.com/EnlighterJS/Plugin.WordPress/issues/120" data-hovercard-type="issue" data-hovercard-url="/EnlighterJS/Plugin.WordPress/issues/120/hovercard">JavierSegoviaCordoba on GitHub</a></li>
-<li>Bugfix: On Windows platforms, the environment check throws the error message <code>plugin is located within an invalid path</code> - thanks to <a href="https://wordpress.org/support/topic/enlighter-plugin-error-the-plugin-is-located-within-an-invalid-path" rel="nofollow">ginaf40 on WordPress.org Forums</a></li>
+<li>Added: french translation - thanks to <a href="https://github.com/EnlighterJS/Plugin.WordPress/pull/144" data-hovercard-type="pull_request" data-hovercard-url="/EnlighterJS/Plugin.WordPress/pull/144/hovercard">regisenguehard on GitHub</a></li>
+<li>Added: simplified chinese translation - thanks to <a href="https://github.com/EnlighterJS/Plugin.WordPress/pull/145" data-hovercard-type="pull_request" data-hovercard-url="/EnlighterJS/Plugin.WordPress/pull/145/hovercard">XFY9326 on GitHub</a></li>
+<li>Changed: jsdelivr mootools version pointed to <code>1.6.0</code></li>
+<li>Changed: the DRI detection is now limited to the condition <code>in_the_loop() &amp;&amp; is_main_query()</code></li>
+<li>Bugfix: the experimental DRI feature failed in case <code>the_content</code> filter is called multiple times within a theme - thanks to <a href="https://github.com/EnlighterJS/Plugin.WordPress/pull/153" data-hovercard-type="pull_request" data-hovercard-url="/EnlighterJS/Plugin.WordPress/pull/153/hovercard">willstocks-tech on GitHub</a></li>
 </ul>