jford 2004/08/29 15:27:42
Modified: webapp/WEB-INF/templates/vm/screens ShowError.vm
webapp/WEB-INF/templates/vm/screens/html ShowError.vm
content.vm ImportPsml.vm ChangePassword.vm Error.vm
Log:
Added additional localization
PR: JIRA #JS1-502
Submitted by: Shinsuke SUGAYA
Revision Changes Path
1.3 +4 -6
jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/ShowError.vm
Index: ShowError.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/ShowError.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ShowError.vm 17 Mar 2004 19:17:17 -0000 1.2
+++ ShowError.vm 29 Aug 2004 22:27:42 -0000 1.3
@@ -21,9 +21,7 @@
<tr>
<td class="INPUTFORMTITLE">
<br>
- <h2>There has been an Error!</h2>
- Reason:
- <pre>
+
<h2>${l10n.SHOWERROR_THERE_HAS_BEEN_AN_ER_VM}</h2>${l10n.SHOWERROR_REASON_VM}<pre>
$!data.stackTraceException.toString()
</pre>
</td>
@@ -35,7 +33,7 @@
<tr>
<td class="INPUTFORM">
<br>
- <h3>Get/Post Data:</h3>
+ <h3>${l10n.SHOWERROR_GET_POST_DATA_VM}</h3>
<table border=0>
#foreach ( $key in $keys )
<tr>
@@ -55,7 +53,7 @@
<tr>
<td class="INPUTFORM">
<br>
- <h3>Debugging Data:</h3>
+ <h3>${l10n.SHOWERROR_DEBUGGING_DATA_VM}</h3>
<table border=0>
#foreach ( $key in $keys )
<tr>
@@ -74,7 +72,7 @@
<tr>
<td class="INPUTFORM">
<br>
- <h3>Stacktrace:</h3>
+ <h3>${l10n.SHOWERROR_STACKTRACE_VM}</h3>
<pre>
$data.getStackTrace()
</pre>
1.4 +4 -6
jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/ShowError.vm
Index: ShowError.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/ShowError.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ShowError.vm 17 Mar 2004 19:16:59 -0000 1.3
+++ ShowError.vm 29 Aug 2004 22:27:42 -0000 1.4
@@ -21,9 +21,7 @@
<tr>
<td class="INPUTFORMTITLE">
<br>
- <h2>There has been an Error!</h2>
- Reason:
- <pre>
+
<h2>${l10n.SHOWERROR_THERE_HAS_BEEN_AN_ER_VM}</h2>${l10n.SHOWERROR_REASON_VM}<pre>
$!data.stackTraceException.toString()
</pre>
</td>
@@ -35,7 +33,7 @@
<tr>
<td class="INPUTFORM">
<br>
- <h3>Get/Post Data:</h3>
+ <h3>${l10n.SHOWERROR_GET_POST_DATA_VM}</h3>
<table border=0>
#foreach ( $key in $keys )
<tr>
@@ -55,7 +53,7 @@
<tr>
<td class="INPUTFORM">
<br>
- <h3>Debugging Data:</h3>
+ <h3>${l10n.SHOWERROR_DEBUGGING_DATA_VM}</h3>
<table border=0>
#foreach ( $key in $keys )
<tr>
@@ -74,7 +72,7 @@
<tr>
<td class="INPUTFORM">
<br>
- <h3>Stacktrace:</h3>
+ <h3>${l10n.SHOWERROR_STACKTRACE_VM}</h3>
<pre>
$data.getStackTrace()
</pre>
1.3 +2 -2
jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/content.vm
Index: content.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/content.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- content.vm 17 Mar 2004 19:16:59 -0000 1.2
+++ content.vm 29 Aug 2004 22:27:42 -0000 1.3
@@ -23,6 +23,6 @@
#if ($data.Js_peid)
$jetspeed.getPortalElement($data.Js_peid)
#else
- <p>Portal Element Id missing</p>
+ <p>${l10n.CONTENT_PORTAL_ELEMENT_ID_MI_VM}</p>
#end
1.3 +4 -4
jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/ImportPsml.vm
Index: ImportPsml.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/ImportPsml.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ImportPsml.vm 17 Mar 2004 19:16:59 -0000 1.2
+++ ImportPsml.vm 29 Aug 2004 22:27:42 -0000 1.3
@@ -34,15 +34,15 @@
<center>
<table border="0" cellspacing="2" cellpadding="1">
<tr>
- <td COLSPAN="2"><B>This screen allows to perform the initial psml
import based on the options listed below:</B></td>
+ <td
COLSPAN="2"><B>${l10n.IMPORTPSML_THIS_SCREEN_ALLOWS_T_VM}</B></td>
</tr>
<TR><TD> </TD></TR>
<TR>
- <TD><B>Importer (source)</B></TD>
+ <TD><B>${l10n.IMPORTPSML_IMPORTER_SOURCE_VM}</B></TD>
<TD>$config.getString("services.PsmlImportManager.classname")</TD>
</TR>
<TR>
- <TD><B>Exporter (target)</B></TD>
+ <TD><B>${l10n.IMPORTPSML_EXPORTER_TARGET_VM}</B></TD>
<TD>$config.getString("services.PsmlManager.classname")</TD>
</TR>
<TR><TD> </TD></TR>
@@ -50,7 +50,7 @@
<td colspan="2">
<input name="check-import" type="checkbox">
##$l10n.LOGIN_REMEMBERME
- <B>Do not replace existing psml (checking this box will abort
import if psml is already populated)</B>
+ <B>${l10n.IMPORTPSML_DO_NOT_REPLACE_EXIST_VM}</B>
</td>
</tr>
<TR><TD> </TD></TR>
1.4 +1 -1
jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/ChangePassword.vm
Index: ChangePassword.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/ChangePassword.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangePassword.vm 17 Mar 2004 19:16:59 -0000 1.3
+++ ChangePassword.vm 29 Aug 2004 22:27:42 -0000 1.4
@@ -98,5 +98,5 @@
</center>
</div>
#else
-<h3>Sorry, cannot change password for anonymous user.<h3>
+<h3>${l10n.CHANGEPASSWORD_SORRY_CANNOT_CHANGE_VM}<h3>
#end
1.5 +4 -6
jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/Error.vm
Index: Error.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/Error.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Error.vm 17 Mar 2004 19:16:59 -0000 1.4
+++ Error.vm 29 Aug 2004 22:27:42 -0000 1.5
@@ -21,9 +21,7 @@
<tr>
<td>
<br>
- <h2>There has been an Error!</h2>
- Reason:
- <pre>
+ <h2>${l10n.ERROR_THERE_HAS_BEEN_AN_ER_VM}</h2>${l10n.ERROR_REASON_VM}<pre>
$!data.stackTraceException.toString()
</pre>
</td>
@@ -35,7 +33,7 @@
<tr>
<td>
<br>
- <h3>Get/Post Data:</h3>
+ <h3>${l10n.ERROR_GET_POST_DATA_VM}</h3>
<table border=0>
#foreach ( $key in $keys )
<tr>
@@ -55,7 +53,7 @@
<tr>
<td>
<br>
- <h3>Debugging Data:</h3>
+ <h3>${l10n.ERROR_DEBUGGING_DATA_VM}</h3>
<table border=0>
#foreach ( $key in $keys )
<tr>
@@ -74,7 +72,7 @@
<tr>
<td>
<br>
- <h3>Stacktrace:</h3>
+ <h3>${l10n.ERROR_STACKTRACE_VM}</h3>
<pre>
$data.getStackTrace()
</pre>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
