From bcb289406e1caa991d7bcf0d52209be52985a06b Mon Sep 17 00:00:00 2001 From: Antonin <zepcome@gmail.com> Date: Thu, 12 May 2016 17:57:53 +0200 Subject: [PATCH] Missing translation ; prompt URL option enabled --- js/mde-wrapper.js | 3 ++- locale/de.json | 4 +++- locale/en.json | 4 +++- locale/es.json | 4 +++- locale/fr.json | 4 +++- locale/it.json | 4 +++- locale/oc.json | 4 +++- tpl/part/description_markdown.tpl | 4 ++-- 8 files changed, 22 insertions(+), 9 deletions(-) diff --git a/js/mde-wrapper.js b/js/mde-wrapper.js index 1153c880..3e0e3db2 100644 --- a/js/mde-wrapper.js +++ b/js/mde-wrapper.js @@ -34,7 +34,8 @@ MDEWrapper.prototype.enable = function() { forceSync: true, status: true, previewRender: myPreviewRender, - spellChecker: false + spellChecker: false, + promptURLs: true }); if (this.enableButton) { this.enableButton.addClass('active'); diff --git a/locale/de.json b/locale/de.json index dceb9b99..696934e9 100644 --- a/locale/de.json +++ b/locale/de.json @@ -132,7 +132,9 @@ "Password protected": "DE_Protégé par mot de passe", "Votes protected by password": "DE_Votes protégés par mot de passe", "No password": "DE_Pas de mot de passe", - "Remove password": "DE_Supprimer le mot de passe" + "Remove password": "DE_Supprimer le mot de passe", + "Rich editor": "DE_Editeur avancé", + "Simple editor": "DE_Editeur simple" }, "Poll results": { "Votes of the poll": "Stimmabgaben zur Umfrage", diff --git a/locale/en.json b/locale/en.json index 59466290..b324bec9 100644 --- a/locale/en.json +++ b/locale/en.json @@ -132,7 +132,9 @@ "Password protected": "Password protected", "Votes protected by password": "Votes protected by password", "No password": "No password", - "Remove password": "Remove password" + "Remove password": "Remove password", + "Rich editor": "Rich editor", + "Simple editor": "Simple editor" }, "Poll results": { "Votes of the poll": "Votes", diff --git a/locale/es.json b/locale/es.json index a4d02490..1f9c789b 100644 --- a/locale/es.json +++ b/locale/es.json @@ -132,7 +132,9 @@ "Password protected": "ES_Protégé par mot de passe", "Votes protected by password": "ES_Votes protégés par mot de passe", "No password": "ES_Pas de mot de passe", - "Remove password": "ES_Supprimer le mot de passe" + "Remove password": "ES_Supprimer le mot de passe", + "Rich editor": "ES_Editeur avancé", + "Simple editor": "ES_Editeur simple" }, "Poll results": { "Votes of the poll": "Votos de la encuesta", diff --git a/locale/fr.json b/locale/fr.json index e238b19b..84e2a930 100644 --- a/locale/fr.json +++ b/locale/fr.json @@ -132,7 +132,9 @@ "Password protected": "Protégé par mot de passe", "Votes protected by password": "Votes protégés par mot de passe", "No password": "Pas de mot de passe", - "Remove password": "Supprimer le mot de passe" + "Remove password": "Supprimer le mot de passe", + "Rich editor": "Editeur avancé", + "Simple editor": "Editeur simple" }, "Poll results": { "Votes of the poll": "Votes du sondage", diff --git a/locale/it.json b/locale/it.json index 7361984b..50f2cb0a 100644 --- a/locale/it.json +++ b/locale/it.json @@ -132,7 +132,9 @@ "Password protected": "Protetto da una password", "Votes protected by password": "Voti protetti da una password", "No password": "Nessuna password", - "Remove password": "Eliminare la password" + "Remove password": "Eliminare la password", + "Rich editor": "IT_Editeur avancé", + "Simple editor": "IT_Editeur simple" }, "Poll results": { "Votes of the poll": "Voti del sondaggio ", diff --git a/locale/oc.json b/locale/oc.json index 6234957e..d763e220 100644 --- a/locale/oc.json +++ b/locale/oc.json @@ -132,7 +132,9 @@ "Password protected": "OC_Protégé par mot de passe", "Votes protected by password": "OC_Votes protégés par mot de passe", "No password": "OC_Pas de mot de passe", - "Remove password": "OC_Supprimer le mot de passe" + "Remove password": "OC_Supprimer le mot de passe", + "Rich editor": "OC_Editeur avancé", + "Simple editor": "OC_Editeur simple" }, "Poll results": { "Votes of the poll": "Vòtes del sondatge", diff --git a/tpl/part/description_markdown.tpl b/tpl/part/description_markdown.tpl index 224a9739..7029be24 100644 --- a/tpl/part/description_markdown.tpl +++ b/tpl/part/description_markdown.tpl @@ -1,8 +1,8 @@ {* Description buttons for markdown *} <div class="btn-group" role="group" aria-label="..."> - <button type="button" id="rich-editor-button" class="btn btn-default btn-xs active">Editeur riche</button> - <button type="button" id="simple-editor-button" class="btn btn-default btn-xs">Editeur simple</button> + <button type="button" id="rich-editor-button" class="btn btn-default btn-xs active">{__('PollInfo', 'Rich editor')}</button> + <button type="button" id="simple-editor-button" class="btn btn-default btn-xs">{__('PollInfo', 'Simple editor')}</button> </div> <a href="" data-toggle="modal" data-target="#markdown_modal"><i class="glyphicon glyphicon-info-sign"></i></a><!-- TODO Add accessibility --> -- GitLab