You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/12/31 18:27:01 UTC

svn commit: r730417 - in /incubator/jspwiki/trunk: etc/ etc/i18n/ etc/i18n/templates/ src/com/ecyrd/jspwiki/action/

Author: ajaquith
Date: Wed Dec 31 09:26:59 2008
New Revision: 730417

URL: http://svn.apache.org/viewvc?rev=730417&view=rev
Log:
Stripes-related labels, field names and validation errors moved to CoreResources i18n files, and removed from templates/default. Message keys were renamed to match Stripes field names where practical.

Modified:
    incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
    incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties
    incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties
    incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties
    incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties
    incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties
    incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties
    incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties
    incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties
    incubator/jspwiki/trunk/etc/i18n/templates/default.properties
    incubator/jspwiki/trunk/etc/i18n/templates/default_de.properties
    incubator/jspwiki/trunk/etc/i18n/templates/default_es.properties
    incubator/jspwiki/trunk/etc/i18n/templates/default_fi.properties
    incubator/jspwiki/trunk/etc/i18n/templates/default_fr.properties
    incubator/jspwiki/trunk/etc/i18n/templates/default_it.properties
    incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties
    incubator/jspwiki/trunk/etc/i18n/templates/default_ru.properties
    incubator/jspwiki/trunk/etc/i18n/templates/default_zh_CN.properties
    incubator/jspwiki/trunk/etc/web.xml
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/RenameActionBean.java

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources.properties Wed Dec 31 09:26:59 2008
@@ -53,13 +53,14 @@
 rename.error.title=Unable to rename page
 rename.error.reason=Reason:
 rename.identical=Page names identical. 
-rename.exists=Page "{0}" already exists. Please change the new name or delete the page "{0}" first.
+rename.exists=Page "{1}" already exists. Please change the new name or delete the page "{1}" first.
 rename.unknownerror=An unknown error occurred ({0})
 
 # Login.jsp  
 #login.error.capslock=Invalid login (please check your Caps Lock key) #obsolete
 login.error.password=Not a valid login.
 login.error.noaccess=It seems you don't have access to that. Sorry.
+login.error=Login failed: {2}
 
 # Lostpassword.jsp
 
@@ -207,3 +208,100 @@
 varmgr.authenticated=authenticated
 varmgr.asserted=asserted
 varmgr.anonymous=anonymous
+
+###############################################################################
+## Default Resource Bundle file for the Stripes Framework. Values should be
+## placed in here for the following:
+##   - Form Field Labels, unless you want users to see a non-localized, non-
+##     pretty name from the form field declaration (prettied up a little).
+##   - Error messages for:
+##       - Standard validation error messages
+##       - Converter error messages
+##       - Error messages used in your custom ActionBean classes
+###############################################################################
+
+# Resource strings used by the <stripes:errors> tag when there are no nested tags
+stripes.errors.header=<div style="color:#b72222; font-weight: bold">Please fix the following errors:</div><ol>
+stripes.errors.beforeError=<li style="color: #b72222;">
+stripes.errors.afterError=</li>
+stripes.errors.footer=</ol>
+
+# Resource strings used by the <stripes:errors> tag when displaying errors for a
+# specific field (e.g. <stripes:errors field="password"/>). If not supplied the
+# values above will be used instead.
+stripes.fieldErrors.header=
+stripes.fieldErrors.beforeError=<span style="color: #b72222;">
+stripes.fieldErrors.afterError=</span><br />
+stripes.fieldErrors.footer=
+
+# Resource strings used by the stripes:messages tag
+stripes.messages.header=<ul class="messages">
+stripes.messages.beforeMessage=<li>
+stripes.messages.afterMessage=</li>
+stripes.messages.footer=</ul>
+
+# Validation error messages produced by Stripes' built-in converter classes. These
+# are default error messages and can be overridden on per-field and per-form levels.
+# Using the 'invalidNumber' error for a field 'age' of a form posting to
+# '/user/Profile.action', the keys looked for (in order) would be:
+#      1: /user/Profile.action.age.invalidNumber
+#      2: /user/Profile.action.age.errorMessage
+#      3: age.errorMessage
+#      4: /user/Profile.action.invalidNumber
+#      5: converter.number.invalidNumber
+converter.number.invalidNumber=The value ({1}) entered in field {0} must be a valid number
+converter.byte.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
+converter.short.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
+converter.integer.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
+converter.float.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
+converter.enum.notAnEnumeratedValue=The value "{1}" is not a valid value for field {0}
+converter.date.invalidDate=The value ({1}) entered in field {0} must be a valid date
+converter.email.invalidEmail=The value ({1}) entered is not a valid email address
+converter.creditCard.invalidCreditCard=The value ({1}) entered is not a valid credit card number
+
+# Validation error messages produced by Stripes' annotation based validations. These
+# are default error messages and can be overridden on per-field and per-form levels.
+# Using the 'valueNotPresent' required field error for a field 'username' of a form
+# posting to '/user/Register.action', the keys looked for (in order) would be:
+#      1: /user/Register.action.username.valueNotPresent
+#      2: /user/Register.action.username.errorMessage
+#      3: username.errorMessage
+#      4: /user/Register.action.valueNotPresent
+#      5: validation.required.valueNotPresent
+validation.required.valueNotPresent={0} is a required field
+validation.minlength.valueTooShort={0} must be at least {2} characters long
+validation.maxlength.valueTooLong={0} must be no more than {2} characters long
+validation.minvalue.valueBelowMinimum=The minimum allowed value for {0} is {2}
+validation.maxvalue.valueAboveMaximum=The maximum allowed value for {0} is {2}
+validation.mask.valueDoesNotMatch=<em>{1}</em> is not a valid {0}
+validation.expression.valueFailedExpression=The value supplied ({1}) for field {0} is invalid
+validation.file.postBodyTooBig=Total upload size of {3} KB exceeds the maximum size of {2} KB
+
+######################################################################
+#
+#  JSPWiki field labels used by <stripes:*> tags
+#
+######################################################################
+
+# Formerly login.login
+loginName=Login
+# Formerly login.password
+password=Password
+# Formerly login.remember
+remember=Remember me?
+# Formerly login.submit.login
+login=Login
+# Formerly login.lostpw.name, prefs.email
+email=E-mail address
+# Formerly login.lostpw.submit
+resetPassword=Reset password
+# Formerly prefs.loginname
+profile.loginName=Login name *
+# Formerly prefs.password
+profile.password=Password *
+# Formerly prefs.password2
+passwordAgain=Password verify *
+# Formerly prefs.fullname
+profile.fullname=Name *
+# Formerly prefs.save.submit
+com.ecyrd.jspwiki.action.UserProfileActionBean.save=Save profile

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties Wed Dec 31 09:26:59 2008
@@ -231,3 +231,21 @@
 
 # seit Version 2.7.0-alpha-34
 comment.by=Kommentar von {0}
+
+######################################################################
+#
+#  JSPWiki field labels used by <stripes:*> tags
+#
+######################################################################
+
+loginName=Benutzername
+password=Passwort
+remember=Anmeldung speichern?
+login=Anmeldung
+email=E-Mail-Adresse
+resetPassword=Passwort zurücksetzen!
+profile.loginName=dein Benutzername (*)
+profile.password=dein Passwort (*)
+passwordAgain=Passwort wiederholen (*)
+profile.fullname=dein voller Name (*)
+com.ecyrd.jspwiki.action.UserProfileActionBean.save=Profil speichern

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties Wed Dec 31 09:26:59 2008
@@ -54,7 +54,7 @@
 rename.error.title=No fue posible renombrar la página
 rename.error.reason=Razón:
 rename.identical=Los nombres de las páginas son idénticos.
-rename.exists=La página "{0}" ya existe.
+rename.exists=La página "{1}" ya existe.
 rename.unknownerror=Ha ocurrido un error desconocido ({0})
 
 # Login.jsp
@@ -210,4 +210,22 @@
 varmgr.not.logged.in=sin identificar
 varmgr.authenticated=autenticado
 varmgr.asserted=identificado (sin iniciar sesión)
-varmgr.anonymous=anónimo
\ No newline at end of file
+varmgr.anonymous=anónimo
+
+######################################################################
+#
+#  JSPWiki field labels used by <stripes:*> tags
+#
+######################################################################
+
+loginName=Nombre de inicio de sesión
+password=Contraseña
+remember=&#191;Recordarme?
+login=Iniciar sesión
+email=Dirección E-mail
+resetPassword=&#161;Resetear contraseña!
+profile.loginName=Nombre de inicio de sesión *
+profile.password=Contraseña *
+passwordAgain=Verificación de contraseña *
+profile.fullname=Nombre *
+com.ecyrd.jspwiki.action.UserProfileActionBean.save=Guardar perfil

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties Wed Dec 31 09:26:59 2008
@@ -42,7 +42,7 @@
 rename.error.title=Virhe sivun nimeämisessä
 rename.error.reason=Syy:
 rename.identical=Uuden sivun nimi sama kuin vanhan.  Paina selaimesi "Takaisin" -painiketta ja vaihda lomakkeeseen uusi nimi.
-rename.exists=Sivu "{0}" on jo olemassa. Paina selaimesi "Takaisin" -painiketta ja täytä lomakkeeseen uusi nimi, tai poista sivu "{0}" ensin.
+rename.exists=Sivu "{1}" on jo olemassa. Paina selaimesi "Takaisin" -painiketta ja täytä lomakkeeseen uusi nimi, tai poista sivu "{1}" ensin.
 rename.unknownerror=Tuntematon härjö ({0})
 
 # Lostpassword
@@ -167,3 +167,20 @@
 varmgr.authenticated = kirjautunut
 varmgr.not.logged.in = kirjautumaton
 
+######################################################################
+#
+#  JSPWiki field labels used by <stripes:*> tags
+#
+######################################################################
+
+loginName=Käyttäjätunnus
+password=Salasana
+remember=Muista minut?
+login=Kirjaudu
+email=Sähköpostiosoite
+resetPassword=Lähetä uusi salasana!
+profile.loginName=Käyttäjätunnus *
+profile.password=Salasana *
+passwordAgain=Vahvista salasana *
+profile.fullname=Nimi *
+com.ecyrd.jspwiki.action.UserProfileActionBean.save=Tallenna profiili

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties Wed Dec 31 09:26:59 2008
@@ -55,7 +55,7 @@
 rename.error.title=Impossible de renommer la page
 rename.error.reason=Raison\u00A0:
 rename.identical=Le nom des pages est identique.  Cliquez sur le bouton <b>Retour</b> de votre navigateur et modifiez le nouveau nom.
-rename.exists=La page "{0}" existe d\u00E9j\u00E0. Cliquez sur le bouton <b>Retour</b> de votre navigateur et modifiez le nouveau nom ou supprimez d\u0027\u0027abord la page "{0}".
+rename.exists=La page "{1}" existe d\u00E9j\u00E0. Cliquez sur le bouton <b>Retour</b> de votre navigateur et modifiez le nouveau nom ou supprimez d\u0027\u0027abord la page "{1}".
 rename.unknownerror=Une erreur inattendue est apparue ({0})
 
 # Login.jsp  
@@ -224,3 +224,21 @@
 varmgr.authenticated=authentifi\u00E9
 varmgr.asserted=reconnu
 varmgr.anonymous=anonyme
+
+######################################################################
+#
+#  JSPWiki field labels used by <stripes:*> tags
+#
+######################################################################
+
+loginName=Identifiant
+password=Mot de passe
+remember=Se souvenir de moi
+login=S\u0027identifier
+email=Adresse e-mail
+resetPassword=R\u00E9initialiser le mot de passe\u00A0!
+profile.loginName=Identifiant *
+profile.password=Mot de passe *
+passwordAgain=V\u00E9rification du mot de passe *
+profile.fullname=Nom *
+com.ecyrd.jspwiki.action.UserProfileActionBean.save=Enregistrer le profil

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties Wed Dec 31 09:26:59 2008
@@ -52,7 +52,7 @@
 rename.error.title=Impossibile rinominare la pagina
 rename.error.reason=Causa:
 rename.identical=Nomi delle pagine identici.  Seleziona "back" sul browser e cambia il nome.
-rename.exists=La pagina "{0}" esiste gi&agrave;. Seleziona "back" sul browser e cambia il nuovo nome o cancella prima la pagina "{0}".
+rename.exists=La pagina "{1}" esiste gi&agrave;. Seleziona "back" sul browser e cambia il nuovo nome o cancella prima la pagina "{1}".
 rename.unknownerror=Errore sconosciuto: ({0})
 
 # Login.jsp  
@@ -205,3 +205,21 @@
 varmgr.authenticated=autenticato
 varmgr.asserted=asserito
 varmgr.anonymous=anonimo
+
+######################################################################
+#
+#  JSPWiki field labels used by <stripes:*> tags
+#
+######################################################################
+
+loginName=Login nome
+password=Password
+remember=Ricordati di me?
+login=Login
+email=Indirizzo E-mail
+resetPassword=Cambia la password !
+profile.loginName=Login nome *
+profile.password=Password *
+passwordAgain=Verifica password *
+profile.fullname=Nome *
+com.ecyrd.jspwiki.action.UserProfileActionBean.save=Salva il profilo

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties Wed Dec 31 09:26:59 2008
@@ -54,7 +54,7 @@
 rename.error.title=Fout: de pagina kon niet worden hernoemd
 rename.error.reason=Reden:
 rename.identical=De pagina namen zijn identiek.
-rename.exists=De pagina "{0}" bestaat reeds. Kies een andere naam of verwijder de pagina "{0}".
+rename.exists=De pagina "{1}" bestaat reeds. Kies een andere naam of verwijder de pagina "{1}".
 rename.unknownerror=Er is een onbekende fout opgetreden ({0})
 
 # Login.jsp  
@@ -208,3 +208,21 @@
 varmgr.authenticated=geauthenticeerd
 varmgr.asserted=aangenomen identiteit
 varmgr.anonymous=anoniem
+
+######################################################################
+#
+#  JSPWiki field labels used by <stripes:*> tags
+#
+######################################################################
+
+loginName=Login naam
+password=Wachtwoord
+remember=Bewaar login naam in browser cookie?
+login=Login
+email=Email adres
+resetPassword=Genereer een nieuw wachtwoord !
+profile.loginName=Login naam *
+profile.password=Wachtwoord *
+passwordAgain=Bevestig Wachtwoord *
+profile.fullname=Naam *
+com.ecyrd.jspwiki.action.UserProfileActionBean.save=Bewaar Gebruikersprofiel

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties Wed Dec 31 09:26:59 2008
@@ -53,7 +53,7 @@
 rename.error.title=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443
 rename.error.reason=\u041f\u0440\u0438\u0447\u0438\u043d\u0430:
 rename.identical=\u0418\u043c\u0435\u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u044e\u0442. 
-rename.exists=\u0421\u0442\u0440\u0430\u043d\u0438\u0446\u0430 "{0}" \u0443\u0436\u0435 \u0435\u0441\u0442\u044c. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0441\u043c\u0435\u043d\u0438\u0442\u0435 \u0438\u043c\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u0438\u043b\u0438 \u0443\u0434\u0430\u043b\u0438\u0442\u0435 \u0441\u0442\u0430\u0440\u0443\u044e.
+rename.exists=\u0421\u0442\u0440\u0430\u043d\u0438\u0446\u0430 "{1}" \u0443\u0436\u0435 \u0435\u0441\u0442\u044c. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0441\u043c\u0435\u043d\u0438\u0442\u0435 \u0438\u043c\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u0438\u043b\u0438 \u0443\u0434\u0430\u043b\u0438\u0442\u0435 \u0441\u0442\u0430\u0440\u0443\u044e.
 rename.unknownerror=\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 ({0})
 
 # Login.jsp  
@@ -209,3 +209,21 @@
 varmgr.authenticated=\u043f\u0440\u0438\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442
 varmgr.asserted=\u0432 \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u0435
 varmgr.anonymous=\u0433\u043e\u0441\u0442\u044c
+
+######################################################################
+#
+#  JSPWiki field labels used by <stripes:*> tags
+#
+######################################################################
+
+loginName=\u041b\u043e\u0433\u0438\u043d
+password=\u041f\u0430\u0440\u043e\u043b\u044c
+remember=\u0417\u0430\u043f\u043e\u043c\u043d\u0438\u0442\u044c \u043c\u0435\u043d\u044f?
+login=\u041b\u043e\u0433\u0438\u043d
+email=\u042d\u043b\u0435\u043a\u0442\u043e\u0440\u043d\u043d\u0430\u044f \u043f\u043e\u0447\u0442\u0430
+resetPassword=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c !
+profile.loginName=\u041b\u043e\u0433\u0438\u043d *
+profile.password=\u041f\u0430\u0440\u043e\u043b\u044c *
+passwordAgain=\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043f\u0430\u0440\u043e\u043b\u044f *
+profile.fullname=\u0418\u043c\u044f *
+com.ecyrd.jspwiki.action.UserProfileActionBean.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043f\u0440\u043e\u0444\u0438\u043b\u044c

Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties Wed Dec 31 09:26:59 2008
@@ -54,7 +54,7 @@
 rename.error.title=\u65e0\u6cd5\u91cd\u547d\u540d\u9875\u9762
 rename.error.reason=\u539f\u56e0\uff1a
 rename.identical=\u9875\u9762\u540d\u79f0\u76f8\u540c\u3002
-rename.exists=\u9875\u9762\u201c{0}\u201d\u5df2\u5b58\u5728\u3002\u8bf7\u66f4\u6539\u65b0\u540d\u79f0\uff0c\u6216\u8005\u5148\u5220\u9664\u9875\u9762\u201c{0}\u201d\u3002
+rename.exists=\u9875\u9762\u201c{1}\u201d\u5df2\u5b58\u5728\u3002\u8bf7\u66f4\u6539\u65b0\u540d\u79f0\uff0c\u6216\u8005\u5148\u5220\u9664\u9875\u9762\u201c{1}\u201d\u3002
 rename.unknownerror=\u53d1\u751f\u672a\u77e5\u9519\u8bef\uff08{0}\uff09
 
 # Login.jsp  
@@ -207,4 +207,22 @@
 varmgr.not.logged.in=\u672a\u767b\u5f55
 varmgr.authenticated=\u5df2\u9a8c\u8bc1
 varmgr.asserted=\u5c1a\u5f85\u9a8c\u8bc1
-varmgr.anonymous=\u533f\u540d
\ No newline at end of file
+varmgr.anonymous=\u533f\u540d
+
+######################################################################
+#
+#  JSPWiki field labels used by <stripes:*> tags
+#
+######################################################################
+
+loginName=\u767b\u5f55\u540d
+password=\u5bc6\u7801
+remember=\u662f\u5426\u8bb0\u4f4f\u6211\u7684\u4fe1\u606f\uff1f
+login=\u767b\u5f55\u540d
+email=\u7535\u5b50\u90ae\u4ef6\u5730\u5740
+resetPassword=\u91cd\u8bbe\u5bc6\u7801\uff01
+profile.loginName=\u767b\u5f55\u540d *
+profile.password=\u5bc6\u7801 *
+passwordAgain=\u5bc6\u7801\u9a8c\u8bc1 *
+profile.fullname=\u540d\u5b57 *
+com.ecyrd.jspwiki.action.UserProfileActionBean.save=\u4fdd\u5b58\u6982\u8981\u4fe1\u606f

Modified: incubator/jspwiki/trunk/etc/i18n/templates/default.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/default.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default.properties Wed Dec 31 09:26:59 2008
@@ -252,11 +252,7 @@
 
 login.help=Please sign in with your login name and password.
 login.errorprefix=Error:&nbsp;
-login.login=Login
-login.password=Password
-login.remember=Remember me?
 
-login.submit.login=Login
 login.invite=Wanna login?
 login.nopassword=Don&#8217;t have an account ?
 login.registernow=Join {0} now!
@@ -408,7 +404,6 @@
 prefs.errorprefix.profile=Could not save profile:&nbsp;
 prefs.errorprefix.rename=Could not rename the page:&nbsp;
 
-prefs.loginname=Login name *
 prefs.loginname.description=This is your login id.
 prefs.loginname.cannotset.new=You cannot set your login name because you are not \
   logged in yet. You should log in first, using the credentials supplied by \
@@ -416,15 +411,11 @@
 prefs.loginname.cannotset.exists=You cannot set your login name because \
   your credentials are managed by the web container, not the wiki.
 
-prefs.password=Password *
 prefs.password.description=Sets your account password. It may not be blank.
-prefs.password2=Password verify *
 prefs.password2.description=Re-type your password for verification.
 
-prefs.fullname=Name *
 prefs.fullname.description=Use your name in Access Control Lists or wiki Groups.
 
-prefs.email=E-mail address
 prefs.email.description= (optional). If you lose your password, \
     you can ask to have a new, random password sent to this address.
 
@@ -440,9 +431,6 @@
 prefs.lastmodified=You created your profile on {0}, and last saved it on {1}
 prefs.save.description=Click &#8220;save profile&#8221; to save your wiki profile.
 
-prefs.save.submit=Save profile
-prefs.create.submit=Create New User Profile
-
 prefs.roles=Roles
 prefs.groups=Groups
 prefs.creationdate=Creation date
@@ -664,71 +652,3 @@
 
 javascript.prefs.areyousure=Without clicking the Save User Preferences button, \
 	your changes will be lost. Are you sure you want to exit this page?
-
-###############################################################################
-## Default Resource Bundle file for the Stripes Framework. Values should be
-## placed in here for the following:
-##   - Form Field Labels, unless you want users to see a non-localized, non-
-##     pretty name from the form field declaration (prettied up a little).
-##   - Error messages for:
-##       - Standard validation error messages
-##       - Converter error messages
-##       - Error messages used in your custom ActionBean classes
-###############################################################################
-
-# Resource strings used by the <stripes:errors> tag when there are no nested tags
-stripes.errors.header=<div style="color:#b72222; font-weight: bold">Please fix the following errors:</div><ol>
-stripes.errors.beforeError=<li style="color: #b72222;">
-stripes.errors.afterError=</li>
-stripes.errors.footer=</ol>
-
-# Resource strings used by the <stripes:errors> tag when displaying errors for a
-# specific field (e.g. <stripes:errors field="password"/>). If not supplied the
-# values above will be used instead.
-stripes.fieldErrors.header=
-stripes.fieldErrors.beforeError=<span style="color: #b72222;">
-stripes.fieldErrors.afterError=</span><br />
-stripes.fieldErrors.footer=
-
-# Resource strings used by the stripes:messages tag
-stripes.messages.header=<ul class="messages">
-stripes.messages.beforeMessage=<li>
-stripes.messages.afterMessage=</li>
-stripes.messages.footer=</ul>
-
-# Validation error messages produced by Stripes' built-in converter classes. These
-# are default error messages and can be overridden on per-field and per-form levels.
-# Using the 'invalidNumber' error for a field 'age' of a form posting to
-# '/user/Profile.action', the keys looked for (in order) would be:
-#      1: /user/Profile.action.age.invalidNumber
-#      2: /user/Profile.action.age.errorMessage
-#      3: age.errorMessage
-#      4: /user/Profile.action.invalidNumber
-#      5: converter.number.invalidNumber
-converter.number.invalidNumber=The value ({1}) entered in field {0} must be a valid number
-converter.byte.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
-converter.short.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
-converter.integer.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
-converter.float.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
-converter.enum.notAnEnumeratedValue=The value "{1}" is not a valid value for field {0}
-converter.date.invalidDate=The value ({1}) entered in field {0} must be a valid date
-converter.email.invalidEmail=The value ({1}) entered is not a valid email address
-converter.creditCard.invalidCreditCard=The value ({1}) entered is not a valid credit card number
-
-# Validation error messages produced by Stripes' annotation based validations. These
-# are default error messages and can be overridden on per-field and per-form levels.
-# Using the 'valueNotPresent' required field error for a field 'username' of a form
-# posting to '/user/Register.action', the keys looked for (in order) would be:
-#      1: /user/Register.action.username.valueNotPresent
-#      2: /user/Register.action.username.errorMessage
-#      3: username.errorMessage
-#      4: /user/Register.action.valueNotPresent
-#      5: validation.required.valueNotPresent
-validation.required.valueNotPresent={0} is a required field
-validation.minlength.valueTooShort={0} must be at least {2} characters long
-validation.maxlength.valueTooLong={0} must be no more than {2} characters long
-validation.minvalue.valueBelowMinimum=The minimum allowed value for {0} is {2}
-validation.maxvalue.valueAboveMaximum=The maximum allowed value for {0} is {2}
-validation.mask.valueDoesNotMatch=<em>{1}</em> is not a valid {0}
-validation.expression.valueFailedExpression=The value supplied ({1}) for field {0} is invalid
-validation.file.postBodyTooBig=Total upload size of {3} KB exceeds the maximum size of {2} KB

Modified: incubator/jspwiki/trunk/etc/i18n/templates/default_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/default_de.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default_de.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default_de.properties Wed Dec 31 09:26:59 2008
@@ -258,11 +258,7 @@
 
 login.help=Bitte mit Benutzername und Passwort anmelden.
 login.errorprefix=Fehler:&nbsp;
-login.login=Benutzername
-login.password=Passwort
-login.remember=Anmeldung speichern?
 
-login.submit.login=Anmeldung
 login.invite=Willst du dich anmelden?
 login.nopassword=Noch keinen Zugang?
 login.registernow={0} jetzt beitreten!
@@ -274,8 +270,6 @@
 login.lostpw.getnew=Hol dir jetzt ein neues!
 login.lostpw.heading=Passwort zurücksetzen
 login.lostpw.help=Passwort vergessen oder verloren? Bitte gib die bei der Registrierung verwendete E-Mail-Adresse ein!
-login.lostpw.name=E-Mail-Adresse
-login.lostpw.submit=Passwort zurücksetzen!
 login.lostpw.reset.clickhere=Klicke hier
 login.lostpw.reset.login={0} um dich gleich anzumelden, nachdem du dein neues Passwort erhalten hast.
 
@@ -406,22 +400,17 @@
 prefs.errorprefix.profile=Benutzerprofil konnte nicht gespeichert werden:&nbsp;
 prefs.errorprefix.rename=Fehler beim Umbenennen der Seite:&nbsp;
 
-prefs.loginname=dein Benutzername (*)
 prefs.loginname.description=Dein Benutzername wird für die Anmeldung an diesem Wiki verwendet.
 prefs.loginname.cannotset.new=Du kannst deinen Benutzernamen nicht ändern, solange du nicht angemeldet bist.
 prefs.loginname.cannotset.exists=Du kannst deinen Benutzernamen hier nicht ändern, da er durch den Web Container \
 	verwaltet wird, und nicht durch das Wiki selbst.
 
-prefs.password=dein Passwort (*)
 prefs.password.description=Gib ein Passwort für dein Benutzerprofil ein.
-prefs.password2=Passwort wiederholen (*)
 prefs.password2.description=Gib das Passwort zur Sicherheit erneut ein.
 
-prefs.fullname=dein voller Name (*)
 prefs.fullname.description=Dein voller Name ist dein Name, unter dem du im Wiki als Benutzer auftrittst. Verwende ihn \
 	z.B. für die Zugangsberechtigungslisten (ACLs) von Seiten und für Wiki-Gruppen.
 
-prefs.email=E-Mail-Adresse
 prefs.email.description=(optional) Falls du dein Passwort einmal vergessen haben solltest, kannst du dir an diese \
 	Adresse ein neues schicken lassen.
 
@@ -435,9 +424,6 @@
 prefs.lastmodified=Du hast dein Profil am {0} erstellt und zuletzt am {1} geändert.
 prefs.save.description=Klicke auf 'Profil speichern', um dein Profil zu sichern.
 
-prefs.save.submit=Profil speichern
-prefs.create.submit=Neues Benutzerprofil erstellen
-
 prefs.roles=Rollen
 prefs.groups=Gruppen
 prefs.creationdate=Erstellt am

Modified: incubator/jspwiki/trunk/etc/i18n/templates/default_es.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/default_es.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default_es.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default_es.properties Wed Dec 31 09:26:59 2008
@@ -248,11 +248,7 @@
 
 login.help=Por favor identifíquese con su id. de acceso y contraseña.
 login.errorprefix=Error:&nbsp;
-login.login=Id. de acceso
-login.password=Contraseña
-login.remember=&#191;Recordarme?
 
-login.submit.login=Iniciar sesión
 login.invite=&#191;Quieres identificarte?
 login.nopassword=&#191;No tienes una contraseña?
 login.registernow=&#161;Únete a {0} ahora!
@@ -264,8 +260,6 @@
 login.lostpw.getnew=&#161;Consigue una nueva!
 login.lostpw.heading=Resetear la contraseña
 login.lostpw.help=&#191;Perdiste u olvidaste tu contraseña?  Introduce aquí la dirección de e-mail con la que te registraste.
-login.lostpw.name=E-mail de la cuenta
-login.lostpw.submit=&#161;Resetear contraseña!
 login.lostpw.reset.clickhere=Click aquí
 login.lostpw.reset.login={0} para identificarte una vez recibas la nueva contraseña.
 
@@ -410,7 +404,6 @@
 prefs.errorprefix.profile=No se pudo salvar el perfil:&nbsp;
 prefs.errorprefix.rename=No se pudo renombrar la página:&nbsp;
 
-prefs.loginname=Nombre de inicio de sesión *
 prefs.loginname.description=Éste es tu nombre de inicio de sesión.
 prefs.loginname.cannotset.new=No puedes establecer tu Nombre de inicio de sesión porque no has \
   iniciado una sesión todavía. Debes iniciar una sesión primero, usando unas credenciales \
@@ -418,15 +411,11 @@
 prefs.loginname.cannotset.exists=No puedes establecer tu nombre de inicio de sesión porque \
   tus credenciales son gestionadas por el contenedor web, no por el wiki.
 
-prefs.password=Contraseña *
 prefs.password.description=Establece la contraseña de acceso a la cuenta. No puede estar en blanco.
-prefs.password2=Verificación de contraseña *
 prefs.password2.description=Escribe tu contraseña otra vez para verificarla.
 
-prefs.fullname=Nombre *
 prefs.fullname.description=Usa tu Nombre en las Listas de Control de Acceso (ACLs) o en los wiki-grupos.
 
-prefs.email=Dirección E-mail
 prefs.email.description= (opcional). Si pierdes tu contraseña, puedes pedir que \
     te envíen una nueva contraseña generada aleatoriamente a esta dirección.
 
@@ -442,9 +431,6 @@
 prefs.lastmodified=Creaste tu perfil el {0}, y lo modificaste por última vez el {1}.
 prefs.save.description=Haz click en &#8220;Guardar Perfil&#8221; para guardar tu perfil en el wiki.
 
-prefs.save.submit=Guardar Perfil
-prefs.create.submit=Crear un nuevo Perfil de Usuario
-
 prefs.roles=Roles
 prefs.groups=Grupos
 prefs.creationdate=Fecha de creación

Modified: incubator/jspwiki/trunk/etc/i18n/templates/default_fi.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/default_fi.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default_fi.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default_fi.properties Wed Dec 31 09:26:59 2008
@@ -236,11 +236,7 @@
 
 login.help=Kirjaudu sisään käyttäjätunnuksellasi ja salasanallasi.
 login.errorprefix=Virhe:&nbsp;
-login.login=Käyttäjätunnus
-login.password=Salasana
-login.remember=Muista minut?
 
-login.submit.login=Kirjaudu
 login.invite=Haluatko sisään?
 login.nopassword=Eikö sinulla ole tunnusta?
 login.registernow=Liity heti!
@@ -253,8 +249,6 @@
 login.lostpw.heading=Lähetä uusi salasana
 login.lostpw.help=Hukkasitko tai unohditko salasanasi?  Kirjoita tähän \
 	käyttämäsi sähköpostiosoite ja lähetämme sinulle uuden.
-login.lostpw.name=Sähköpostiosoite
-login.lostpw.submit=Lähetä uusi salasana!
 login.lostpw.reset.clickhere=Klikkaa tästä
 login.lostpw.reset.login={0} kirjautuaksesi sisään kun olet saanut uuden salasanan postitse.
 
@@ -374,22 +368,17 @@
 prefs.errorprefix.prefs=Asetuksia ei voitu tallentaa:&nbsp;
 prefs.errorprefix.profile=Tiliä ei voitu tallentaa:&nbsp;
 
-prefs.loginname=Käyttäjätunnus *
 prefs.loginname.description=Tämä on käyttäjätunnuksesi
 prefs.loginname.cannotset.new=Et voi asettaa käyttäjätunnustasi, ennen kuin olet kirjautunut sisään. \
   Kirjaudu sisään tunnuksilla, jotka olet saanut ylläpidolta.
 prefs.loginname.cannotset.exists=Et voi asettaa käyttäjätunnusta, koska tämän wikin \
 	käyttäjätunnuksia hallitsee järjestelmä, ei wiki.
 
-prefs.password=Salasana *
 prefs.password.description=Aseta salasana.  Se ei saa olla tyhjä.
-prefs.password2=Vahvista salasana *
 prefs.password2.description=Kirjoita salasana uudelleen varmistusta varten.
 
-prefs.fullname=Nimi *
 prefs.fullname.description=Käytä nimeäsi pääsynvalvontalistoissa (ACL) tai ryhmissä.
 
-prefs.email=Sähköpostiosoite
 prefs.email.description=(valinnainen)  Jos unohdat salasanasi, voit pyytää myöhemmin uuden salasanan \
 	tähän osoitteeseen.
 prefs.cookie.info=Tämä wiki muistaa sinut automaattisesti käyttäen evästeitä, \
@@ -402,9 +391,6 @@
 prefs.lastmodified=Loit käyttäjätilisi {0}, ja muutit sitä viimeksi {1}
 prefs.save.description=Paina &quot;Tallenna profiili&quot; tallentaaksesi profiilisi (duh).
 
-prefs.save.submit=Tallenna profiili
-prefs.create.submit=Luo uusi käyttäjätili
-
 prefs.save.prefs.submit=Tallenna asetukset
 prefs.cookies=Asetuksesi tallennetaan tämän selaimen evästeisiin.
 prefs.clear.heading=Asetusten poisto

Modified: incubator/jspwiki/trunk/etc/i18n/templates/default_fr.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/default_fr.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default_fr.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default_fr.properties Wed Dec 31 09:26:59 2008
@@ -252,11 +252,7 @@
 
 login.help=Veuillez entrer votre identifiant et votre mot de passe.
 login.errorprefix=Erreur\u00A0:\u00A0
-login.login=Identifiant
-login.password=Mot de passe
-login.remember=Se souvenir de moi
 
-login.submit.login=S\u0027identifier
 login.invite=Vous voulez vous identifier\u00A0?
 login.nopassword=Vous n\u0027avez pas de compte\u00A0?
 login.registernow=Inscrivez-vous \u00E0 {0} maintenant\u00A0!
@@ -268,8 +264,6 @@
 login.lostpw.getnew=Obtenez-en un nouveau\u00A0!
 login.lostpw.heading=R\u00E9initialiser le mot de passe
 login.lostpw.help=Vous avez perdu ou oubli\u00E9 votre mot de passe\u00A0? Entrez ici l\u0027adresse e-mail que vous avez utilis\u00E9e pour vous inscrire.
-login.lostpw.name=Adresse e-mail du compte
-login.lostpw.submit=R\u00E9initialiser le mot de passe\u00A0!
 login.lostpw.reset.clickhere=Cliquer ici
 login.lostpw.reset.login={0} pour vous identifier une fois que vous avez r\u00E9cup\u00E9r\u00E9 votre nouveau mot de passe.
 
@@ -408,22 +402,17 @@
 prefs.errorprefix.profile=Impossible d\u0027enregistrer le profil\u00A0:&nbsp;
 prefs.errorprefix.rename=Impossible de renommmer la page\u00A0:&nbsp;
 
-prefs.loginname=Identifiant *
 prefs.loginname.description=Ceci est votre identifiant.
 prefs.loginname.cannotset.new=Vous ne pouvez pas fixer votre identifiant car vous n\u0027\u00EAtes pas encore identifi\u00E9. \
   Veuillez d\u0027abord vous identifier, gr\u00E2ce aux permissions que vous a accord\u00E9es votre administrateur.
 prefs.loginname.cannotset.exists=Vous ne pouvez pas fixer votre identifiant car vos permissions sont g\u00E9r\u00E9es \
   par le conteneur Web, et non le Wiki.
 
-prefs.password=Mot de passe *
 prefs.password.description=Fixe le mot de passe de votre compte. Il ne peut pas \u00EAtre blanc.
-prefs.password2=V\u00E9rification du mot de passe *
 prefs.password2.description=Re-saisissez votre mot de passe pour v\u00E9rification.
 
-prefs.fullname=Nom *
 prefs.fullname.description=Utilisez votre nom dans les listes de contr\u00F4le d\u0027acc\u00E8s (ACL) ou les groupes Wiki.
 
-prefs.email=Adresse e-mail
 prefs.email.description= (optionnel). Si vous perdez votre mot de passe, \
     vous pouvez demander \u00E0 ce qu\u0027un nouveau mot de passe, g\u00E9n\u00E9r\u00E9 al\u00E9atoirement, \
     vous soit envoy\u00E9 \u00E0 cette adresse.
@@ -440,9 +429,6 @@
 prefs.lastmodified=Vous avez cr\u00E9\u00E9 votre profil le {0}, et vous l\u0027\u0027avez modifi\u00E9 pour la derni\u00E8re fois le {1}
 prefs.save.description=Cliquez sur \u201CEnregistrer le profil\u201D pour enregistrer votre profil Wiki.
 
-prefs.save.submit=Enregistrer le profil
-prefs.create.submit=Cr\u00E9er un nouveau profil utilisateur
-
 prefs.roles=R\u00F4les
 prefs.groups=Groupes
 prefs.creationdate=Date de cr\u00E9ation

Modified: incubator/jspwiki/trunk/etc/i18n/templates/default_it.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/default_it.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default_it.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default_it.properties Wed Dec 31 09:26:59 2008
@@ -247,11 +247,7 @@
 
 login.help=Autenticati con il tuo identificativo e password.
 login.errorprefix=Errore:&nbsp;
-login.login=Login
-login.password=Password
-login.remember=Ricordati di me?
 
-login.submit.login=Login
 login.invite=Vuoi autenticarti?
 login.nopassword=Non hai un account ?
 login.registernow=Registrati a {0} ora!
@@ -263,8 +259,6 @@
 login.lostpw.getnew=Ottienine una nuova!
 login.lostpw.heading=Cambia la Password
 login.lostpw.help=Password dimenticata?  Inserisci l&#8217;indirizzo email che hai usato per registrarti.
-login.lostpw.name=Account email
-login.lostpw.submit=Cambia la password !
 login.lostpw.reset.clickhere=Clicca qu&igrave;
 login.lostpw.reset.login={0} per collegarti una volta che hai ottenuto una nuova password.
 
@@ -396,7 +390,6 @@
 prefs.errorprefix.prefs=Non &egrave; possibile salvare le preferenze:&nbsp;
 prefs.errorprefix.profile=Non &egrave; possibile salvare il profilo:&nbsp;
 
-prefs.loginname=Login name *
 prefs.loginname.description=Questo &egrave; il tuo identificativo utente.
 prefs.loginname.cannotset.new=Non potete modificare il vostro login name perch&egrave non siete ancora \
   autenticati. Occorre che vi autentichiate, usando le credenziali fornitevi dal  \
@@ -404,15 +397,11 @@
 prefs.loginname.cannotset.exists=Non puoi definire il tuo identificativo perch&egrave;\
   le tue credenziali sono gestite dal the web container, non dal wiki.
 
-prefs.password=Password *
 prefs.password.description=La password del tuo account. Non pu&ograve; essere vuota.
-prefs.password2=Verifica Password *
 prefs.password2.description=Riscrivi la tua password per verifica.
 
-prefs.fullname=Nome *
 prefs.fullname.description=Usa questo nome nelle liste di controllo di accesso (ACL) o nei gruppi Wiki.
 
-prefs.email=Indirizzo E-mail 
 prefs.email.description= (opzionale). Se perdi la tua password, \
     puoi richiederne una nuova - verr&agrave; inviata a questo indirizzo.
 
@@ -428,9 +417,6 @@
 prefs.lastmodified=Hai crato il tuo profilo su {0}, e l&#8217;hai salvato il {1}
 prefs.save.description=Seleziona &#8220;Salva il profilo&#8221; per salvare il tuo profilo.
 
-prefs.save.submit=Salva il profilo
-prefs.create.submit=Crea un nuovo profilo utente
-
 prefs.roles=Ruoli
 prefs.groups=Gruppi
 prefs.creationdate=Data creazione

Modified: incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties Wed Dec 31 09:26:59 2008
@@ -249,11 +249,7 @@
 
 login.help=Gelieve in te loggen met uw login naam en wachtwoord
 login.errorprefix=Fout:&nbsp;
-login.login=Login
-login.password=Wachtwoord
-login.remember=Bewaar login naam in browser cookie?
 
-login.submit.login=Login
 login.invite=Wilt U inloggen op deze site?
 login.nopassword=Maar U heeft nog geen loginnaam ?
 login.registernow=Registreer hier een nieuwe {0} gebruiker!
@@ -265,8 +261,6 @@
 login.lostpw.getnew=Vraag een nieuw wachtwoord!
 login.lostpw.heading=Nieuw wachtwoord aanvragen
 login.lostpw.help=U bent het wachtwoord vergeten of verloren?  Vul hier het email adres dat U bij registratie hebt ingevuld.
-login.lostpw.name=Email adres
-login.lostpw.submit=Genereer een nieuw wachtwoord !
 login.lostpw.reset.clickhere=Klik hier
 login.lostpw.reset.login={0} om in te loggen zodra U het nieuwe wachtwoord hebt ontvangen.
 
@@ -402,22 +396,17 @@
 prefs.errorprefix.profile=Het gebruikers profiel kon niet worden bewaard:&nbsp;
 prefs.errorprefix.rename=De pagina kon niet worden hernoemd:&nbsp;
 
-prefs.loginname=Login naam *
 prefs.loginname.description=Dit is uw login id.
 prefs.loginname.cannotset.new=De login naam kan niet worden gewijzigd omdat U niet ingelogged bent. \
   Gelieve eerst in te loggen, met de credentials die door uw administrator werden aangeleverd.
 prefs.loginname.cannotset.exists=De login naam kan niet worden ingegeven omdat \
   de credentials worden beheerd door de web-container, niet door wiki.
   
-prefs.password=Wachtwoord *
 prefs.password.description=Geef uw wachtwoord. Dit veld mag niet leeg zijn
-prefs.password2=Bevestig Wachtwoord *
 prefs.password2.description=Bevestig uw wachtwoord voor verificatie
 
-prefs.fullname=Naam *
 prefs.fullname.description=Deze naam kan worden gebruikt in ACLs of wiki groepen
 
-prefs.email=E-mail adres
 prefs.email.description= (optioneel). Bij verlies van het wachtwoord, \
     kunt U een nieuw random wachtwoord aanvragen dat naar dit email adres zal worden gezonden.
     
@@ -430,9 +419,6 @@
 prefs.lastmodified=Dit gebruikersprofiel werd aangemaakt op {0}, en is laatst gewijzigd op {1}
 prefs.save.description=Klik &#8220;Bewaar Gebruikersprofiel&#8221; om het profiel te bewaren.
 
-prefs.save.submit=Bewaar Gebruikersprofiel
-prefs.create.submit=Maak nieuw Gebruikersprofiel
-
 prefs.roles=Rollen
 prefs.groups=Groepen
 prefs.creationdate=Datum van creatie

Modified: incubator/jspwiki/trunk/etc/i18n/templates/default_ru.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/default_ru.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default_ru.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default_ru.properties Wed Dec 31 09:26:59 2008
@@ -244,11 +244,7 @@
 
 login.help=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u0432\u043e\u0439\u0434\u0438\u0442\u0435 \u043f\u043e\u0434 \u0441\u0432\u043e\u0438\u043c \u0438\u043c\u0435\u043d\u0435\u043c \u0438 \u043f\u0430\u0440\u043e\u043b\u0435\u043c.
 login.errorprefix=\u041e\u0448\u0438\u0431\u043a\u0430:&nbsp;
-login.login=\u041b\u043e\u0433\u0438\u043d
-login.password=\u041f\u0430\u0440\u043e\u043b\u044c
-login.remember=\u0417\u0430\u043f\u043e\u043c\u043d\u0438\u0442\u044c \u043c\u0435\u043d\u044f?
 
-login.submit.login=\u041b\u043e\u0433\u0438\u043d
 login.invite=\u0425\u043e\u0442\u0438\u0442\u0435 \u0432\u043e\u0439\u0442\u0438?
 login.nopassword=\u041d\u0435\u0442 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 ?
 login.registernow=\u041f\u0440\u0438\u0441\u043e\u0435\u0434\u0438\u043d\u044f\u0439\u0441\u044f {0} \u0441\u0435\u0439\u0447\u0430\u0441!
@@ -260,8 +256,6 @@
 login.lostpw.getnew=\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u0435 \u0435\u0449\u0451!
 login.lostpw.heading=\u0421\u0431\u0440\u043e\u0441 \u043f\u0430\u0440\u043e\u043b\u044f
 login.lostpw.help=\u0417\u0430\u0431\u044b\u043b\u0438 \u0438\u043b\u0438 \u043f\u043e\u0442\u0435\u0440\u044f\u043b\u0438 \u0441\u0432\u043e\u0439 \u043f\u0430\u0440\u043e\u043b\u044c?  \u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0441\u0432\u043e\u0439 \u0435\u043c\u0435\u0439\u043b, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0432\u044b \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043b\u0438 \u043f\u0440\u0438 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438.
-login.lostpw.name=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u0435\u043c\u0435\u0439\u043b
-login.lostpw.submit=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c !
 login.lostpw.reset.clickhere=\u041a\u043b\u0438\u043a\u043d\u0443\u0442\u044c \u0442\u0443\u0442
 login.lostpw.reset.login={0} \u043f\u0430\u0440\u043e\u043b\u044c \u0431\u044b\u043b \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d \u0438 \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d \u043d\u0430 \u043f\u043e\u0447\u0442\u0443.
 
@@ -388,22 +382,17 @@
 prefs.errorprefix.profile=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043f\u0440\u043e\u0444\u0438\u043b\u044c:&nbsp;
 prefs.errorprefix.rename=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443:&nbsp;
 
-prefs.loginname=\u041b\u043e\u0433\u0438\u043d *
 prefs.loginname.description=\u042d\u0442\u043e ID \u0432\u0430\u0448\u0435\u0433\u043e \u043b\u043e\u0433\u0438\u043d\u0430.
 prefs.loginname.cannotset.new=\u0412\u044b \u043d\u0435 \u043c\u043e\u0436\u0435\u0442\u0435 \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0441\u0432\u043e\u0439 \u043b\u043e\u0433\u0438\u043d, \u043f\u043e\u0441\u043a\u043e\u043b\u044c\u043a\u0443 \u0432\u044b \u043d\u0435 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043d\u044b. \
 				\u0410\u0432\u0442\u043e\u0440\u0438\u0437\u0438\u0440\u0443\u0439\u0442\u0435\u0441\u044c \u0441\u043f\u0435\u0440\u0432\u0430.
 prefs.loginname.cannotset.exists=\u0412\u044b \u043d\u0435 \u043c\u043e\u0436\u0435\u0442\u0435 \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0438\u043c\u044f, \u043f\u043e\u0441\u043a\u043e\u043b\u044c\u043a\u0443 \u0437\u0430\u043f\u0438\u0441\u0438 \ 
 				\u0443\u043f\u0440\u0430\u0432\u043b\u044f\u044e\u0442\u0441\u044f \u043d\u0435 \u0432\u0438\u043a\u0438.
-prefs.password=\u041f\u0430\u0440\u043e\u043b\u044c *
 prefs.password.description=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0432\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c. \u041f\u043e\u043b\u0435 \u043d\u0435 \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c.
-prefs.password2=\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043f\u0430\u0440\u043e\u043b\u044f *
 prefs.password2.description=\u0414\u043b\u044f \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438, \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u043f\u043e\u0432\u0442\u043e\u0440\u043d\u043e \u0432\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c.
 
-prefs.fullname=\u0418\u043c\u044f *
 prefs.fullname.description=\u0418\u043c\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0434\u043b\u044f \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u0441\u043f\u0438\u0441\u043a\u043e\u0432 \u0434\u043e\u0441\u0442\u0443\u043f\u0430 (ACL) \
 			 \u0438\u043b\u0438 \u0440\u0430\u0437\u043c\u0435\u0449\u0435\u043d\u0438\u044f \u0432 \u0433\u0440\u0443\u043f\u043f\u0430\u0445
    
-prefs.email=\u042d\u043b\u0435\u043a\u0442\u043e\u0440\u043d\u043d\u0430\u044f \u043f\u043e\u0447\u0442\u0430
 prefs.email.description= (\u043e\u043f\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u043e). \u0415\u0441\u043b\u0438 \u0432\u044b \u0437\u0430\u0431\u0443\u0434\u0435\u0442\u0435 \u043f\u0430\u0440\u043e\u043b\u044c, \
     \u043f\u043e\u0447\u0442\u0430 \u0431\u0443\u0434\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0430 \u0434\u043b\u044f \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u043d\u043e\u0432\u043e\u0433\u043e \u043f\u0430\u0440\u043e\u043b\u044f.
 
@@ -417,8 +406,6 @@
 prefs.lastmodified=\u0412\u0430\u0448 \u043f\u0440\u043e\u0444\u0438\u043b\u044c \u0441\u043e\u0437\u0434\u0430\u043d {0}, \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0435 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435 {1}
 prefs.save.description=\u041a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 &#8220;\u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043f\u0440\u043e\u0444\u0438\u043b\u044c&#8221; \ 
 		       \u0434\u043b\u044f \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0435\u043d\u0438\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a
-prefs.save.submit=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043f\u0440\u043e\u0444\u0438\u043b\u044c
-prefs.create.submit=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043d\u043e\u0432\u044b\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u043f\u0440\u043e\u0444\u0438\u043b\u044c
 
 prefs.roles=\u041f\u0440\u0430\u0432\u0438\u043b\u0430
 prefs.groups=\u0413\u0440\u0443\u043f\u043f\u044b

Modified: incubator/jspwiki/trunk/etc/i18n/templates/default_zh_CN.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/default_zh_CN.properties?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default_zh_CN.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default_zh_CN.properties Wed Dec 31 09:26:59 2008
@@ -246,11 +246,7 @@
 
 login.help=\u8bf7\u7528\u60a8\u7684\u767b\u5f55\u540d\u548c\u5bc6\u7801\u767b\u5f55\u3002
 login.errorprefix=\u9519\u8bef\uff1a&nbsp;
-login.login=\u767b\u5f55\u540d
-login.password=\u5bc6\u7801
-login.remember=\u662f\u5426\u8bb0\u4f4f\u6211\u7684\u4fe1\u606f\uff1f
 
-login.submit.login=\u767b\u5f55\u540d
 login.invite=\u8981\u767b\u5f55\u5417\uff1f
 login.nopassword=\u6ca1\u6709\u5e10\u6237\u5417\uff1f
 login.registernow=\u73b0\u5728\u52a0\u5165 {0}\uff01
@@ -262,8 +258,6 @@
 login.lostpw.getnew=\u83b7\u53d6\u65b0\u5bc6\u7801\uff01
 login.lostpw.heading=\u91cd\u8bbe\u5bc6\u7801
 login.lostpw.help=\u4e22\u5931\u6216\u5fd8\u8bb0\u4e86\u5bc6\u7801\uff1f\u5728\u6b64\u8f93\u5165\u6ce8\u518c\u4f7f\u7528\u7684\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u3002
-login.lostpw.name=\u5e10\u6237\u7535\u5b50\u90ae\u4ef6
-login.lostpw.submit=\u91cd\u8bbe\u5bc6\u7801\uff01
 login.lostpw.reset.clickhere=\u5355\u51fb\u6b64\u5904
 login.lostpw.reset.login=\u4e00\u6536\u5230\u65b0\u5bc6\u7801\uff0c{0} \u5c31\u4f1a\u767b\u5f55\u3002
 
@@ -391,21 +385,16 @@
 prefs.errorprefix.profile=\u65e0\u6cd5\u4fdd\u5b58\u6982\u8981\u4fe1\u606f\uff1a
 prefs.errorprefix.rename=\u65e0\u6cd5\u91cd\u547d\u540d\u9875\u9762\uff1a
 
-prefs.loginname=\u767b\u5f55\u540d *
 prefs.loginname.description=\u8fd9\u662f\u60a8\u7684\u767b\u5f55\u6807\u8bc6\u3002
 prefs.loginname.cannotset.new=\u7531\u4e8e\u8fd8\u672a\u767b\u5f55\uff0c\u60a8\u4e0d\u80fd\u8bbe\u7f6e\u767b\u5f55\u540d\u3002\
 \u60a8\u5e94\u8be5\u4f7f\u7528\u7ba1\u7406\u5458\u63d0\u4f9b\u7684\u51ed\u8bc1\u5148\u8fdb\u884c\u767b\u5f55\u3002
 prefs.loginname.cannotset.exists=\u7531\u4e8e\u662f Web \u5bb9\u5668\u800c\u4e0d\u662f Wiki \u7ba1\u7406\u60a8\u7684\u51ed\u8bc1\uff0c\u56e0\u6b64\u60a8\u65e0\u6cd5\u8bbe\u7f6e\u767b\u5f55\u540d\u3002
 
-prefs.password=\u5bc6\u7801 *
 prefs.password.description=\u8bbe\u7f6e\u5e10\u6237\u5bc6\u7801\u3002\u4e0d\u80fd\u4e3a\u7a7a\u3002
-prefs.password2=\u5bc6\u7801\u9a8c\u8bc1 *
 prefs.password2.description=\u91cd\u65b0\u8f93\u5165\u5bc6\u7801\u8fdb\u884c\u9a8c\u8bc1\u3002
 
-prefs.fullname=\u540d\u5b57 *
 prefs.fullname.description=\u4f7f\u7528\u8bbf\u95ee\u63a7\u5236\u8868\u6216 Wiki \u7ec4\u4e2d\u7684\u540d\u79f0\u3002
 
-prefs.email=\u7535\u5b50\u90ae\u4ef6\u5730\u5740
 prefs.email.description= \uff08\u53ef\u9009\uff09\u3002\
 \u5982\u679c\u4e22\u5931\u5bc6\u7801\uff0c\u60a8\u53ef\u4ee5\u8981\u6c42\u5411\u8fd9\u4e2a\u5730\u5740\u53d1\u9001\u4e00\u4e2a\u65b0\u7684\u968f\u673a\u5bc6\u7801\u3002
 
@@ -418,9 +407,6 @@
 prefs.lastmodified=\u60a8\u5728 {0} \u521b\u5efa\u4e86\u6982\u8981\u4fe1\u606f\uff0c\u6700\u540e\u4fdd\u5b58\u65f6\u95f4\u4e3a {1}
 prefs.save.description=\u5355\u51fb\u201c\u4fdd\u5b58\u6982\u8981\u4fe1\u606f\u201d\u4ee5\u4fdd\u5b58 Wiki \u6982\u8981\u4fe1\u606f\u3002
 
-prefs.save.submit=\u4fdd\u5b58\u6982\u8981\u4fe1\u606f
-prefs.create.submit=\u521b\u5efa\u65b0\u7528\u6237\u6982\u8981\u4fe1\u606f
-
 prefs.roles=\u89d2\u8272
 prefs.groups=\u7ec4
 prefs.creationdate=\u521b\u5efa\u65e5\u671f

Modified: incubator/jspwiki/trunk/etc/web.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/web.xml?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/web.xml (original)
+++ incubator/jspwiki/trunk/etc/web.xml Wed Dec 31 09:26:59 2008
@@ -69,11 +69,11 @@
       <!-- We override Stripes' normal resource bundle to use ours instead. -->
       <init-param>
          <param-name>LocalizationBundleFactory.FieldNameBundle</param-name>
-         <param-value>templates.default</param-value>
+         <param-value>CoreResources</param-value>
       </init-param>
       <init-param>
          <param-name>LocalizationBundleFactory.ErrorMessageBundle</param-name>
-         <param-value>templates.default</param-value>
+         <param-value>CoreResources</param-value>
       </init-param>
       <!-- Locales supported by this wiki -->
       <init-param>

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.java?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.java Wed Dec 31 09:26:59 2008
@@ -6,6 +6,7 @@
 
 import javax.mail.AuthenticationFailedException;
 import javax.mail.SendFailedException;
+import javax.security.auth.login.LoginException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -36,8 +37,6 @@
 {
     private static final Logger log = LoggerFactory.getLogger( LoginActionBean.class );
 
-    private static final String DEFAULT_TAB = "logincontent";
-
     /**
      * Sets cookies and redirects the user to a wiki page after a successful
      * profile creation or login.
@@ -77,8 +76,6 @@
 
     private String m_redirect = null;
 
-    private String m_tab = DEFAULT_TAB;
-
     /**
      * Returns the e-mail address.
      * 
@@ -104,11 +101,6 @@
         return m_username;
     }
 
-    public String getTab()
-    {
-        return m_tab;
-    }
-
     public String getRedirect()
     {
         return m_redirect;
@@ -119,7 +111,6 @@
     {
         WikiSession wikiSession = getContext().getWikiSession();
         ValidationErrors errors = getContext().getValidationErrors();
-        ResourceBundle rb = getContext().getBundle( "CoreResources" );
 
         log.debug( "Attempting to authenticate user " + m_username );
 
@@ -128,13 +119,16 @@
         {
             if( !getContext().getEngine().getAuthenticationManager().login( wikiSession, m_username, m_password ) )
             {
-                log.info( "Failed to authenticate user " + m_username );
-                errors.addGlobalError( new SimpleError( rb.getString( "login.error.password" ) ) );
             }
         }
+        catch ( LoginException e )
+        {
+            log.info( "Failed to authenticate user " + m_username );
+            errors.addGlobalError( new LocalizableError( "login.error.password" ) );
+        }
         catch( WikiSecurityException e )
         {
-            errors.addGlobalError( new SimpleError( rb.getString( "login.error" ), e.getMessage() ) );
+            errors.addGlobalError( new LocalizableError( "login.error", e.getMessage() ) );
         }
     }
 
@@ -187,27 +181,8 @@
         m_password = password;
     }
 
-    /**
-     * Sets the <code>tab</code> parameter for the source page. The value
-     * supplied to this method is also added to the source page resolution
-     * returned by
-     * {@link com.ecyrd.jspwiki.ui.stripes.WikiActionBeanContext#getSourcePageResolution()}.
-     * 
-     * @param tab the tab value
-     */
     @Validate()
-    public void setTab( String tab )
-    {
-        m_tab = tab;
-        Resolution r = getContext().getSourcePageResolution();
-        if( r instanceof OnwardResolution )
-        {
-            ((OnwardResolution) r).addParameter( "tab", tab );
-        }
-    }
-
-    @Validate()
-    public void setRmember( boolean remember )
+    public void setRemember( boolean remember )
     {
         m_remember = remember;
     }
@@ -240,14 +215,13 @@
     public Resolution view()
     {
         ValidationErrors errors = getContext().getValidationErrors();
-        ResourceBundle rb = getContext().getBundle( "CoreResources" );
 
         // If user got here and is already authenticated, it means
         // they just aren't allowed access to what they asked for.
         // Weepy tears and hankies all 'round.
         if( getContext().getWikiSession().isAuthenticated() )
         {
-            errors.addGlobalError( new SimpleError( rb.getString( "login.error.noaccess" ) ) );
+            errors.addGlobalError( new LocalizableError( "login.error.noaccess" ) );
             return new RedirectResolution( MessageActionBean.class );
         }
 
@@ -262,7 +236,7 @@
             Object seen = session.getAttribute( "_redirect" );
             if( seen != null )
             {
-                getContext().getValidationErrors().addGlobalError( new SimpleError( rb.getString( "login.error.noaccess" ) ) );
+                getContext().getValidationErrors().addGlobalError( new LocalizableError( "login.error.noaccess" ) );
                 return new RedirectResolution( MessageActionBean.class );
             }
             session.setAttribute( "_redirect", "I love Outi" ); // Any marker
@@ -362,9 +336,7 @@
             wikiSession.addMessage( "resetpw", message );
         }
 
-        ForwardResolution r = new ForwardResolution( "/LoginForm.jsp" );
-        r.addParameter( "tab", "lostpassword" );
-        return r;
+        return new ForwardResolution( "/LostPassword.jsp" );
     }
 
 }

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/RenameActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/RenameActionBean.java?rev=730417&r1=730416&r2=730417&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/RenameActionBean.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/RenameActionBean.java Wed Dec 31 09:26:59 2008
@@ -9,10 +9,7 @@
 import net.sourceforge.stripes.action.RedirectResolution;
 import net.sourceforge.stripes.action.Resolution;
 import net.sourceforge.stripes.action.UrlBinding;
-import net.sourceforge.stripes.validation.SimpleError;
-import net.sourceforge.stripes.validation.Validate;
-import net.sourceforge.stripes.validation.ValidationErrors;
-import net.sourceforge.stripes.validation.ValidationMethod;
+import net.sourceforge.stripes.validation.*;
 
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.auth.permissions.PagePermission;
@@ -165,7 +162,7 @@
     {
         if( getContext().getEngine().pageExists( m_renameTo ) )
         {
-            errors.add( "renameTo", new SimpleError( "The page name '" + m_renameTo + "' already exists. Choose another." ) );
+            errors.add( "renameTo", new LocalizableError( "rename.exists" ) );
         }
     }