branch develop updated (6322224 -> a21ab4b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git from 6322224 Fix the buttons background when the cursor is over them new a21ab4b Add translations for the editor's buttons The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a21ab4bf57512c313debe89ff7721ef52b7b532a Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri Jun 12 10:03:16 2015 +0200 Add translations for the editor's buttons Summary of changes: .../main/resources/i18n/scmwebeditor-ui-web_en_GB.properties | 5 +++++ .../main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties | 5 +++++ .../src/main/webapp/WEB-INF/content/modificationViewer.jsp | 7 ++++++- swe-ui-web/src/main/webapp/codemirror-ui/js/codemirror-ui.js | 10 +++++----- 4 files changed, 21 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit a21ab4bf57512c313debe89ff7721ef52b7b532a Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri Jun 12 10:03:16 2015 +0200 Add translations for the editor's buttons --- .../main/resources/i18n/scmwebeditor-ui-web_en_GB.properties | 5 +++++ .../main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties | 5 +++++ .../src/main/webapp/WEB-INF/content/modificationViewer.jsp | 7 ++++++- swe-ui-web/src/main/webapp/codemirror-ui/js/codemirror-ui.js | 10 +++++----- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_en_GB.properties b/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_en_GB.properties index 54f84d0..a543e4d 100644 --- a/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_en_GB.properties +++ b/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_en_GB.properties @@ -46,6 +46,7 @@ scm.homepage=the homepage scm.info.ProblemWithRst=For any problem with RestructuredText visit scm.info.rstFile=Information about RST files scm.info.rstWebsite=RST documentation website +scm.jumpToLine=Jump to line \# scm.language=Language\: scm.lastAutoSave=Last automatic save\: scm.lastChangeSave=Last change save @@ -86,6 +87,9 @@ scm.pathError=Path error scm.preview=Preview scm.privateScmAccess=You try to access a Private SCM. Please login scm.redirection=Redirection... +scm.redo=Redo +scm.reformatDocument=Reformat whole document +scm.reformatSelection=Reformat selection scm.regularExpressions=Regular expressions scm.remove.file=Removing file\: scm.removeDirectory=Remove a directory @@ -120,6 +124,7 @@ scm.titles.saveChanges=Save the changes scm.titles.success=Success scm.titles.swe=SCMWebEditor scm.titles.upload=Upload a file +scm.undo=Undo scm.upload=Upload scm.uploadFile=File Url scm.uploadPath=Path on Repository diff --git a/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties b/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties index 9325d84..4dee912 100644 --- a/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties +++ b/swe-ui-web/src/main/resources/i18n/scmwebeditor-ui-web_fr_FR.properties @@ -46,6 +46,7 @@ scm.homepage=la page d'accueil scm.info.ProblemWithRst=Si vous rencontrez des problèmes avec RestructuredText, visitez le scm.info.rstFile=Information sur les fichiers RST scm.info.rstWebsite=site de la documentation RST +scm.jumpToLine=Aller à la ligne n° scm.language=Langage \: scm.lastAutoSave=Dernière sauvegarde automatique \: scm.lastChangeSave=Dernière sauvegarde effectuée @@ -86,6 +87,9 @@ scm.pathError=Erreur dans le chemin scm.preview=Aperçu scm.privateScmAccess=Pour modifier ce fichier, veuillez vous connecter. scm.redirection=Redirection... +scm.redo=Refaire +scm.reformatDocument=Reformater tout le document +scm.reformatSelection=Reformater la sélection scm.regularExpressions=Expressions régulières scm.remove.file=Suppression du fichier \: scm.removeDirectory=Supprimer un répertoire @@ -120,6 +124,7 @@ scm.titles.saveChanges=Enregistrer les modifications scm.titles.success=Réussi scm.titles.swe=SCMWebEditor scm.titles.upload=Ajouter un fichier +scm.undo=Annuler scm.upload=Ajouter un fichier scm.uploadFile=Url du fichier scm.uploadPath=Répertoire sur le dépôt diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp index 83f51dd..85edd79 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp @@ -45,7 +45,12 @@ "regularExpressions" : '<s:text name="scm.regularExpressions"/>', "replaceAll" : '<s:text name="scm.replaceAll"/>', "commitWithoutMessage" : '<s:text name="scm.commitWithoutMessage"/>', - "exitJavascript" : '<s:text name="scm.exitJavascript"/>' + "exitJavascript" : '<s:text name="scm.exitJavascript"/>', + "undo" : '<s:text name="scm.undo"/>', + "redo" : '<s:text name="scm.redo"/>', + "jumpToLine" : '<s:text name="scm.jumpToLine"/>', + "reformatSelection" : '<s:text name="scm.reformatSelection"/>', + "reformatDocument" : '<s:text name="scm.reformatDocument"/>' }; </script> diff --git a/swe-ui-web/src/main/webapp/codemirror-ui/js/codemirror-ui.js b/swe-ui-web/src/main/webapp/codemirror-ui/js/codemirror-ui.js index 7673acd..ce8c957 100644 --- a/swe-ui-web/src/main/webapp/codemirror-ui/js/codemirror-ui.js +++ b/swe-ui-web/src/main/webapp/codemirror-ui/js/codemirror-ui.js @@ -26,11 +26,11 @@ CodeMirrorUI.prototype = { 'search': ["Search/Replace", "find_replace_popup", this.options.imagePath + "/find.png", this.find_replace_popup], 'searchClose': ["Close", "find_replace_popup_close", this.options.imagePath + "/cancel.png", this.find_replace_popup_close], 'searchDialog': ["Search/Replace", "find_replace_window", this.options.imagePath + "/find.png", this.find_replace_window], - 'undo': ["Undo", "undo", this.options.imagePath + "/arrow_undo.png", this.undo], - 'redo': ["Redo", "redo", this.options.imagePath + "/arrow_redo.png", this.redo], - 'jump': ["Jump to line #", "jump", this.options.imagePath + "/page_go.png", this.jump], - 'reindentSelection': ["Reformat selection", "reindentSelect", this.options.imagePath + "/text_indent.png", this.reindentSelection], - 'reindent': ["Reformat whole document", "reindent", this.options.imagePath + "/page_refresh.png", this.reindent], + 'undo': [i18n["undo"], "undo", this.options.imagePath + "/arrow_undo.png", this.undo], + 'redo': [i18n["redo"], "redo", this.options.imagePath + "/arrow_redo.png", this.redo], + 'jump': [i18n["jumpToLine"], "jump", this.options.imagePath + "/page_go.png", this.jump], + 'reindentSelection': [i18n["reformatSelection"], "reindentSelect", this.options.imagePath + "/text_indent.png", this.reindentSelection], + 'reindent': [i18n["reformatDocument"], "reindent", this.options.imagePath + "/page_refresh.png", this.reindent], 'about': ["About CodeMirror-UI", "about", this.options.imagePath + "/help.png", this.about] }; -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm