From 1aae70e0fe00567e093fe914640c4e11a634c7e4 Mon Sep 17 00:00:00 2001 From: Stephan Robotta Date: Tue, 26 Sep 2023 08:55:45 +0200 Subject: [PATCH] Remove the settings langage tag, use the plugin name in Site administration -> Plugins --- README.md | 2 +- lang/de/tiny_multilang2.php | 1 - lang/en/tiny_multilang2.php | 1 - lang/es/tiny_multilang2.php | 1 - lang/fr/tiny_multilang2.php | 1 - settings.php | 2 +- tests/behat/tiny_multilang.feature | 4 ++-- 7 files changed, 4 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0da4587..58678d8 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ is enabled, the standard `` tags are used. - Unzip the archive file or copy repository content into `*moodleroot*/lib/editor/tiny/plugins`. - Install the plugin within Moodle via the upgrade script. - - Optional: Adjust the settings in "Site administration" -> "Plugins" -> "Tiny Multi-Language Content (v2) settings". + - Optional: Adjust the settings in "Site administration" -> "Plugins" -> "Tiny Multi-Language Content (v2)". ## Troubleshooting diff --git a/lang/de/tiny_multilang2.php b/lang/de/tiny_multilang2.php index a9f341e..22d8159 100644 --- a/lang/de/tiny_multilang2.php +++ b/lang/de/tiny_multilang2.php @@ -41,7 +41,6 @@ $string['highlight'] = 'Trennzeichen hervorheben'; $string['highlight_desc'] = 'Die Trennzeichen für den sprachabhänigen Inhalt sollen hervorgehoben werden (z.B., {mlang XX} und {mlang}) im WYSIWYG Editor'; $string['pluginname'] = 'Multi-Language Content (v2)'; -$string['settings'] = 'Tiny Multi-Language Content (v2) Einstellungen'; $string['requiremultilang2'] = 'Benötigt Multi-Language Content (v2) Filter'; $string['requiremultilang2_desc'] = 'Wenn aktiviert, wird das Menü und der Button im Editor nur dann angezeigt, wenn der Multi-Language Content (v2) Filter aktiv ist.'; $string['showalllangs'] = 'Zeige alle Sprachen'; diff --git a/lang/en/tiny_multilang2.php b/lang/en/tiny_multilang2.php index a491f45..d63d973 100644 --- a/lang/en/tiny_multilang2.php +++ b/lang/en/tiny_multilang2.php @@ -53,7 +53,6 @@ $string['removealltags'] = 'Remove all lang tags'; $string['requiremultilang2'] = 'Require Multi-Language Content (v2) filter'; $string['requiremultilang2_desc'] = 'If enabled, the language drop down menu is visible only when the Multi-Language Content (v2) filter is enabled.'; -$string['settings'] = 'Tiny Multi-Language Content (v2) settings'; $string['showalllangs'] = 'Show all languages'; $string['showalllangs_desc'] = 'If enabled, the language drop down menu will contain all the languages Moodle supports. If not, only the installed and enabled languages will be shown.'; diff --git a/lang/es/tiny_multilang2.php b/lang/es/tiny_multilang2.php index f5b41dc..10b74bb 100644 --- a/lang/es/tiny_multilang2.php +++ b/lang/es/tiny_multilang2.php @@ -41,7 +41,6 @@ $string['highlight'] = 'Destacar los delimitadores'; $string['highlight_desc'] = 'Destacar visualmente los delimitadores del contenido multi-idioma (esto es, {mlang XX} y {mlang}) en el editor WYSIWYG'; $string['pluginname'] = 'Contenido Multi-Idioma (v2)'; -$string['settings'] = 'Tiny Contenido Multi-Idioma (v2) ajustes'; $string['requiremultilang2'] = 'Requerir el filtro de Contenido Multi-Idioma (v2)'; $string['requiremultilang2_desc'] = 'Si se habilita, el menú desplegable de selección de idiomas solo es visible cuando esté habilitado el filtro de Contenido Multi-Idioma (v2).'; $string['showalllangs'] = 'Mostrar todos los idiomas'; diff --git a/lang/fr/tiny_multilang2.php b/lang/fr/tiny_multilang2.php index 631fd35..fdc0993 100644 --- a/lang/fr/tiny_multilang2.php +++ b/lang/fr/tiny_multilang2.php @@ -41,7 +41,6 @@ $string['highlight'] = 'mettre en évidence les délimiteurs'; $string['highlight_desc'] = "Mettre en évidence visuellement les délimiteurs multilingues (c.-à-d. {mlang XX} et {mlang}) dans l'éditeur WYSIWYG."; $string['pluginname'] = 'Contenu multilingue (v2)'; -$string['settings'] = 'Tiny Contenu multilingue (v2) paramètres'; $string['requiremultilang2'] = 'Exige le filtre Contenu multilingue (v2)'; $string['requiremultilang2_desc'] = 'Si activé, le menu déroulant des langues sera visible uniquement lorsque le filtre Contenu multilingue (v2) est activé.'; $string['showalllangs'] = 'Afficher toutes les langues'; diff --git a/settings.php b/settings.php index 1d6561a..5ed50bb 100644 --- a/settings.php +++ b/settings.php @@ -28,7 +28,7 @@ $ADMIN->add('editortiny', new admin_category('tiny_multilang2', new lang_string('pluginname', 'tiny_multilang2'))); -$settings = new admin_settingpage('tiny_multilang2_settings', new lang_string('settings', 'tiny_multilang2')); +$settings = new admin_settingpage('tiny_multilang2_settings', new lang_string('pluginname', 'tiny_multilang2')); if ($ADMIN->fulltree) { $settings->add(new admin_setting_configcheckbox('tiny_multilang2/requiremultilang2', diff --git a/tests/behat/tiny_multilang.feature b/tests/behat/tiny_multilang.feature index ebd0977..42424bc 100644 --- a/tests/behat/tiny_multilang.feature +++ b/tests/behat/tiny_multilang.feature @@ -79,7 +79,7 @@ Feature: Tiny editor multilang plugin with multilangfilter2 Given the following config values are set as admin: | addlanguage | 1 | tiny_multilang2 | | simulatemultilang2 | 0 | tiny_multilang2 | - And I navigate to "Plugins > Text editors > Atto HTML editor > Tiny Multi-Language Content (v2) settings" in site administration + And I navigate to "Plugins > Text editors > TinyMCE editor > Tiny Multi-Language Content (v2)" in site administration When I set the field "id_s_tiny_multilang2_languageoptions" to multiline: """ zh @@ -103,7 +103,7 @@ Feature: Tiny editor multilang plugin with multilangfilter2 Given the following config values are set as admin: | addlanguage | 1 | tiny_multilang2 | | simulatemultilang2 | 0 | tiny_multilang2 | - And I navigate to "Plugins > Text editors > Atto HTML editor > Tiny Multi-Language Content (v2) settings" in site administration + And I navigate to "Plugins > Text editors > TinyMCE editor > Tiny Multi-Language Content (v2)" in site administration When I set the field "id_s_tiny_multilang2_languageoptions" to multiline: """ AZ