r175 - in trunk/src/main: resources/i18n webapp/WEB-INF/content - Scmwebeditor-commits

19 Jul 2011

Author: kcardineaud
Date: 2011-07-19 15:21:29 +0200 (Tue, 19 Jul 2011)
New Revision: 175

Url: http://nuiton.org/repositories/revision/scmwebeditor/175

Log:
Add i18n for upload

Modified:
   trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties
   trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties
   trunk/src/main/webapp/WEB-INF/content/upload.jsp
   trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp
   trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp

Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties
===================================================================

--- trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties	2011-07-19 12:41:07 UTC (rev 174)
+++ trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties	2011-07-19 13:21:29 UTC (rev 175)
@@ -28,4 +28,9 @@
 scm.exitTitle=Exit ScmWebEditor without saving.
 scm.exitJavascript=Exit ScmWebEditor without saving ? All modification will be lost.
 scm.upload=Upload
-scm.uploadTitle=Upload a file on the repository
\ No newline at end of file
+scm.uploadTitle=Upload a file on the repository
+scm.uploadFile=File Url
+scm.uploadPath=Path on Repository
+scm.badUsernameOrPassword=Bad username or password
+scm.erreurRepo=Error on repository
+scm.uploadSuccess=File upload successful
\ No newline at end of file

Modified: trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties
===================================================================
--- trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties	2011-07-19 12:41:07 UTC (rev 174)
+++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties	2011-07-19 13:21:29 UTC (rev 175)
@@ -1,6 +1,8 @@
 scm.FileInEditor=Fichier dans l''editeur \: 
+scm.badUsernameOrPassword=Identifiant ou mot de passe incorrect
 scm.commitMessage=Message associe au commit
 scm.commitMessageTitle=laisser un message pour le commit
+scm.erreurRepo=Erreur sur le depot
 scm.exit=Quitter
 scm.exitJavascript=Quitter ScmWebEditor sans sauvegarder ? Toutes les modifications serons perdues.
 scm.exitTitle=Quitter ScmWebEditor sans sauvegarder.
@@ -25,6 +27,9 @@
 scm.saveAndQuitTitle=Sauvegarder le fichier sur le depot et retourner à la page precedente.
 scm.text=Texte
 scm.upload=Ajouter un fichier 
+scm.uploadFile=Url du fichier
+scm.uploadPath=Repertoire sur le depot
+scm.uploadSuccess=Fichier telecharche avec succes
 scm.uploadTitle=Ajouter un fichier sur le depot
 scm.username=Identifiant
 scm.usernameTitle=Identifiant du depot

Modified: trunk/src/main/webapp/WEB-INF/content/upload.jsp
===================================================================
--- trunk/src/main/webapp/WEB-INF/content/upload.jsp	2011-07-19 12:41:07 UTC (rev 174)
+++ trunk/src/main/webapp/WEB-INF/content/upload.jsp	2011-07-19 13:21:29 UTC (rev 175)
@@ -1,14 +1,13 @@
 <%@ taglib prefix="s" uri="/struts-tags"%>
 
-<p>Result : </p>
        
         
     <s:if test="badLogin">
-        <p><font color="red">Bad username or password</font></p>
+        <p><font color="red"><s:text name="scm.badUsernameOrPassword"/></font></p>
     </s:if>
     <s:elseif test="error">
-        <p><font color="red">Erreur SVN</font></p>    
+        <p><font color="red"><s:text name="scm.erreurRepo"/></font></p>    
     </s:elseif>
     <s:else>
-        <p>File upload successful</p>
+        <p><s:text name="scm.uploadSuccess"/></p>
     </s:else>
\ No newline at end of file

Modified: trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp
===================================================================
--- trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp	2011-07-19 12:41:07 UTC (rev 174)
+++ trunk/src/main/webapp/WEB-INF/content/uploadForm.jsp	2011-07-19 13:21:29 UTC (rev 175)
@@ -9,17 +9,17 @@
 </head>
 <body>
 
-	<form method="POST" id="uploadForm" action="doUpload" enctype="multipart/form-data">
-		<label>Upload a picture : <input type="file" name="upload"/></label><br/>
-		<label>Path on svn : <input type="text" name="svnPath" /></label><br/>
-		<label>username : <input type="text" name="username" /></label><br/>
-		<label>password : <input type="password" name="pw" /></label><br/>
+	<form method="POST" id="uploadForm" action="doUpload.action" enctype="multipart/form-data">
+		<label><s:text name="scm.uploadFile" /> : <input type="file" name="upload"/></label><br/>
+		<label><s:text name="scm.uploadPath" /> : <input type="text" name="svnPath" /></label><br/>
+		<label><s:text name="scm.username" /> : <input type="text" name="username" /></label><br/>
+		<label><s:text name="scm.password" /> : <input type="password" name="pw" /></label><br/>
 		
     <s:if test="badLogin">
-        <p><font color="red">Bad username or password</font></p>
+        <p><font color="red"><s:text name="scm.badUsernameOrPassword"/></font></p>
     </s:if>
     <s:elseif test="error">
-        <p><font color="red">Erreur SVN</font></p>    
+        <p><font color="red"><s:text name="scm.erreurRepo"/></font></p>    
     </s:elseif>
 		<input type="submit"/>
 	</form>

Modified: trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp
===================================================================
--- trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp	2011-07-19 12:41:07 UTC (rev 174)
+++ trunk/src/main/webapp/WEB-INF/content/uploadSuccess.jsp	2011-07-19 13:21:29 UTC (rev 175)
@@ -1,5 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
+    <%@ taglib prefix="s" uri="/struts-tags"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
@@ -7,7 +8,7 @@
 <title>Success</title>
 </head>
 <body>
-<p>File upload successful</p>
+<p><s:text name="scm.uploadSuccess"/></p>
 	<form>
 		<input type="button" value="close" onclick="window.close()">
 	</form>

    

r175 - in trunk/src/main: resources/i18n webapp/WEB-INF/content

kcardineaud＠users.nuiton.org

tags

participants (1)