incubator-jspwiki-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Harry Metske" <harry.met...@gmail.com>
Subject Re: svn commit: r733278 [1/2] - in /incubator/jspwiki/trunk: etc/ etc/i18n/ etc/i18n/templates/ src/com/ecyrd/jspwiki/action/ src/com/ecyrd/jspwiki/preferences/ src/webdocs/ src/webdocs/templates/default/
Date Mon, 12 Jan 2009 06:40:53 GMT
Andrew,

it works fine.
Although I cannot explain it if I read the LocalizableError docs at
http://stripes.sourceforge.net/docs/current/javadoc/net/sourceforge/stripes/validation/LocalizableError.html#LocalizableError(java.lang.String,%20java.lang.Object..<http://stripes.sourceforge.net/docs/current/javadoc/net/sourceforge/stripes/validation/LocalizableError.html#LocalizableError%28java.lang.String,%20java.lang.Object..>
.)

There is no placeholder in CoreResources.properties :
         login.error.password=Not a valid login
to be replaced with the e.getMessage()

Is this a hidden Stripes feature ?

regards,
Harry


2009/1/11 Andrew Jaquith <andrew.r.jaquith@gmail.com>

> Harry -- I don't have access to your setup. Could you try the
> following substitution for line 127:
>
> errors.addGlobalError( new LocalizableError( "login.error.password" ),
> e.getMessage() )
>
> That *should* propagate the error message correctly.
>
> On Sat, Jan 10, 2009 at 11:55 AM, Harry Metske <harry.metske@gmail.com>
> wrote:
> > Andrew,
> >
> > is there a specific reason you reverted my last change on the
> > LoginActionBean :
> >
> > ---
> > incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.java
> > (original)
> > +++
> > incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.java
> > Sat Jan 10 06:39:30 2009
> > @@ -124,7 +124,7 @@
> >        catch ( LoginException e )
> >        {
> >            log.info( "Failed to authenticate user " + m_username + ",
> > reason: " + e.getMessage());
> > -            errors.addGlobalError( new SimpleError( e.getMessage() ) );
> > +            errors.addGlobalError( new LocalizableError(
> > "login.error.password" ) );
> >        }
> >        catch( WikiSecurityException e )
> >        {
> >
> >
> > The message that is returned in the Exception (through the
> > TextOutputCallback) is now not shown anymore to the user.
> >
> > regards,
> > Harry
> >
> >
> > 2009/1/10 <ajaquith@apache.org>
> >
> >> Author: ajaquith
> >> Date: Sat Jan 10 06:39:30 2009
> >> New Revision: 733278
> >>
> >> URL: http://svn.apache.org/viewvc?rev=733278&view=rev
> >> Log:
> >> Header.jsp, PageActions*.jsp, UserBox.jsp, Footer.jsp refactored to use
> >> Stripes tags. i18n messages have been renamed and moved to
> CoreResources.
> >> SisterSites.jsp and rss.jsp now reference the oscache TLD buy URI,
> making
> >> the need to copy it into the webapp unnecessary.
> >>
> >> Removed:
> >>    incubator/jspwiki/trunk/etc/oscache.tld
> >> 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/src/com/ecyrd/jspwiki/action/LoginActionBean.java
> >>
> >>
>  incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java
> >>    incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp
> >>    incubator/jspwiki/trunk/src/webdocs/rss.jsp
> >>    incubator/jspwiki/trunk/src/webdocs/templates/default/EditLayout.jsp
> >>    incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp
> >>    incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp
> >>
> >>
>  incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp
> >>
>  incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp
> >>
>  incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp
> >>    incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp
> >>    incubator/jspwiki/trunk/src/webdocs/templates/default/ViewLayout.jsp
> >>
>  incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
> >>    incubator/jspwiki/trunk/src/webdocs/templates/default/jspwiki.css
> >>
> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources.properties?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources.properties (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources.properties Sat Jan 10
> >> 06:39:30 2009
> >> @@ -298,12 +298,36 @@
> >>  # Formerly login.lostpw.submit
> >>  resetPassword=Reset password
> >>  # Formerly prefs.loginname
> >> -profile.loginName=Login name *
> >> +profile.loginName=Login name
> >>  # Formerly prefs.password
> >> -profile.password=Password *
> >> +profile.password=Password
> >>  # Formerly prefs.password2
> >> -passwordAgain=Password verify *
> >> +passwordAgain=Password verify
> >>  # Formerly prefs.fullname
> >> -profile.fullname=Name *
> >> +profile.fullname=Name
> >>  # Formerly prefs.save.submit
> >>  com.ecyrd.jspwiki.action.UserProfileActionBean.save=Save profile
> >> +#Formerly prefs.assertedname
> >> +assertedName=
> >> +#Formerly edit.chooseeditor
> >> +editor=Name
> >> +#Formerly prefs.user.sectionediting
> >> +sectionEditing=Section editing
> >> +#Formerly prefs.user.skin
> >> +skin=Skin
> >> +#Formerly prefs.user.language
> >> +locale=Language
> >> +#Formerly prefs.user.orientation
> >> +orientation=Favorites style
> >> +#Formerly prefs.user.orientation.left
> >> +Orientation.LEFT=Left
> >> +#Formerly prefs.user.orientation.right
> >> +Orientation.RIGHT=Right
> >> +#Formerly prefs.user.timeformat
> >> +timeFormat=Time format
> >> +#Formerly prefs.user.timezone
> >> +timeZone=Time zone
> >> +#Formerly prefs.save.prefs.submit
> >> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=Save
> preferences
> >> +# Formerly prefs.clear.submit
> >> +clearAssertedName=Reset preferences
> >>
> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties
> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties Sat Jan
> 10
> >> 06:39:30 2009
> >> @@ -244,8 +244,20 @@
> >>  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 (*)
> >> +profile.loginName=dein Benutzername
> >> +profile.password=dein Passwort
> >> +passwordAgain=Passwort wiederholen
> >> +profile.fullname=dein voller Name
> >>  com.ecyrd.jspwiki.action.UserProfileActionBean.save=Profil speichern
> >> +assertedName=Name
> >> +editor=Editor
> >> +sectionEditing=Bearbeiten von Abschnitten
> >> +skin=Skin
> >> +locale=Sprache
> >> +orientation=Position der Favoriten
> >> +Orientation.LEFT=links
> >> +Orientation.RIGHT=rechts
> >> +timeFormat=Zeitformat
> >> +timeZone=Zeitzone
> >>
> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=Benutzereinstellungen
> >> speichern
> >> +clearAssertedName=Benutzereinstellungen zurücksetzen
> >>
> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties
> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties Sat Jan
> 10
> >> 06:39:30 2009
> >> @@ -224,8 +224,20 @@
> >>  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 *
> >> +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
> >> +assertedName=Nombre
> >> +editor=Editor
> >> +sectionEditing=Edición de Secciones
> >> +skin=Apariencia
> >> +locale=Selecciona Idioma
> >> +orientation=Estilo de los favoritos
> >> +Orientation.LEFT=Izquierda
> >> +Orientation.RIGHT=Derecha
> >> +timeFormat=Selecciona el formato de la Hora
> >> +timeZone=Selecciona la Zona Horaria
> >> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=Guardar
> >> Preferencias de Usuario
> >> +clearAssertedName=Borrar Preferencias de Usuario
> >>
> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties
> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties Sat Jan
> 10
> >> 06:39:30 2009
> >> @@ -179,8 +179,20 @@
> >>  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 *
> >> +profile.loginName=Käyttäjätunnus
> >> +profile.password=Salasana
> >> +passwordAgain=Vahvista salasana
> >> +profile.fullname=Nimi
> >>  com.ecyrd.jspwiki.action.UserProfileActionBean.save=Tallenna profiili
> >> +assertedName=Nimi
> >> +editor=Muokkain
> >> +sectionEditing=Osioiden muokkaus
> >> +skin=Tyyli
> >> +locale=Valitse kieli
> >> +orientation=Sivupalkin paikka
> >> +Orientation.LEFT=Vasemmalla
> >> +Orientation.RIGHT=Oikealla
> >> +timeFormat=Valitse ajan esitysmuoto
> >> +timeZone=Valitse aikavyöhykkeesi
> >> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=Tallenna
> asetukset
> >> +clearAssertedName=Poista käyttäjänimi
> >>
> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties
> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_fr.properties Sat Jan
> 10
> >> 06:39:30 2009
> >> @@ -237,8 +237,20 @@
> >>  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 *
> >> +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
> >> +assertedName=Nom
> >> +editor=Editeur
> >> +sectionEditing=Edition de sections
> >> +skin=Skin
> >> +locale=Langue
> >> +orientation=Style des favoris
> >> +Orientation.LEFT=Gauche
> >> +Orientation.RIGHT=Droite
> >> +timeFormat=S\u00E9lectionner le format horaire
> >> +timeZone=S\u00E9lectionner le fuseau horaire
> >> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=Enregistrer les
> >> pr\u00E9f\u00E9rences utilisateur
> >> +clearAssertedName=Nettoyer les pr\u00E9f\u00E9rences utilisateur
> >>
> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties
> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_it.properties Sat Jan
> 10
> >> 06:39:30 2009
> >> @@ -218,8 +218,20 @@
> >>  login=Login
> >>  email=Indirizzo E-mail
> >>  resetPassword=Cambia la password !
> >> -profile.loginName=Login nome *
> >> -profile.password=Password *
> >> -passwordAgain=Verifica password *
> >> -profile.fullname=Nome *
> >> +profile.loginName=Login nome
> >> +profile.password=Password
> >> +passwordAgain=Verifica password
> >> +profile.fullname=Nome
> >>  com.ecyrd.jspwiki.action.UserProfileActionBean.save=Salva il profilo
> >> +assertedName=Nome
> >> +editor=Editor
> >> +sectionEditing=Editing Sezioni
> >> +skin=Skin
> >> +locale=Seleziona il linguaggio
> >> +orientation=Stile dei preferiti
> >> +Orientation.LEFT=Sinistra
> >> +Orientation.RIGHT=Destra
> >> +timeFormat=Formato della data
> >> +timeZone=Seleziona la Time Zone
> >> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=Salva le
> >> preferenze
> >> +clearAssertedName=Ripulisci le preferenze
> >>
> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties
> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties Sat Jan
> 10
> >> 06:39:30 2009
> >> @@ -223,8 +223,20 @@
> >>  login=Login
> >>  email=Email adres
> >>  resetPassword=Genereer een nieuw wachtwoord !
> >> -profile.loginName=Login naam *
> >> -profile.password=Wachtwoord *
> >> -passwordAgain=Bevestig Wachtwoord *
> >> -profile.fullname=Naam *
> >> +profile.loginName=Login naam
> >> +profile.password=Wachtwoord
> >> +passwordAgain=Bevestig wachtwoord
> >> +profile.fullname=Naam
> >>  com.ecyrd.jspwiki.action.UserProfileActionBean.save=Bewaar
> >> Gebruikersprofiel
> >> +assertedName=Naam
> >> +editor=Editor
> >> +sectionEditing=Sectie Editing
> >> +skin=Layout
> >> +locale=Wijzig de Taal
> >> +orientation=Wijzig de Layout Orientatie
> >> +Orientation.LEFT=Links
> >> +Orientation.RIGHT=Rechts
> >> +timeFormat=Wijzig het Datum/Tijd-formaat
> >> +timeZone=Wijzig de Tijd-zone
> >> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=Bewaar
> Gebruikers
> >> Instellingen
> >> +clearAssertedName=Verwijder Gebruikers Instellingen
> >>
> >> Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties
> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_ru.properties Sat Jan
> 10
> >> 06:39:30 2009
> >> @@ -222,8 +222,20 @@
> >>  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 *
> >> +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
> >> +assertedName=\u0418\u043c\u044f
> >> +editor=\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440
> >> +sectionEditing=\u0421\u0435\u043a\u0446\u0438\u044f
> >>
> \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f
> >> +skin=\u041e\u0431\u043b\u043e\u0436\u043a\u0430
> >> +locale=\u042f\u0437\u044b\u043a
> >>
> +orientation=\u041e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f
> >> \u043c\u0435\u043d\u044e
> >> +Orientation.LEFT=\u041b\u0435\u0432\u043e
> >> +Orientation.RIGHT=\u041f\u0440\u0430\u0432\u043e
> >> +timeFormat=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0439
> >> \u0444\u043e\u0440\u043c\u0430\u0442
> >> +timeZone=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f
> >> \u0437\u043e\u043d\u0430
> >>
> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
> >> \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
> >> +clearAssertedName=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c
> >> \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
> >>
> >> 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=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties
> >> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/CoreResources_zh_CN.properties Sat
> Jan
> >> 10 06:39:30 2009
> >> @@ -221,8 +221,20 @@
> >>  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 *
> >> +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
> >> +assertedName=\u540d\u5b57
> >> +editor=\u7f16\u8f91\u5668
> >> +sectionEditing=\u6bb5\u843d\u7f16\u8f91
> >> +skin=\u5916\u8868
> >> +locale=\u8bed\u8a00
> >> +orientation=\u83dc\u5355\u4f4d\u7f6e
> >> +Orientation.LEFT=\u5de6\u4fa7
> >> +Orientation.RIGHT=\u53f3\u4fa7
> >> +timeFormat=\u65f6\u95f4\u683c\u5f0f
> >> +timeZone=\u65f6\u533a
> >>
> >>
> +com.ecyrd.jspwiki.action.UserPreferencesActionBean.save=\u4fdd\u5b58\u7528\u6237\u9996\u9009\u9879
> >> +clearAssertedName=\u6e05\u9664\u7528\u6237\u9996\u9009\u9879
> >>
> >> Modified: incubator/jspwiki/trunk/etc/i18n/templates/default.properties
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/default.properties?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default.properties
> >> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default.properties Sat
> Jan
> >> 10 06:39:30 2009
> >> @@ -74,7 +74,6 @@
> >>     {1} minutes.
> >>  edit.restoring=You are about to restore version {0}. \
> >>     Click on &#8220;Save&#8221; to restore.  You may also edit the page
> >> before restoring it.
> >> -edit.chooseeditor=Editor
> >>  edit.tab.attachments=Attachments
> >>  edit.tab.help=Help
> >>  edit.tab.edit=Edit
> >> @@ -360,21 +359,12 @@
> >>
> >>  prefs.cookies=Your choices will be saved in your browser as cookies.
> >>
> >> -prefs.user.skin=Skin
> >> -prefs.user.orientation=Favorites style
> >> -prefs.user.orientation.left=Left
> >> -prefs.user.orientation.right=Right
> >>  #prefs.user.editorareaheight=Editor area height  //not user anymore
> >> -prefs.user.sectionediting=Section Editing
> >>  prefs.user.sectionediting.text=Enable section editing via <span
> >> class="editsection"><a href="#">[edit]</a></span> links
> >> -prefs.user.timeformat=Time Format
> >> -prefs.user.timezone=Time Zone
> >>  prefs.user.timezone.server=[SERVER]
> >> -prefs.user.language=Language
> >>  prefs.user.language.default=[DEFAULT]
> >>
> >>  prefs.instructions=Set your user preferences here. Your choices will be
> >> saved in your browser as cookies.
> >> -prefs.assertedname=Name
> >>  prefs.assertedname.description=Your name. \
> >>     If you haven&#8217;t created a user profile yet, you can tell {0} \
> >>     who you are by &#8216;asserting&#8217; an identity. You
> wouldn&#8217;t
> >> lie to us would you? \
> >> @@ -387,8 +377,6 @@
> >>     secure.
> >>  prefs.assertedname.create=Create a new user profile
> >>  prefs.submit.setname=Set user name
> >> -prefs.save.prefs.submit=Save User Preferences
> >> -prefs.clear.submit=Clear User Preferences
> >>  prefs.clear.description=\
> >>     In some cases, you may need to remove your &#8216;asserted&#8217;
> user
> >> name and \
> >>     your user preferences from this computer. \
> >>
> >> 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=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_de.properties
> >> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_de.properties Sat
> >> Jan 10 06:39:30 2009
> >> @@ -79,8 +79,6 @@
> >>        höflicher zu warten bis derjenige fertig ist. Diese "Sperre" wird
> in
> >> {1} Minuten aufgehoben.
> >>  edit.restoring=Soll die Version {0} wiederhergestellt werden? \
> >>        Falls ja, klicke auf 'Speichern'! Die Seite kann auch vorher noch
> >> bearbeitet werden.
> >> -edit.chooseeditor=Editor
> >> -edit.tab.attachments=Anhänge
> >>  edit.tab.help=Hilfe
> >>  edit.tab.edit=Bearbeiten
> >>  edit.tab.findreplacehelp=Hilfe zu Suchen und Ersetzen
> >> @@ -364,20 +362,11 @@
> >>
> >>  prefs.cookies=Deine Einstellungen werden als Cookie im Web-Browser
> >> gespeichert.
> >>
> >> -prefs.user.skin=Skin
> >> -prefs.user.orientation=Position der Favoriten
> >> -prefs.user.orientation.left=links
> >> -prefs.user.orientation.right=rechts
> >> -prefs.user.sectionediting=Bearbeiten von Abschnitten
> >>  prefs.user.sectionediting.text=Bearbeiten von Abschnitten via
> [Abschnitt
> >> bearbeiten]-Links aktivieren
> >> -prefs.user.timeformat=Zeitformat
> >> -prefs.user.timezone=Zeitzone
> >>  prefs.user.timezone.server=[SERVER]
> >> -prefs.user.language=Sprache
> >>  prefs.user.language.default=[STANDARD]
> >>
> >>  prefs.instructions=Nimm hier deine Benutzereinstellungen vor. Sie
> werden
> >> als Cookie im Web-Browser gespeichert.
> >> -prefs.assertedname=Name
> >>  prefs.assertedname.description=Dies ist dein Name. Wenn du noch kein
> >> Benutzerprofil bei {0} angelegt hast, kannst du \
> >>        hier einen vorübergehenden Namen angeben.<br /> \
> >>        <strong>Beachte</strong>: Dies ist jedoch keine richtige
> Anmeldung,
> >> da die Einstellungen lediglich als Cookie in \
> >> @@ -386,9 +375,6 @@
> >>        sich mit Benutzernamen und Passwort angemeldet hat.
> >>  prefs.assertedname.create=Neues Benutzerprofil erstellen
> >>  prefs.submit.setname=Benutzernamen setzen
> >> -prefs.save.prefs.submit=Benutzereinstellungen speichern
> >> -prefs.save.submit=Benutzereinstellungen speichern
> >> -prefs.clear.submit=Benutzereinstellungen zurücksetzen
> >>  prefs.clear.description=Falls du den Benutzernamen und deine
> Einstellungen
> >> von diesem Rechner löschen willst, \
> >>        klicke auf 'Benutzereinstellungen zurücksetzen'!<br /> \
> >>        <strong>Beachte</strong>: Es werden alle Einstellungen
> vollständig
> >> und permanent gelöscht und \
> >>
> >> 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=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_es.properties
> >> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_es.properties Sat
> >> Jan 10 06:39:30 2009
> >> @@ -73,7 +73,6 @@
> >>     {1} minutos.
> >>  edit.restoring=Estás apunto de restaurar la versión {0}.  \
> >>         Haz click en &#8220;Guardar&#8221; para restaurarla.  También
> >> puedes editar la página antes de hacerlo.
> >> -edit.chooseeditor=Editor
> >>  edit.tab.attachments=Adjuntos
> >>  edit.tab.help=Ayuda
> >>  edit.tab.edit=Editar
> >> @@ -354,17 +353,9 @@
> >>
> >>  prefs.cookies=Tus elecciones se guardarán en el navegador como cookies.
> >>
> >> -prefs.user.skin=Apariencia
> >> -prefs.user.orientation=Estilo de los favoritos
> >> -prefs.user.orientation.left=Izquierda
> >> -prefs.user.orientation.right=Derecha
> >>  #prefs.user.editorareaheight=Altura del área del Editor
> >> -prefs.user.sectionediting=Edición de Secciones
> >>  prefs.user.sectionediting.text=Activar la edición de secciones vía
> enlaces
> >> <span class="editsection"><a href="#">[editar]</a></span>
> >> -prefs.user.timeformat=Selecciona el formato de la Hora
> >> -prefs.user.timezone=Selecciona la Zona Horaria
> >>  prefs.user.timezone.server=[SERVIDOR]
> >> -prefs.user.language=Selecciona Idioma
> >>  prefs.user.language.default=[POR DEFECTO]
> >>
> >>  #pref.fontsize.title.down=Disminuir el tamaño del Texto
> >> @@ -373,7 +364,6 @@
> >>  #pref.fontsize.title.up=Aumentar el tamaño del Texto
> >>
> >>  prefs.instructions=Establece tus preferencias aquí. Tus cambios se
> >> guardarán en el navegador como cookies.
> >> -prefs.assertedname=Nombre
> >>  prefs.assertedname.description=Tu nombre. Si no te has creado un perfil
> de
> >> usuario \
> >>   todavía, puedes decirle a {0} \
> >>   quién eres &#8220;declarando&#8221; una identidad. No serías capaz \
> >> @@ -387,8 +377,6 @@
> >>   mayor seguridad, prueba a crearte un perfil.
> >>  prefs.assertedname.create=Crea un nuevo perfil de usuario
> >>  prefs.submit.setname=Establecer nombre de usuario
> >> -prefs.save.prefs.submit=Guardar Preferencias de Usuario
> >> -prefs.clear.submit=Borrar Preferencias de Usuario
> >>  prefs.clear.description=\
> >>     En algún caso puede que necesites borrar tu nombre
> >> &#8216;declarado&#8217; y tus \
> >>     preferencias de usuario de este ordenador. \
> >>
> >> 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=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_fi.properties
> >> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_fi.properties Sat
> >> Jan 10 06:39:30 2009
> >> @@ -68,7 +68,6 @@
> >>     lopettanna.
> >>  edit.restoring=Olet palauttamassa versiota {0}.  Paina
> >> &quot;Tallenna&quot; palauttaaksesi. \
> >>     Voit myös muokata sivua ennen kuin tallennat.
> >> -edit.chooseeditor=Muokkain:
> >>  edit.tab.attachments=Liitteet
> >>  edit.tab.help=Ohjeet
> >>  edit.tab.edit=Muokkaus
> >> @@ -339,13 +338,7 @@
> >>  prefs.tab.prefs=Asetukset
> >>  prefs.tab.profile=Profiili
> >>
> >> -prefs.user.skin=Tyyli
> >> -prefs.user.timeformat=Valitse ajan esitysmuoto
> >> -prefs.user.timezone=Valitse aikavyöhykkeesi
> >> -
> >> -
> >>  prefs.instructions=Aseta selainkohtaiset käyttäjäasetuksesi täällä.  Ne
> >> tallennetaan selaimeesi evästeen avulla.
> >> -prefs.assertedname=Nimi
> >>  prefs.assertedname.description=Nimesi. \
> >>     Jos et ole vielä luonut käyttäjäprofiilia, voit kertoa kuka olet \
> >>     vain kirjoittamalla tähän nimesi.  Ethän valehtelisi meille, ethän?
> \
> >> @@ -356,7 +349,6 @@
> >>     salasanan (joka on paljon turvallisempi), {1}.
> >>  prefs.assertedname.create=luo uusi käyttäjätunnus
> >>  prefs.submit.setname=Aseta käyttäjänimi
> >> -prefs.clear.submit=Poista käyttäjänimi
> >>  prefs.clear.description=Joissain tapauksissa, esimerkiksi jos käytät
> >> jaettua tietokonetta, \
> >>        voit joutua poistamaan käyttäjänimesi tältä tietokoneelta.  Paina
> >> &quot;Poista käyttäjänimi&quot; \
> >>        <br /> \
> >> @@ -391,23 +383,16 @@
> >>  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.prefs.submit=Tallenna asetukset
> >>  prefs.cookies=Asetuksesi tallennetaan tämän selaimen evästeisiin.
> >>  prefs.clear.heading=Asetusten poisto
> >>
> >> -prefs.user.orientation=Sivupalkin paikka
> >> -prefs.user.orientation.left=Vasemmalla
> >> -prefs.user.orientation.right=Oikealla
> >> -
> >>  prefs.roles=Roolit
> >>  prefs.groups=Ryhmät
> >>  prefs.creationdate=Luontihetki
> >>  prefs.profile.lastmodified=Viimeksi muutettu
> >> -prefs.user.language = Valitse kieli
> >>  prefs.user.language.default = [OLETUS]
> >>  prefs.user.timezone.server = [Tämän palvelimen oma]
> >>  prefs.errorprefix.rename = En voinut nimetä sivua uudelleen:&nbsp;
> >> -prefs.user.sectionediting = Osioiden muokkaus
> >>  prefs.user.sectionediting.text = Salli osioiden muokkaus lisäämällä
> <span
> >> class="editsection"><a href="#">[muokkaa]</a></span> linkit joka osioon.
> >>
> >>  # Workflow generic messages
> >>
> >> 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=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_fr.properties
> >> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_fr.properties Sat
> >> Jan 10 06:39:30 2009
> >> @@ -76,7 +76,6 @@
> >>     (ce verrou expire dans {1} minutes.)
> >>  edit.restoring=Vous \u00EAtes sur le point de restaurer la version {0}.
> \
> >>     Cliquez sur \u201CEnregistrer\u201D pour restaurer. Vous pouvez
> aussi
> >> \u00E9diter la page avant de la restaurer.
> >> -edit.chooseeditor=Editeur
> >>  edit.tab.attachments=Attachements
> >>  edit.tab.help=Aide
> >>  edit.tab.edit=Editer
> >> @@ -357,21 +356,12 @@
> >>
> >>  prefs.cookies=Vos choix seront enregistr\u00E9s dans les cookies de
> votre
> >> navigateur.
> >>
> >> -prefs.user.skin=Skin
> >> -prefs.user.orientation=Style des favoris
> >> -prefs.user.orientation.left=Gauche
> >> -prefs.user.orientation.right=Droite
> >>  #prefs.user.editorareaheight=Hauteur de la zone d\u0027\u00E9dition
> >> //desormais inutilise
> >> -prefs.user.sectionediting=Edition de sections
> >>  prefs.user.sectionediting.text=Autoriser l\u0027\u00E9dition de
> sections
> >> via des liens <span class="editsection"><a href="#">[Editer]</a></span>
> >> -prefs.user.timeformat=S\u00E9lectionner le format horaire
> >> -prefs.user.timezone=S\u00E9lectionner le fuseau horaire
> >>  prefs.user.timezone.server=[SERVEUR]
> >> -prefs.user.language=Langue
> >>  prefs.user.language.default=[DEFAUT]
> >>
> >>  prefs.instructions=Modifiez vos pr\u00E9f\u00E9rences utilisateur ici.
> Vos
> >> choix seront enregistr\u00E9s dans les cookies de votre navigateur.
> >> -prefs.assertedname=Nom
> >>  prefs.assertedname.description=Votre nom. \
> >>     Si n\u0027\u0027avez pas encore cr\u00E9\u00E9 de profil
> utilisateur,
> >> vous pouvez dire \u00E0 {0} \
> >>     qui vous \u00EAtes, en \u201Csupposant\u201D votre identit\u00E9.
> Mais
> >> vous ne voudriez pas \
> >> @@ -385,8 +375,6 @@
> >>     et un mot de passe classiques, qui sont plus s\u00FBrs.
> >>  prefs.assertedname.create=Cr\u00E9er un nouveau profil utilisateur
> >>  prefs.submit.setname=Modifier le nom de l\u0027utilisateur
> >> -prefs.save.prefs.submit=Enregistrer les pr\u00E9f\u00E9rences
> utilisateur
> >> -prefs.clear.submit=Nettoyer les pr\u00E9f\u00E9rences utilisateur
> >>  prefs.clear.description=\
> >>     Dans certains cas, vous pouvez avoir besoin de supprimer votre nom
> >> d\u0027utilisateur de votre profil \
> >>     \u201Csuppos\u00E9\u201D sur cet ordinateur. \
> >>
> >> 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=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_it.properties
> >> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_it.properties Sat
> >> Jan 10 06:39:30 2009
> >> @@ -71,7 +71,6 @@
> >>     Sarebbe estremamente cortese attendere cha abbia finito - o
> attendere
> >> almeno che scada il lock, tra {1} minuti.
> >>  edit.restoring=Stai per ripristinare la versione {0}. \
> >>     Click su &#8220;Salva&#8221; per ripristinare.  Puoi anche
> modificare
> >> la pagina prima di ripristinarla.
> >> -edit.chooseeditor=Editor
> >>  edit.tab.attachments=Allegati
> >>  edit.tab.help=Aiuto
> >>  edit.tab.edit=Edit
> >> @@ -353,19 +352,11 @@
> >>
> >>  prefs.cookies=Le tue preferenze sono salvate nel browser via cookie.
> >>
> >> -prefs.user.skin=Skin
> >> -prefs.user.orientation=Stile dei preferiti
> >> -prefs.user.orientation.left=Sinistra
> >> -prefs.user.orientation.right=Destra
> >>  #prefs.user.editorareaheight=Altezza dell&#8217;aerea di editing
> >> -prefs.user.timeformat=Formato della data
> >> -prefs.user.timezone=Seleziona la Time Zone
> >>  prefs.user.timezone.server=[SERVER]
> >> -prefs.user.language=Seleziona il linguaggio
> >>  prefs.user.language.default=[DEFAULT]
> >>
> >>  prefs.instructions=Inserisci qui le tue preferenze. Le tue preferenze
> sono
> >> salvate nel browser via cookie.
> >> -prefs.assertedname=Nome
> >>  prefs.assertedname.description=Il tuo nome. \
> >>     Se non hai ancora creato un profilo, puoi dire {0} \
> >>     chi sei &#8216;asserendo&#8217; un identit&agrave; (senza dire bugie
> >> ...).  \
> >> @@ -376,8 +367,6 @@
> >>     privilegi limitati. {0} se preferisci essere identificato tramite
> >> identificativo utente e password.
> >>  prefs.assertedname.create=Crea un nuovo profilo utente
> >>  prefs.submit.setname=Nome utente
> >> -prefs.save.prefs.submit=Salva le preferenze
> >> -prefs.clear.submit=Ripulisci le preferenze
> >>  prefs.clear.description=\
> >>     In qualche caso, potresti aver bisogno di rimuovere le tue
> credenziali
> >> da questo computer. \
> >>     Seleziona il bottone &#8216;Ripulisci le preferenze&#8217; per
> farlo. \
> >> @@ -633,5 +622,4 @@
> >>
> >>  javascript.sectionediting.label = Riassunto della Sezione
> >>  prefs.errorprefix.rename = Impossibile rinominare la pagina:&nbsp;
> >> -prefs.user.sectionediting = Editing Sezioni
> >>  prefs.user.sectionediting.text = Abilita l'editing delle sezioni con il
> >> collegamento<span class="editsection"><a href="#">[modifica]</a></span>
> >>
> >> 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=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties
> >> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties Sat
> >> Jan 10 06:39:30 2009
> >> @@ -73,7 +73,6 @@
> >>     {1} minuten.
> >>  edit.restoring=De actie herstelt versie {0} van deze pagina. \
> >>     Klik op &#8220;Bewaar&#8221; om te herstellen. U kan de pagina ook
> nog
> >> bewerken indien U dat wenst.
> >> -edit.chooseeditor=Editor
> >>  edit.tab.attachments=Bijlagen
> >>  edit.tab.help=Help
> >>  edit.tab.edit=Bewerk
> >> @@ -354,21 +353,12 @@
> >>
> >>  prefs.cookies=Uw voorkeuren worden bewaard in de cookies van de browser
> >>
> >> -prefs.user.skin=Layout
> >> -prefs.user.orientation=Wijzig de Layout Orientatie
> >> -prefs.user.orientation.left=Links
> >> -prefs.user.orientation.right=Rechts
> >>  #prefs.user.editorareaheight=Wijzig Editor hoogte
> >> -prefs.user.sectionediting=Sectie Editing
> >>  prefs.user.sectionediting.text=Activeer sectie editing d.m.v. de <span
> >> class="editsection"><a href="#">[edit]</a></span> links
> >> -prefs.user.timeformat=Wijzig het Datum/Tijd-formaat
> >> -prefs.user.timezone=Wijzig de Tijd-zone
> >>  prefs.user.timezone.server=[SERVER]
> >> -prefs.user.language=Wijzig de Taal
> >>  prefs.user.language.default=[DEFAULT]
> >>
> >>  prefs.instructions=Hier kan U de Gebruikers Instellingen wijzigen. Deze
> >> worden bewaard in de cookies van de browser
> >> -prefs.assertedname=Naam
> >>  prefs.assertedname.description='Asserted' Naam. \
> >>     Inden je nog geen gebruikersprofiel beziet, kan je {0} \
> >>     melden wie je bent eenvoudig door het invoeren van je idendity (d.i.
> >> &#8216;asserting&#8217;)  \
> >> @@ -380,8 +370,6 @@
> >>     Het gebruik van een traditionele gebruikersnaam en wachtwoord, is
> een
> >> veiligere toegangsmethode.
> >>  prefs.assertedname.create=Maak een nieuw gebruikersprofiel
> >>  prefs.submit.setname=Set gebruikersnaam
> >> -prefs.save.prefs.submit=Bewaar Gebruikers Instellingen
> >> -prefs.clear.submit=Verwijder Gebruikers Instellingen
> >>  prefs.clear.description=\
> >>     In bepaalde gevallen kan de gebruiker het nodig achten om zijn
> >> &#8216;asserted&#8217; gebruikersnaam en de \
> >>     gebruikersinstellingen van deze computer te verwijderen. \
> >>
> >> 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=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_ru.properties
> >> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_ru.properties Sat
> >> Jan 10 06:39:30 2009
> >> @@ -67,7 +67,6 @@
> >>        \u043d\u043e \u0435\u0449\u0451 \u043d\u0435
> >> \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u043b \u0435\u0451.
> >> \u0421\u043e\u0432\u0435\u0442\u0443\u044e \u043d\u0435
> >>
> \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0438
> >> \u043f\u043e\u0434\u043e\u0436\u0434\u0430\u0442\u044c
> >> \u043f\u0440\u0438\u043c\u0435\u0440\u043d\u043e {1}
> >> \u043c\u0438\u043d\u0443\u0442.
> >>  edit.restoring=\u0412\u044b \u0445\u043e\u0442\u0438\u0442\u0435
> >>
> \u0430\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c
> >> \u0432\u0435\u0440\u0441\u0438\u044e  {0}. \
> >>        \u0414\u043b\u044f
> >> \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f
> >> \u0432\u044b\u0431\u043e\u0440\u0430
> >> \u043a\u043b\u0438\u043a\u043d\u0438\u0442\u0435
> >> &#8220;\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c&#8221;.
> >> \u0422\u0430\u043a\u0436\u0435 \u0432\u044b
> >> \u043c\u043e\u0436\u0435\u0442\u0435
> \u0441\u043f\u0435\u0440\u0432\u0430
> >> \u0435\u0451
> >>
> \u043e\u0442\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c.
> >> -edit.chooseeditor=\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440
> >>
> >>
>  edit.tab.attachments=\u041f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u044f
> >>  edit.tab.help=\u041f\u043e\u043c\u043e\u0449\u044c
> >>
> >>
>  edit.tab.edit=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
> >> @@ -350,29 +349,18 @@
> >>
> >>  prefs.cookies=\u0412\u0430\u0448\u0438
> >> \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
> >> \u0431\u0443\u0434\u0443\u0442\u044c
> >> \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b
> >> \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u043e\u043c
> \u043a\u0430\u043a
> >> \u043a\u0443\u043a\u0438.
> >>
> >> -prefs.user.skin=\u041e\u0431\u043b\u043e\u0436\u043a\u0430
> >>
> -prefs.user.orientation=\u041e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f
> >> \u043c\u0435\u043d\u044e
> >> -prefs.user.orientation.left=\u041b\u0435\u0432\u043e
> >> -prefs.user.orientation.right=\u041f\u0440\u0430\u0432\u043e
> >>  #prefs.user.editorareaheight=Editor area height  //not user anymore
> >> -prefs.user.sectionediting=\u0421\u0435\u043a\u0446\u0438\u044f
> >>
> \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f
> >>
>  prefs.user.sectionediting.text=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c
> >> \u0441\u0435\u043a\u0446\u0438\u044e
> >>
> \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f
> >> \u0447\u0435\u0440\u0435\u0437 \
> >>                               <span class="editsection"><a
> >> href="#">[e]</a></span> \u0441\u0441\u044b\u043b\u043e\u043a
> >>
> -prefs.user.timeformat=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u043e\u0439
> >> \u0444\u043e\u0440\u043c\u0430\u0442
> >>
> -prefs.user.timezone=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f
> >> \u0437\u043e\u043d\u0430
> >>  prefs.user.timezone.server=[\u0441\u0435\u0440\u0432\u0435\u0440]
> >> -prefs.user.language=\u042f\u0437\u044b\u043a
> >>  prefs.user.language.default=[\u043f\u043e
> >> \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e]
> >>
> >>  prefs.instructions=\u0423\u043a\u0430\u0436\u0438\u0442\u0435
> >> \u0442\u0443\u0442 \u0432\u0430\u0448\u0438
> >>
> \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435
> >> \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438. \
> >>                   \u0412\u0430\u0448\u0438
> >> \u043f\u0440\u0435\u0444\u0435\u0440\u0435\u043d\u0446\u0438\u0438
> >> \u0431\u0443\u0434\u0443\u0442
> >> \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b
> >> \u0431\u0440\u0430\u0443\u0437\u0435\u0440\u043e\u043c
> \u043a\u0430\u043a
> >> \u043a\u0443\u043a\u0438.
> >> -prefs.assertedname=\u0418\u043c\u044f
> >>  prefs.assertedname.description=\u0412\u0430\u0448\u0435
> >> \u0438\u043c\u044f. \
> >>                \u0411\u0443\u0434\u0435\u043c
> >> \u043d\u0430\u0434\u0435\u044f\u0442\u0441\u044f \u043e\u043d\u043e
> >> \u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0435\u0435.)
> >>  prefs.assertedname.create=\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.submit.setname=\u0423\u043a\u0430\u0436\u0438\u0442\u0435
> >> \u0438\u043c\u044f
> >> \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
> >>
> -prefs.save.prefs.submit=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
> >> \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
> >> -prefs.clear.submit=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c
> >> \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
> >>  prefs.clear.description=\u0414\u043b\u044f
> >> \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f
> >> \u0432\u0440\u0435\u043c\u0435\u043d\u043d\u044b\u0445
> >> \u0434\u0430\u043d\u044b\u0445
> >> \u043a\u043b\u0438\u043a\u043d\u0438\u0442\u0435
> >> &#8216;\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c
> >> \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438&#8217;
> >>
> >>  prefs.newprofile=\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
> >>
> >> 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=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/etc/i18n/templates/default_zh_CN.properties
> >> (original)
> >> +++ incubator/jspwiki/trunk/etc/i18n/templates/default_zh_CN.properties
> Sat
> >> Jan 10 06:39:30 2009
> >> @@ -70,7 +70,6 @@
> >>  edit.restoring=\u5c06\u6062\u590d\u7248\u672c {0}\u3002\
> >>
>  \u5355\u51fb\u201c\u4fdd\u5b58\u201d\u6765\u8fdb\u884c\u6062\u590d\u3002\
> >>
> >>
>  \u4e5f\u53ef\u4ee5\u5728\u6062\u590d\u9875\u9762\u524d\u8fdb\u884c\u7f16\u8f91\u3002
> >> -edit.chooseeditor=\u7f16\u8f91\u5668
> >>  edit.tab.attachments=\u9644\u4ef6
> >>  edit.tab.help=\u5e2e\u52a9
> >>  edit.tab.edit=\u7f16\u8f91
> >> @@ -348,21 +347,12 @@
> >>
> >>
>  prefs.cookies=\u60a8\u7684\u9009\u62e9\u5c06\u4fdd\u5b58\u4e3a\u6d4f\u89c8\u5668\u4e2d\u7684
> >> cookie\u3002
> >>
> >> -prefs.user.skin=\u5916\u8868
> >> -prefs.user.orientation=\u83dc\u5355\u4f4d\u7f6e
> >> -prefs.user.orientation.left=\u5de6\u4fa7
> >> -prefs.user.orientation.right=\u53f3\u4fa7
> >>  #prefs.user.editorareaheight=Editor area height  //not user anymore
> >> -prefs.user.sectionediting=\u6bb5\u843d\u7f16\u8f91
> >>  prefs.user.sectionediting.text=\u901a\u8fc7<span class="editsection"><a
> >>
> href="#">[\u7f16\u8f91]</a></span>\u94fe\u63a5\u542f\u7528\u6bb5\u843d\u7f16\u8f91
> >> -prefs.user.timeformat=\u65f6\u95f4\u683c\u5f0f
> >> -prefs.user.timezone=\u65f6\u533a
> >>  prefs.user.timezone.server=[\u670d\u52a1\u5668]
> >> -prefs.user.language=\u8bed\u8a00
> >>  prefs.user.language.default=[\u7f3a\u7701\u503c]
> >>
> >>
>  prefs.instructions=\u5728\u6b64\u8bbe\u7f6e\u7528\u6237\u9996\u9009\u9879\u3002\u60a8\u7684\u9009\u62e9\u5c06\u4fdd\u5b58\u4e3a\u6d4f\u89c8\u5668\u4e2d\u7684
> >> cookie\u3002
> >> -prefs.assertedname=\u540d\u5b57
> >>  prefs.assertedname.description=\u60a8\u7684\u59d3\u540d\u3002\
> >>
>  \u5982\u679c\u8fd8\u672a\u521b\u5efa\u7528\u6237\u6982\u8981\u4fe1\u606f\uff0c\u60a8\u53ef\u4ee5\u544a\u8bc9
> >> {0}
> >>
> \u60a8\u7684\u540d\u5b57\u6765\u201c\u58f0\u660e\u201d\u81ea\u5df1\u7684\u8eab\u4efd\u3002\
> >>  \u8bf7\u4e0d\u8981\u6b3a\u9a97\u6211\u4eec\u3002\
> >> @@ -371,8 +361,6 @@
> >>  {0}
> >>
> \u5982\u679c\u8981\u4f7f\u7528\u4f20\u7edf\u7684\u7528\u6237\u540d\u548c\u5bc6\u7801\uff0c\u8fd9\u9700\u8981\u66f4\u591a\u5b89\u5168\u6027\u3002
> >>  prefs.assertedname.create=\u521b\u5efa\u65b0\u7528\u6237\u4fe1\u606f
> >>  prefs.submit.setname=\u8bbe\u7f6e\u7528\u6237\u540d
> >> -prefs.save.prefs.submit=\u4fdd\u5b58\u7528\u6237\u9996\u9009\u9879
> >> -prefs.clear.submit=\u6e05\u9664\u7528\u6237\u9996\u9009\u9879
> >>
> >>
>  prefs.clear.description=\u5728\u67d0\u4e9b\u60c5\u51b5\u4e0b\uff0c\u60a8\u53ef\u80fd\u9700\u8981\u4ece\u8ba1\u7b97\u673a\u5220\u9664\u201casserted\u201d\u7528\u6237\u540d\u548c\u7528\u6237\u9996\u9009\u9879\u3002\
> >>
> >>
>  \u8981\u8fd9\u6837\u505a\uff0c\u8bf7\u5355\u51fb\u201c\u6e05\u9664\u7528\u6237\u9996\u9009\u9879\u201d\u6309\u94ae\u3002\
> >>  <br
> >>
> />\u6ce8\u610f\uff0c\u8fd9\u5c06\u6c38\u8fdc\u5220\u9664\u60a8\u6240\u8bbe\u7f6e\u7684\u6240\u6709\u7528\u6237\u9996\u9009\u9879\u3002\
> >>
> >> 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=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.java
> >> (original)
> >> +++
> >>
> incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/action/LoginActionBean.java
> >> Sat Jan 10 06:39:30 2009
> >> @@ -124,7 +124,7 @@
> >>         catch ( LoginException e )
> >>         {
> >>             log.info( "Failed to authenticate user " + m_username + ",
> >> reason: " + e.getMessage());
> >> -            errors.addGlobalError( new SimpleError( e.getMessage() ) );
> >> +            errors.addGlobalError( new LocalizableError(
> >> "login.error.password" ) );
> >>         }
> >>         catch( WikiSecurityException e )
> >>         {
> >>
> >> Modified:
> >>
> incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java
> >> (original)
> >> +++
> >>
> incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java
> >> Sat Jan 10 06:39:30 2009
> >> @@ -132,7 +132,7 @@
> >>     /**
> >>      * Cookie name for the user's preferred template skin.
> >>      */
> >> -    public static final String PREFS_SKIN = "SkinName";
> >> +    public static final String PREFS_SKIN = "Skin";
> >>
> >>     private static final long serialVersionUID = 2L;
> >>
> >>
> >> Modified: incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp (original)
> >> +++ incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp Sat Jan 10
> 06:39:30
> >> 2009
> >> @@ -4,7 +4,7 @@
> >>  <%@ page import="java.text.*" %>
> >>  <%@ page import="com.ecyrd.jspwiki.rss.*" %>
> >>  <%@ page import="com.ecyrd.jspwiki.util.*" %>
> >> -<%@ taglib uri="/WEB-INF/oscache.tld" prefix="oscache" %>
> >> +<%@ taglib uri="http://www.opensymphony.com/oscache" prefix="oscache"
> %>
> >>  <%!
> >>     Logger log = LoggerFactory.getLogger("JSPWiki");
> >>  %>
> >>
> >> Modified: incubator/jspwiki/trunk/src/webdocs/rss.jsp
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/rss.jsp?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/src/webdocs/rss.jsp (original)
> >> +++ incubator/jspwiki/trunk/src/webdocs/rss.jsp Sat Jan 10 06:39:30 2009
> >> @@ -7,7 +7,7 @@
> >>  <%@ page import="com.ecyrd.jspwiki.util.*" %>
> >>  <%@ page import="com.opensymphony.oscache.base.*" %>
> >>  <%@ page import="org.apache.jspwiki.api.WikiPage" %>
> >> -<%@ taglib uri="/WEB-INF/oscache.tld" prefix="oscache" %>
> >> +<%@ taglib uri="http://www.opensymphony.com/oscache" prefix="oscache"
> %>
> >>
> >>  <%!
> >>     Logger log = LoggerFactory.getLogger("JSPWiki");
> >>
> >> Modified:
> >> incubator/jspwiki/trunk/src/webdocs/templates/default/EditLayout.jsp
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditLayout.jsp?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/src/webdocs/templates/default/EditLayout.jsp
> >> (original)
> >> +++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditLayout.jsp
> >> Sat Jan 10 06:39:30 2009
> >> @@ -6,50 +6,45 @@
> >>  <stripes:layout-definition>
> >>
> >>  <html id="top" xmlns="http://www.w3.org/1999/xhtml">
> >> -
> >> -<head>
> >> -  <title>
> >> -    <wiki:CheckRequestContext context="edit">
> >> -    <fmt:message key="edit.title.edit">
> >> -      <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param>
> >> -      <fmt:param><wiki:PageName/></fmt:param>
> >> -    </fmt:message>
> >> -    </wiki:CheckRequestContext>
> >> -    <wiki:CheckRequestContext context="comment">
> >> -    <fmt:message key="comment.title.comment">
> >> -      <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param>
> >> -      <fmt:param><wiki:PageName/></fmt:param>
> >> -    </fmt:message>
> >> -    </wiki:CheckRequestContext>
> >> -  </title>
> >> -  <meta name="robots" content="noindex,follow" />
> >> -  <wiki:Include page="commonheader.jsp" />
> >> -</head>
> >> -
> >> -<body <wiki:CheckRequestContext
> >> context='edit'>class="edit"</wiki:CheckRequestContext>
> >> <wiki:CheckRequestContext
> >> context='comment'>class="comment"</wiki:CheckRequestContext> >
> >> -
> >> -<div id="wikibody" class="${prefs.Orientation}">
> >> -
> >> -  <wiki:Include page="Header.jsp" />
> >> -
> >> -  <div id="content">
> >> -
> >> -    <div id="page">
> >> -      <wiki:Include page="PageActionsTop.jsp" />
> >> -      <stripes:layout-component name="content" />
> >> -      <wiki:Include page="PageActionsBottom.jsp" />
> >> -       </div>
> >> -
> >> -    <wiki:Include page="Favorites.jsp" />
> >> -
> >> -       <div class="clearbox"></div>
> >> -  </div>
> >> -
> >> -  <wiki:Include page="Footer.jsp" />
> >> -
> >> -</div>
> >> -
> >> -</body>
> >> +  <head>
> >> +    <title>
> >> +      <wiki:CheckRequestContext context="edit">
> >> +      <fmt:message key="edit.title.edit">
> >> +        <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param>
> >> +        <fmt:param><wiki:PageName/></fmt:param>
> >> +      </fmt:message>
> >> +      </wiki:CheckRequestContext>
> >> +      <wiki:CheckRequestContext context="comment">
> >> +      <fmt:message key="comment.title.comment">
> >> +        <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param>
> >> +        <fmt:param><wiki:PageName/></fmt:param>
> >> +      </fmt:message>
> >> +      </wiki:CheckRequestContext>
> >> +    </title>
> >> +    <meta name="robots" content="noindex,follow" />
> >> +    <wiki:Include page="commonheader.jsp" />
> >> +  </head>
> >> +
> >> +  <body class="${wikiContext.requestContext}">
> >> +    <div id="wikibody" class="${prefs.Orientation}">
> >> +
> >> +      <wiki:Include page="Header.jsp" />
> >> +
> >> +      <div id="content">
> >> +        <div id="page">
> >> +          <wiki:Include page="PageActionsTop.jsp" />
> >> +          <stripes:layout-component name="content" />
> >> +          <wiki:Include page="PageActionsBottom.jsp" />
> >> +         </div>
> >> +        <wiki:Include page="Favorites.jsp" />
> >> +       <div class="clearbox"></div>
> >> +      </div>
> >> +
> >> +      <wiki:Include page="Footer.jsp" />
> >> +
> >> +    </div>
> >> +
> >> +  </body>
> >>  </html>
> >>
> >>  </stripes:layout-definition>
> >>
> >> Modified:
> incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp
> >> (original)
> >> +++ incubator/jspwiki/trunk/src/webdocs/templates/default/Footer.jsp Sat
> >> Jan 10 06:39:30 2009
> >> @@ -1,17 +1,13 @@
> >>  <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki"
> %>
> >> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
> >>  <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
> >> +<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"
> >> prefix="stripes" %>
> >>  <%@ page import="com.ecyrd.jspwiki.*" %>
> >> -<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
> >> -<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
> >> -<%
> >> -  WikiContext c = WikiContextFactory.findContext( pageContext );
> >> -  String frontpage = c.getEngine().getFrontPage();
> >> -%>
> >>  <div id="footer">
> >>
> >> -  <div class="applicationlogo" >
> >> -    <a href="<wiki:LinkTo page='<%=frontpage%>' format='url' />"
> >> -       title="<fmt:message key='actions.home.title'
> >> ><fmt:param><%=frontpage%></fmt:param></fmt:message> "><fmt:message
> >> key='actions.home' /></a>
> >> +  <div class="applicationlogo" >
> >> +    <c:set var="frontPageTitle"><fmt:message key='actions.home.title'
> >> ><fmt:param><c:out value='${wikiEngine.frontPage}'
> >> /></fmt:param></fmt:message></c:set>
> >> +    <stripes:link beanclass="com.ecyrd.jspwiki.action.ViewActionBean"
> >> title="${frontPageTitle}"><fmt:message key="actions.home"
> /></stripes:link>
> >>   </div>
> >>
> >>   <div class="companylogo"></div>
> >>
> >> Modified:
> incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp
> >> (original)
> >> +++ incubator/jspwiki/trunk/src/webdocs/templates/default/Header.jsp Sat
> >> Jan 10 06:39:30 2009
> >> @@ -1,19 +1,14 @@
> >>  <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki"
> %>
> >> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
> >>  <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
> >> -<%@ page import="com.ecyrd.jspwiki.*" %>
> >> -<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
> >> -<%
> >> -  WikiContext c = WikiContextFactory.findContext( pageContext );
> >> -  String frontpage = c.getEngine().getFrontPage();
> >> -%>
> >> -
> >> +<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"
> >> prefix="stripes" %>
> >>  <div id="header">
> >>
> >>   <div class="titlebox"><wiki:InsertPage page="TitleBox" /></div>
> >>
> >> -  <div class="applicationlogo" >
> >> -    <a href="<wiki:LinkTo page='<%=frontpage%>' format='url' />"
> >> -       title="<fmt:message key='actions.home.title'
> >> ><fmt:param><%=frontpage%></fmt:param></fmt:message> "><fmt:message
> >> key='actions.home' /></a>
> >> +  <div class="applicationlogo" >
> >> +    <c:set var="frontPageTitle"><fmt:message key='actions.home.title'
> >> ><fmt:param><c:out value='${wikiEngine.frontPage}'
> >> /></fmt:param></fmt:message></c:set>
> >> +    <stripes:link beanclass="com.ecyrd.jspwiki.action.ViewActionBean"
> >> title="${frontPageTitle}"><fmt:message key="actions.home"
> /></stripes:link>
> >>   </div>
> >>
> >>   <div class="companylogo"></div>
> >>
> >> Modified:
> >>
> incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp
> >> (original)
> >> +++
> >>
> incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsBottom.jsp
> >> Sat Jan 10 06:39:30 2009
> >> @@ -1,38 +1,30 @@
> >>  <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki"
> %>
> >> -<%@ page import="com.ecyrd.jspwiki.*" %>
> >> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
> >>  <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
> >> -<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
> >> -<%@ page import="org.apache.jspwiki.api.WikiPage" %>
> >> -<%
> >> -  WikiContext c = WikiContextFactory.findContext( pageContext );
> >> -  WikiPage wikipage = c.getPage();
> >> -%>
> >>  <wiki:CheckRequestContext context='view|diff|edit|upload|info'>
> >> -<div id='actionsBottom' class="pageactions">
> >> -  <wiki:PageExists>
> >> -
> >> -    <a href="#top" class="action quick2top" title="<fmt:message
> >> key='actions.gototop' />">&laquo;</a>
> >> -
> >> -    <wiki:CheckVersion mode="latest">
> >> -       <fmt:message key="info.lastmodified">
> >> -          <fmt:param><wiki:PageVersion/></fmt:param>
> >> -          <fmt:param><wiki:DiffLink version="latest"
> >> newVersion="previous"><wiki:PageDate format='${prefs["DateFormat"]}'
> >> /></wiki:DiffLink></fmt:param>
> >> -          <fmt:param><wiki:Author/></fmt:param>
> >> -       </fmt:message>
> >> -    </wiki:CheckVersion>
> >> -
> >> -    <wiki:CheckVersion mode="notlatest">
> >> -      <fmt:message key="actions.publishedon">
> >> -         <fmt:param><wiki:PageDate format='${prefs["DateFormat"]}'
> >> /></fmt:param>
> >> -         <fmt:param><wiki:Author/></fmt:param>
> >> -      </fmt:message>
> >> -    </wiki:CheckVersion>
> >> -
> >> -   <wiki:RSSImageLink mode="wiki" />
> >> -
> >> -  </wiki:PageExists>
> >> -
> >> -  <wiki:NoSuchPage><fmt:message key="actions.notcreated"
> >> /></wiki:NoSuchPage>
> >> -</div>
> >> +  <div id='actionsBottom' class="pageactions">
> >> +    <wiki:PageExists>
> >> +
> >> +      <a href="#top" class="action quick2top" title="<fmt:message
> >> key='actions.gototop' />">&laquo;</a>
> >> +
> >> +      <wiki:CheckVersion mode="latest">
> >> +         <fmt:message key="info.lastmodified">
> >> +            <fmt:param><wiki:PageVersion/></fmt:param>
> >> +            <fmt:param><wiki:DiffLink version="latest"
> >> newVersion="previous"><wiki:PageDate format='${prefs["DateFormat"]}'
> >> /></wiki:DiffLink></fmt:param>
> >> +            <fmt:param><wiki:Author/></fmt:param>
> >> +         </fmt:message>
> >> +      </wiki:CheckVersion>
> >> +
> >> +      <wiki:CheckVersion mode="notlatest">
> >> +        <fmt:message key="actions.publishedon">
> >> +           <fmt:param><wiki:PageDate format='${prefs["DateFormat"]}'
> >> /></fmt:param>
> >> +           <fmt:param><wiki:Author/></fmt:param>
> >> +        </fmt:message>
> >> +      </wiki:CheckVersion>
> >> +
> >> +     <wiki:RSSImageLink mode="wiki" />
> >> +
> >> +    </wiki:PageExists>
> >> +
> >> +    <wiki:NoSuchPage><fmt:message key="actions.notcreated"
> >> /></wiki:NoSuchPage>
> >> +  </div>
> >>  </wiki:CheckRequestContext>
> >> \ No newline at end of file
> >>
> >> Modified:
> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp
> >> (original)
> >> +++
> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PageActionsTop.jsp
> Sat
> >> Jan 10 06:39:30 2009
> >> @@ -1,26 +1,45 @@
> >>  <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki"
> %>
> >> -<%@ page import="com.ecyrd.jspwiki.*" %>
> >>  <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
> >>  <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
> >> +<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"
> >> prefix="stripes" %>
> >>  <div id="actionsTop" class="pageactions">
> >>   <ul>
> >> -
> >> +
> >>     <wiki:CheckRequestContext context='view|info|diff|upload|rename'>
> >> -    <wiki:Permission permission="edit">
> >> -       <li>
> >> -        <wiki:PageType type="page">
> >> -          <a href="<wiki:EditLink format='url' />" accesskey="e"
> >> class="action edit" title="<fmt:message key='actions.edit.title'
> >> />"><fmt:message key='actions.edit' /></a>
> >> -        </wiki:PageType>
> >> -        <wiki:PageType type="attachment">
> >> -          <a href="<wiki:BaseURL/>Edit.jsp?page=<wiki:ParentPageName/>"
> >> accesskey="e" class="action edit" title="<fmt:message
> >> key='actions.editparent.title' />"><fmt:message key='actions.editparent'
> >> /></a>
> >> -        </wiki:PageType>
> >> -    </li>
> >> -    </wiki:Permission>
> >> +      <wiki:Permission permission="edit">
> >> +       <li>
> >> +          <wiki:PageType type="page">
> >> +            <c:set var="editTitle"><fmt:message
> key="actions.edit.title"
> >> /></c:set>
> >> +            <stripes:link
> >> +              beanclass="com.ecyrd.jspwiki.action.EditActionBean"
> >> event="edit"
> >> +              accesskey="e" class="action edit"
> >> +              title="${editTitle}">
> >> +              <fmt:message key='actions.edit' />
> >> +              <stripes:param name="page" value="${
> wikiContext.page.name}"
> >> />
> >> +            </stripes:link>
> >> +          </wiki:PageType>
> >> +          <wiki:PageType type="attachment">
> >> +            <c:set var="editParentTitle"><fmt:message
> >> key="actions.editparent.title" /></c:set>
> >> +            <stripes:link
> >> +              beanclass="com.ecyrd.jspwiki.action.EditActionBean"
> >> event="edit"
> >> +              accesskey="e" class="action edit"
> >> +              title="${editParentTitle}">
> >> +              <fmt:message key='actions.edit' />
> >> +              <stripes:param
> >> name="page"><wiki:ParentPageName/></stripes:param>
> >> +            </stripes:link>
> >> +          </wiki:PageType>
> >> +        </li>
> >> +      </wiki:Permission>
> >>     </wiki:CheckRequestContext>
> >>
> >>     <%-- converted to popup menu by jspwiki-common.js--%>
> >>     <li id="morebutton">
> >> -      <a href="<wiki:Link format='url' page='MoreMenu' />"
> class="action
> >> more"><fmt:message key="actions.more" /></a>
> >> +      <stripes:link
> >> +        beanclass="com.ecyrd.jspwiki.action.ViewActionBean"
> >> +        class="action more">
> >> +        <stripes:param name="page" value="MoreMenu" />
> >> +        <fmt:message key="actions.more" />
> >> +      </stripes:link>
> >>     </li>
> >>
> >>   </ul>
> >>
> >> Modified:
> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp
> >> (original)
> >> +++
> >> incubator/jspwiki/trunk/src/webdocs/templates/default/PreferencesTab.jsp
> Sat
> >> Jan 10 06:39:30 2009
> >> @@ -27,7 +27,7 @@
> >>  <stripes:form
> >> beanclass="com.ecyrd.jspwiki.action.UserPreferencesActionBean"
> >> class="wikiform" id="setCookie" method="post" acceptcharset="UTF-8">
> >>  <table>
> >>   <tr>
> >> -  <td><stripes:label for="assertedName" name="prefs.assertedname"
> /></td>
> >> +  <td><stripes:label for="assertedName" /></td>
> >>   <td>
> >>     <stripes:text id="assertedName" name="assertedName"
> >> size="20"><wiki:UserProfile property='wikiname' /></stripes:text>
> >>     <stripes:errors field="assertedName" />
> >> @@ -52,7 +52,7 @@
> >>   </wiki:UserCheck>
> >>
> >>   <tr>
> >> -  <td><stripes:label for="editor" name="edit.chooseeditor" /></td>
> >> +  <td><stripes:label for="editor" /></td>
> >>   <td>
> >>     <select id="editor" name="editor">
> >>       <wiki:EditorIterator id="edt">
> >> @@ -64,7 +64,7 @@
> >>   </tr>
> >>
> >>   <tr>
> >> -  <td><stripes:label for="sectionEditing"
> name="prefs.user.sectionediting"
> >> /></td>
> >> +  <td><stripes:label for="sectionEditing" /></td>
> >>   <td>
> >>     <stripes:checkbox id="sectionEditing" name="sectionEditing"
> >> checked="true" />
> >>     <stripes:errors field="sectionEditing" />
> >> @@ -73,7 +73,7 @@
> >>   </tr>
> >>
> >>   <tr>
> >> -  <td><stripes:label for="skin" name="prefs.user.skin" /></td>
> >> +  <td><stripes:label for="skin" /></td>
> >>   <td>
> >>     <stripes:select id="skin" name="skin">
> >>       <stripes:options-collection collection="${skins}" />
> >> @@ -84,28 +84,28 @@
> >>
> >>   <c:if test='${not empty locales}'>
> >>     <tr>
> >> -      <td><stripes:label for="locale" name="prefs.user.language"
> /></td>
> >> +      <td><stripes:label for="locale" /></td>
> >>       <td>
> >>         <stripes:select name="locale">
> >>           <stripes:options-map map="${locales}" />
> >>         </stripes:select>
> >> -        <stripes:errors field="language" />
> >> +        <stripes:errors field="locale" />
> >>       </td>
> >>     </tr>
> >>   </c:if>
> >>
> >>   <tr>
> >> -    <td><stripes:label for="orientation" name="prefs.user.orientation"
> >> /></td>
> >> +    <td><stripes:label for="orientation" /></td>
> >>     <td>
> >>       <stripes:select id="orientation" name="orientation">
> >> -        <stripes:options-enumeration
> >> enum="com.ecyrd.jspwiki.preferences.Preferences.Orientation" />
> >> +        <stripes:options-enumeration
> >> enum="com.ecyrd.jspwiki.preferences.Preferences.Orientation"
> label="name" />
> >>       </stripes:select>
> >>       <stripes:errors field="orientation" />
> >>     </td>
> >>   </tr>
> >>
> >>   <tr>
> >> -    <td><stripes:label for="timeFormat" name="prefs.user.timeformat"
> >> /></td>
> >> +    <td><stripes:label for="timeFormat" /></td>
> >>     <td>
> >>       <stripes:select id="timeFormat" name="timeFormat">
> >>         <stripes:options-map map="${timeformats}" />
> >> @@ -115,7 +115,7 @@
> >>   </tr>
> >>
> >>   <tr>
> >> -    <td><stripes:label for="timeZone" name="prefs.user.timezone"
> /></td>
> >> +    <td><stripes:label for="timeZone" /></td>
> >>     <td>
> >>       <stripes:select id="timeZone" name="timeZone">
> >>         <stripes:options-map map="${timezones}" />
> >> @@ -148,7 +148,7 @@
> >>   <tr>
> >>     <td>&nbsp;</td>
> >>     <td>
> >> -      <stripes:submit name="save" accesskey="s"><fmt:message
> >> key='prefs.save.prefs.submit' /></stripes:submit>
> >> +      <stripes:submit name="save" accesskey="s" />
> >>       <stripes:hidden name="redirect"><wiki:Variable var='redirect'
> >> default='' /></stripes:hidden>
> >>       <div class="formhelp"><fmt:message key='prefs.cookies' /></div>
> >>     </td>
> >> @@ -164,7 +164,7 @@
> >>
> >>  <stripes:form
> >> beanclass="com.ecyrd.jspwiki.action.UserPreferencesActionBean"
> >> id="clearCookie" method="post" acceptcharset="UTF-8">
> >>   <div>
> >> -    <stripes:submit name="clearAssertedName"><fmt:message
> >> key='prefs.clear.submit' /></stripes:submit>
> >> +    <stripes:submit name="clearAssertedName" />
> >>   </div>
> >>   <div class="formhelp"><fmt:message key="prefs.clear.description"
> /></div>
> >>  </stripes:form>
> >>
> >> Modified:
> incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp
> >> (original)
> >> +++ incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp
> Sat
> >> Jan 10 06:39:30 2009
> >> @@ -1,11 +1,7 @@
> >>  <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki"
> %>
> >> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
> >>  <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
> >> -<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
> >> -<%@ page import="com.ecyrd.jspwiki.*" %>
> >> -<%@ page import="com.ecyrd.jspwiki.action.WikiContextFactory" %>
> >> -<%
> >> -  WikiContext c = WikiContextFactory.findContext( pageContext );
> >> -%>
> >> +<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"
> >> prefix="stripes" %>
> >>  <div class="userbox">
> >>
> >>   <wiki:UserCheck status="anonymous">
> >> @@ -30,31 +26,41 @@
> >>
> >>   <%-- action buttons --%>
> >>   <wiki:UserCheck status="notAuthenticated">
> >> -  <wiki:CheckRequestContext context='!login'>
> >> -    <wiki:Permission permission="login">
> >> -      <a href="<wiki:Link jsp='Login.jsp' format='url'><wiki:Param
> >> -         name='redirect'
> >>
> value='<%=c.getEngine().encodeName(c.getPage().getName())%>'/></wiki:Link>"
> >> -        class="action login"
> >> -        title="<fmt:message key='actions.login.title'/>"><fmt:message
> >> key="actions.login"/></a>
> >> -    </wiki:Permission>
> >> -  </wiki:CheckRequestContext>
> >> +    <wiki:CheckRequestContext context='!login'>
> >> +      <wiki:Permission permission="login">
> >> +        <c:set var="loginTitle"><fmt:message key='actions.login.title'
> >> /></c:set>
> >> +        <stripes:link
> >> +          beanclass="com.ecyrd.jspwiki.action.LoginActionBean"
> >> +          class="action login"
> >> +          title="${loginTitle}">
> >> +          <stripes:param name="redirect" value="${
> wikiContext.page.name}"
> >> />
> >> +          <fmt:message key="actions.login"/>
> >> +        </stripes:link>
> >> +      </wiki:Permission>
> >> +    </wiki:CheckRequestContext>
> >>   </wiki:UserCheck>
> >>
> >>   <wiki:UserCheck status="authenticated">
> >> -   <a href="<wiki:Link jsp='Logout.jsp' format='url' />"
> >> -     class="action logout"
> >> -     title="<fmt:message key='actions.logout.title'/>"><fmt:message
> >> key="actions.logout"/></a>
> >> -   <%--onclick="return( confirm('<fmt:message
> >> key="actions.confirmlogout"/>') && (location=this.href) );"--%>
> >> +    <c:set var="logoutTitle"><fmt:message key='actions.logout.title'
> >> /></c:set>
> >> +    <stripes:link
> >> +      beanclass="com.ecyrd.jspwiki.action.LoginActionBean"
> event="logout"
> >> +      class="action logout"
> >> +      title="${logoutTitle}">
> >> +      <fmt:message key="actions.login"/>
> >> +    </stripes:link>
> >>   </wiki:UserCheck>
> >>
> >>   <wiki:CheckRequestContext context='!prefs'>
> >> -  <wiki:CheckRequestContext context='!preview'>
> >> -    <a href="<wiki:Link jsp='UserPreferences.jsp' format='url'
> >> ><wiki:Param name='redirect'
> >> -
> >>
>  value='<%=c.getEngine().encodeName(c.getPage().getName())%>'/></wiki:Link>"
> >> -      class="action prefs" accesskey="p"
> >> -      title="<fmt:message key='actions.prefs.title'/>"><fmt:message
> >> key="actions.prefs" />
> >> -    </a>
> >> -  </wiki:CheckRequestContext>
> >> +    <wiki:CheckRequestContext context='!preview'>
> >> +      <c:set var="prefsTitle"><fmt:message key='actions.prefs.title'
> >> /></c:set>
> >> +      <stripes:link
> >> +        beanclass="com.ecyrd.jspwiki.action.UserPreferencesActionBean"
> >> +        class="action prefs" accesskey="p"
> >> +        title="${prefsTitle}">
> >> +        <stripes:param name="redirect" value="${wikiContext.page.name
> }"
> >> />
> >> +        <fmt:message key="actions.prefs"/>
> >> +      </stripes:link>
> >> +    </wiki:CheckRequestContext>
> >>   </wiki:CheckRequestContext>
> >>
> >>   <div class="clearbox"></div>
> >>
> >> Modified:
> >> incubator/jspwiki/trunk/src/webdocs/templates/default/ViewLayout.jsp
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/ViewLayout.jsp?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/src/webdocs/templates/default/ViewLayout.jsp
> >> (original)
> >> +++ incubator/jspwiki/trunk/src/webdocs/templates/default/ViewLayout.jsp
> >> Sat Jan 10 06:39:30 2009
> >> @@ -1,56 +1,50 @@
> >>  <%@ taglib uri="http://jakarta.apache.org/jspwiki.tld" prefix="wiki"
> %>
> >>  <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
> >>  <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"
> >> prefix="stripes" %>
> >> -<%@ page import="com.ecyrd.jspwiki.*" %>
> >>  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "
> >> http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
> >>
> >>  <stripes:layout-definition>
> >>
> >>  <html id="top" xmlns="http://www.w3.org/1999/xhtml">
> >> -
> >> -<head>
> >> -  <title>
> >> -    <fmt:message key="view.title.view">
> >> -      <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param>
> >> -      <fmt:param><wiki:PageName/></fmt:param>
> >> -    </fmt:message>
> >> -  </title>
> >> -  <wiki:Include page="commonheader.jsp" />
> >> -  <wiki:CheckVersion mode="notlatest">
> >> -    <meta name="robots" content="noindex,nofollow" />
> >> -  </wiki:CheckVersion>
> >> -  <wiki:CheckRequestContext context="diff|info">
> >> -    <meta name="robots" content="noindex,nofollow" />
> >> -  </wiki:CheckRequestContext>
> >> -  <wiki:CheckRequestContext context="!view">
> >> -    <meta name="robots" content="noindex,follow" />
> >> -  </wiki:CheckRequestContext>
> >> -</head>
> >> -
> >> -<body class="view">
> >> -
> >> -<div id="wikibody" class="${prefs.Orientation}">
> >> -
> >> -  <wiki:Include page="Header.jsp" />
> >> -
> >> -  <div id="content">
> >> -
> >> -    <div id="page">
> >> -      <wiki:Include page="PageActionsTop.jsp" />
> >> -      <stripes:layout-component name="content" />
> >> -      <wiki:Include page="PageActionsBottom.jsp" />
> >> +  <head>
> >> +    <title>
> >> +      <fmt:message key="view.title.view">
> >> +        <fmt:param><wiki:Variable var="ApplicationName" /></fmt:param>
> >> +        <fmt:param><wiki:PageName/></fmt:param>
> >> +      </fmt:message>
> >> +    </title>
> >> +    <wiki:Include page="commonheader.jsp" />
> >> +    <wiki:CheckVersion mode="notlatest">
> >> +      <meta name="robots" content="noindex,nofollow" />
> >> +    </wiki:CheckVersion>
> >> +    <wiki:CheckRequestContext context="diff|info">
> >> +      <meta name="robots" content="noindex,nofollow" />
> >> +    </wiki:CheckRequestContext>
> >> +    <wiki:CheckRequestContext context="!view">
> >> +      <meta name="robots" content="noindex,follow" />
> >> +    </wiki:CheckRequestContext>
> >> +  </head>
> >> +
> >> +  <body class="view">
> >> +    <div id="wikibody" class="${prefs.Orientation}">
> >> +
> >> +      <wiki:Include page="Header.jsp" />
> >> +
> >> +      <div id="content">
> >> +        <div id="page">
> >> +          <wiki:Include page="PageActionsTop.jsp" />
> >> +          <stripes:layout-component name="content" />
> >> +          <wiki:Include page="PageActionsBottom.jsp" />
> >> +        </div>
> >> +        <wiki:Include page="Favorites.jsp" />
> >> +       <div class="clearbox"></div>
> >> +      </div>
> >> +
> >> +      <wiki:Include page="Footer.jsp" />
> >> +
> >>     </div>
> >> +  </body>
> >>
> >> -    <wiki:Include page="Favorites.jsp" />
> >> -
> >> -       <div class="clearbox"></div>
> >> -  </div>
> >> -
> >> -  <wiki:Include page="Footer.jsp" />
> >> -
> >> -</div>
> >> -
> >> -</body>
> >>  </html>
> >>
> >>  </stripes:layout-definition>
> >>
> >> Modified:
> >> incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp?rev=733278&r1=733277&r2=733278&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
> >> (original)
> >> +++
> incubator/jspwiki/trunk/src/webdocs/templates/default/commonheader.jsp
> >> Sat Jan 10 06:39:30 2009
> >> @@ -37,7 +37,7 @@
> >>  <script type="text/javascript" src="<wiki:Link format='url'
> >> jsp='scripts/jspwiki-common.js' />"></script>
> >>  <script type="text/javascript" src="<wiki:Link format='url'
> >> jsp='scripts/jspwiki-commonstyles.js' />"></script>
> >>  <wiki:IncludeResources type="script" />
> >> -<meta name="wikiContext" content='<wiki:Variable var="requestcontext"
> />'
> >> />
> >> +<meta name="wikiContext" content='${wikiContext.requestContext}' />
> >>  <meta name="wikiBaseUrl" content='<wiki:BaseURL/>' />
> >>  <meta name="wikiPageUrl" content='<wiki:Link format="url" page="#$%"
> />'
> >> />
> >>  <meta name="wikiEditUrl" content='<wiki:EditLink format="url" />' />
> >> @@ -45,7 +45,7 @@
> >>  <meta name="wikiPageName" content='<wiki:Variable var="pagename" />'
> >> /><%--pagename without blanks--%>
> >>  <meta name="wikiUserName" content='<wiki:UserName/>' />
> >>  <meta name="wikiTemplateUrl" content='<wiki:Link format="url"
> >> templatefile="" />' />
> >> -<meta name="wikiApplicationName" content='<wiki:Variable
> >> var="ApplicationName" />' />
> >> +<meta name="wikiApplicationName"
> content='${wikiEngine.applicationName}'
> >> />
> >>
> >>  <script type="text/javascript">//<![CDATA[
> >>  /* Localized javascript strings: LocalizedStrings[] */
> >> @@ -54,13 +54,9 @@
> >>  //]]></script>
> >>
> >>  <meta http-equiv="Content-Type" content="text/html;
> >> charset=<wiki:ContentEncoding/>" />
> >> -<link rel="search" href="<wiki:LinkTo format='url' page='FindPage' />"
> >> title='Search <wiki:Variable var="ApplicationName" />' />
> >> +<link rel="search" href="<wiki:LinkTo format='url' page='FindPage' />"
> >> title='Search ${wikiEngine.applicationName}' />
> >>  <link rel="help" href="<wiki:LinkTo format='url'
> >> page='TextFormattingRules' />" title="Help" />
> >> -<%
> >> -  WikiContext c = WikiContextFactory.findContext( pageContext );
> >> -  String frontpage = c.getEngine().getFrontPage();
> >> - %>
> >> - <link rel="start" href="<wiki:LinkTo format='url'
> page='<%=frontpage%>'
> >> />" title="Front page" />
> >> +<link rel="start" href="<wiki:LinkTo format='url'
> >> page='${wikiEngine.frontPage}' />" title="Front page" />
> >>  <link rel="alternate stylesheet" type="text/css" href="<wiki:Link
> >> format='url' templatefile='jspwiki_print.css' />" title="Print friendly"
> />
> >>  <link rel="alternate stylesheet" type="text/css" href="<wiki:Link
> >> format='url' templatefile='jspwiki.css' />" title="Standard" />
> >>  <link rel="shortcut icon" type="image/x-icon" href="<wiki:Link
> >> format='url' jsp='images/favicon.ico' />" />
> >> @@ -79,13 +75,13 @@
> >>  <wiki:FeedDiscovery/>
> >>
> >>  <%-- SKINS : extra stylesheets, extra javascript --%>
> >> -<c:if test='${(!empty prefs.SkinName) &&
> (prefs.SkinName!="PlainVanilla")
> >> }'>
> >> -<link rel="stylesheet" type="text/css" media="screen, projection,
> print"
> >> href="<wiki:Link format='url' templatefile='skins/' /><c:out
> >> value='${prefs.SkinName}/skin.css' />" />
> >> +<c:if test='${(!empty prefs.Skin) && (prefs.Skin!="PlainVanilla") }'>
> >> +<link rel="stylesheet" type="text/css" media="screen, projection,
> print"
> >> href="<wiki:Link format='url'
> templatefile='skins/${prefs.Skin}/skin.css'
> >> />" />
> >>  <%--
> >>  <link rel="stylesheet" type="text/css" media="print"
> >> -     href="<wiki:Link format='url' templatefile='skins/' /><c:out
> >> value='${prefs.SkinName}/print_skin.css' />" />
> >> +     href="<wiki:Link format='url'
> >> templatefile='skins/${prefs.Skin}/print_skin.css' />" />
> >>  --%>
> >> -<script type="text/javascript" src="<wiki:Link format='url'
> >> templatefile='skins/' /><c:out value='${prefs.SkinName}/skin.js'
> >> />"></script>
> >> +<script type="text/javascript" src="<wiki:Link format='url'
> >> templatefile='skins/${prefs.Skin}/skin.js' />"></script>
> >>  </c:if>
> >>
> >>  <wiki:Include page="localheader.jsp" />
> >> \ No newline at end of file
> >>
> >>
> >>
> >
>
Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message