diff --git a/README.md b/README.md index 18797da..7363067 100644 --- a/README.md +++ b/README.md @@ -206,7 +206,7 @@ As moodle administrator, you can make the following settings: HTML entities - If this setting is set to true, HTMLentities like "&", "<", etc. are supported within the JavaScript code for JSXGraph. + If this setting is set to true, HTML entities like "&", "<", etc. are supported within the JavaScript code for JSXGraph. convert encoding @@ -264,7 +264,7 @@ Within the `` tag different attributes can be declared, e.g. ` entities - If HTMLentities like "&", "<", etc. should be supported within the JavaScript code set the attribute to "true". To override a global true type "false". + If HTML entities like "&", "<", etc. should be supported within the JavaScript code set the attribute to "true". To override a global true type "false". useGlobalJS diff --git a/filter.php b/filter.php index 22a3357..4f8238d 100644 --- a/filter.php +++ b/filter.php @@ -370,7 +370,7 @@ private function apply_js($node) { // Convert the HTML-entities in the variable $code. - if ($this->settings['HTMLentities'] && $attributes['entities']) { + if ($this->settings['html_entities'] && $attributes['entities']) { $code = html_entity_decode($code); } @@ -896,7 +896,7 @@ private function get_adminsettings() { $defaults = [ 'versionJSXGraph' => 'auto', 'formulasextension' => true, - 'HTMLentities' => true, + 'html_entities' => true, 'convertencoding' => true, 'globalJS' => '', 'usedivid' => false, @@ -912,7 +912,7 @@ private function get_adminsettings() { $bools = [ 'formulasextension', - 'HTMLentities', + 'html_entities', 'convertencoding', 'usedivid', ]; diff --git a/lang/de/filter_jsxgraph.php b/lang/de/filter_jsxgraph.php index 2dbc27c..c8110db 100644 --- a/lang/de/filter_jsxgraph.php +++ b/lang/de/filter_jsxgraph.php @@ -32,8 +32,6 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -$string['filtername'] = 'JSXGraph'; - $string['aspectratio'] = 'Seitenverhältnis'; $string['aspectratio_desc'] = 'Format z.B. 1 / 1'; @@ -59,6 +57,8 @@ $string['fallbackwidth'] = 'Fallback-Breite'; $string['fallbackwidth_desc'] = 'Siehe Beschreibung der Standard-Dimensionen.'; +$string['filtername'] = 'JSXGraph'; + $string['filterversion'] = 'Sie benutzen derzeit die folgende Version des JSXGraph-Filters für Moodle:'; $string['fixheight'] = 'Höhe'; @@ -81,8 +81,8 @@ $string['header_libs'] = 'Erweiterungen für den JSXGraph-Filter'; $string['header_versions'] = 'Versionsinformationen'; -$string['HTMLentities'] = 'HTMLentities'; -$string['HTMLentities_desc'] = 'Einstellung, ob HTMLentities wie z.B. "&", "<",... innerhalb des JavaScript-Codes für JSXGraph unterstützt werden.'; +$string['html_entities'] = 'HTML entities'; +$string['html_entities_desc'] = 'Einstellung, ob HTML entities wie z.B. "&", "<",... innerhalb des JavaScript-Codes für JSXGraph unterstützt werden.'; $string['maxheight'] = 'Maximale Höhe'; $string['maxheight_desc'] = ''; diff --git a/lang/en/filter_jsxgraph.php b/lang/en/filter_jsxgraph.php index ebb339a..f0e3549 100644 --- a/lang/en/filter_jsxgraph.php +++ b/lang/en/filter_jsxgraph.php @@ -32,8 +32,6 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -$string['filtername'] = 'JSXGraph'; - $string['aspectratio'] = 'aspect-ratio'; $string['aspectratio_desc'] = 'Format e.g. 1 / 1'; @@ -59,6 +57,8 @@ $string['fallbackwidth'] = 'fallback width'; $string['fallbackwidth_desc'] = 'See description of standard dimensions.'; +$string['filtername'] = 'JSXGraph'; + $string['filterversion'] = 'You are using version the following version of the JSXGraph filter for Moodle:'; $string['fixheight'] = 'height'; @@ -81,8 +81,8 @@ $string['header_libs'] = 'Extensions for the JSXGraph filter'; $string['header_versions'] = 'Version info'; -$string['HTMLentities'] = 'HTML entities'; -$string['HTMLentities_desc'] = 'Decide whether HTMLentities like "&", "<",... are supported within the JavaScript code for JSXGraph.'; +$string['html_entities'] = 'HTML entities'; +$string['html_entities_desc'] = 'Decide whether HTML entities like "&", "<",... are supported within the JavaScript code for JSXGraph.'; $string['maxheight'] = 'max-height'; $string['maxheight_desc'] = ''; @@ -107,4 +107,4 @@ $string['versionJSXGraph_auto'] = 'latest supplied version (automatically)'; $string['versionJSXGraph_desc'] = 'Select here which version of JSXGraph should be used. Attention: Version 1.3.2+ is needed for responsiveness.'; -$string['yes'] = 'yes'; \ No newline at end of file +$string['yes'] = 'yes'; diff --git a/settings.php b/settings.php index fcb16fe..c15d186 100644 --- a/settings.php +++ b/settings.php @@ -153,9 +153,9 @@ function get_recommended_version_with_prefix() { )); $settings->add(new admin_setting_configselect( - 'filter_jsxgraph/HTMLentities', - get_string('HTMLentities', 'filter_jsxgraph'), - get_string('HTMLentities_desc', 'filter_jsxgraph'), + 'filter_jsxgraph/html_entities', + get_string('html_entities', 'filter_jsxgraph'), + get_string('html_entities_desc', 'filter_jsxgraph'), '1', [get_string('no', 'filter_jsxgraph'), get_string('yes', 'filter_jsxgraph')] ));