branch develop updated (bb08171 -> 82cc628)
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 bb08171 Add the ability to download the non-editable files new 82cc628 Add a message in french in the Git placeholders 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 82cc6286043337220005ef4d7fff6d244629c629 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri Jun 5 14:59:59 2015 +0200 Add a message in french in the Git placeholders Summary of changes: .../main/java/org/nuiton/scmwebeditor/git/GitFileManager.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 82cc6286043337220005ef4d7fff6d244629c629 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri Jun 5 14:59:59 2015 +0200 Add a message in french in the Git placeholders --- .../main/java/org/nuiton/scmwebeditor/git/GitFileManager.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitFileManager.java b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitFileManager.java index 5f320d7..77c987c 100644 --- a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitFileManager.java +++ b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitFileManager.java @@ -48,10 +48,15 @@ public class GitFileManager implements ScmFileManager { private static final Log log = LogFactory.getLog(GitFileManager.class); - protected static String PLACEHOLDER_MESSAGE = "This file has been automatically added by SCMWebEditor when you " + + protected final String PLACEHOLDER_MESSAGE_EN = "This file has been automatically added by SCMWebEditor when you " + "created its directory.\nGit repositories require at least one file per directory, so this file was created " + "according to this rule.\nYou can remove this file once you have added other files in this directory."; + protected final String PLACEHOLDER_MESSAGE_FR = "Ce fichier a été ajouté automatiquement par SCMWebEditor lorsque " + + "vous avez créé son répertoire.\nLes dépôts Git imposent qu'il y ait au moins un fichier par répertoire, " + + "ce fichier a donc été créé selon cette règle.\nVous pouvez supprimer ce fichier une fois que vous avez " + + "ajouté d'autres fichiers à ce répertoire."; + /** the connection to the Git repository */ GitConnection connection; @@ -437,7 +442,7 @@ public class GitFileManager implements ScmFileManager { try { emptyFile.createNewFile(); - FileUtils.writeStringToFile(emptyFile, PLACEHOLDER_MESSAGE); + FileUtils.writeStringToFile(emptyFile, PLACEHOLDER_MESSAGE_EN + "\n\n" + PLACEHOLDER_MESSAGE_FR); } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Can not create file '" + emptyFile.getAbsolutePath() + "'"); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm