Author: metskem
Date: Sat Nov 14 14:06:04 2009
New Revision: 836182
URL: http://svn.apache.org/viewvc?rev=836182&view=rev
Log:
3.0.0-svn-178
* placeholders in edit.locked i18n key were not properly numbered in
some languages
* EditActionBean's property changeNote changed to changenote (Stripes
could't find it)
* EditActionBean now uses it's own setters for member vars.
* minor typo in ChangeRateInspector
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/ChangeRateInspector.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=836182&r1=836181&r2=836182&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Nov 14 14:06:04 2009
@@ -1,3 +1,15 @@
+2009-11-14 Harry Metske <[email protected]>
+
+ * 3.0.0-svn-178
+
+ * placeholders in edit.locked i18n key were not properly numbered in
some languages
+
+ * EditActionBean's property changeNote changed to changenote (Stripes
could't find it)
+
+ * EditActionBean now uses it's own setters for member vars.
+
+ * minor typo in ChangeRateInspector
+
2009-11-03 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-177
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties?rev=836182&r1=836181&r2=836182&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties
Sat Nov 14 14:06:04 2009
@@ -291,7 +291,7 @@
attach.add.changenote=Change note:
attach.bad.filetype=File {2} cannot be uploaded to this wiki because it
contains a file type we don't like
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-edit.locked=User “{2}” has started to edit this page, but has not
yet saved. I won’t stop you from editing this page anyway, BUT be aware
that the other person might be quite annoyed. It would be courteous to wait
for the lock to expire or until the person stops editing the page. The lock
expires in {3} minutes.
+edit.locked=User “{0}” has started to edit this page, but has not
yet saved. I won’t stop you from editing this page anyway, BUT be aware
that the other person might be quite annoyed. It would be courteous to wait
for the lock to expire or until the person stops editing the page. The lock
expires in {1} minutes.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
edit.restoring=You are about to restore version {2}. Click on
“Save” to restore. You may also edit the page before restoring it.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.sneakpreview.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties?rev=836182&r1=836181&r2=836182&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties
Sat Nov 14 14:06:04 2009
@@ -293,7 +293,7 @@
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
attach.add.changenote=Kommentar:
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-edit.locked=Der Benutzer {2} hat damit begonnen, diese Seite zu bearbeiten,
aber hat sie noch nicht gespeichert. Du wirst nicht davon abgehalten die Seite
weiter zu bearbeiten, aber bedenke, dass {3} nicht begeistert sein wird, wenn
jemand anders die Seite zwischenzeitlich ändert. Es wäre höflicher zu warten
bis derjenige fertig ist. Diese "Sperre" wird in {1} Minuten aufgehoben.
+edit.locked=Der Benutzer {0} hat damit begonnen, diese Seite zu bearbeiten,
aber hat sie noch nicht gespeichert. Du wirst nicht davon abgehalten die Seite
weiter zu bearbeiten, aber bedenke, dass {3} nicht begeistert sein wird, wenn
jemand anders die Seite zwischenzeitlich ändert. Es wäre höflicher zu warten
bis derjenige fertig ist. Diese "Sperre" wird in {1} Minuten aufgehoben.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
edit.restoring=Soll die Version {2} wiederhergestellt werden? Falls ja, klicke
auf 'Speichern'! Die Seite kann auch vorher noch bearbeitet werden.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.sneakpreview.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties?rev=836182&r1=836181&r2=836182&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties
Sat Nov 14 14:06:04 2009
@@ -270,7 +270,7 @@
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
attach.add.changenote=Nota de cambio:
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-edit.locked=El usuario “{2}” ha empezado a editar esta página,
pero aún no la ha guardado. Aún así no voy a impedirte editar la página, PERO
sé consciente de que la otra persona puede sentirse bastante molesta. Lo
educado sería esperar a que el bloqueo expire o hasta que la otra persona deje
de editar la página. El bloqueo terminará en {3} minutos.
+edit.locked=El usuario “{0}” ha empezado a editar esta página,
pero aún no la ha guardado. Aún así no voy a impedirte editar la página, PERO
sé consciente de que la otra persona puede sentirse bastante molesta. Lo
educado sería esperar a que el bloqueo expire o hasta que la otra persona deje
de editar la página. El bloqueo terminará en {1} minutos.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
edit.restoring=Estás apunto de restaurar la versión {2}. Haz click en
“Guardar” para restaurarla. También puedes editar la página antes
de hacerlo.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.sneakpreview.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties?rev=836182&r1=836181&r2=836182&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties
Sat Nov 14 14:06:04 2009
@@ -187,7 +187,7 @@
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
attach.add.changenote=Päivitystieto:
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-edit.locked=Huppistakeikkaa! Käättäjä "{2}" on mennynnä muokkaamaan
tätä sivua mutta ei oo vielä kehanna tallettaa. Minen sinnuu estä, jos nyt
väen vängällä tahonnii sivua mennä mulkkamahan, mutta suattaapi tuo toinen
vähän hermostua. Jos nyt vielä viittisit vuottaa {3} minnuuttii, niin eiköpähän
tuo ruojake sitten ole lopettanna.
+edit.locked=Huppistakeikkaa! Käättäjä "{0}" on mennynnä muokkaamaan
tätä sivua mutta ei oo vielä kehanna tallettaa. Minen sinnuu estä, jos nyt
väen vängällä tahonnii sivua mennä mulkkamahan, mutta suattaapi tuo toinen
vähän hermostua. Jos nyt vielä viittisit vuottaa {1} minnuuttii, niin eiköpähän
tuo ruojake sitten ole lopettanna.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
edit.restoring=Olet palauttamassa versiota {2}. Paina "Tallenna"
palauttaaksesi. Voit myös muokata sivua ennen kuin tallennat.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.sneakpreview.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties?rev=836182&r1=836181&r2=836182&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties
Sat Nov 14 14:06:04 2009
@@ -199,7 +199,7 @@
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
attach.add.changenote=Modifier la note :
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-edit.locked=L''utilisateur \u201c{2}\u201d a commencé à éditer la page, mais
ne l''a pas encore enregistrée. Rien ne vous empêche d''éditer cette page, MAIS
sachez que vous risquez de beaucoup l''ennuyer ! Il serait plus courtois
d''attendre que son verrou expire, ou de laisser {3} terminer ses modifications
(ce verrou expire dans {1} minutes.)
+edit.locked=L''utilisateur \u201c{0}\u201d a commencé à éditer la page, mais
ne l''a pas encore enregistrée. Rien ne vous empêche d''éditer cette page, MAIS
sachez que vous risquez de beaucoup l''ennuyer ! Il serait plus courtois
d''attendre que son verrou expire, ou de laisser terminer ses modifications (ce
verrou expire dans {1} minutes.)
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
edit.restoring=Vous êtes sur le point de restaurer la version {2}. Cliquez sur
\u201cEnregistrer\u201d pour restaurer. Vous pouvez aussi éditer la page avant
de la restaurer.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.sneakpreview.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties?rev=836182&r1=836181&r2=836182&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties
Sat Nov 14 14:06:04 2009
@@ -197,7 +197,7 @@
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
attach.add.changenote=Nota alla modifica:
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-edit.locked=L’utente “{2}” ha iniziato a modificare questa
pagina, ma non l’ha ancora salvata. Puoi continuare a modificare, ma
attenzione, l’altra persona potrebbe non esserne molto contenta ...
Sarebbe estremamente cortese attendere cha abbia finito - o attendere almeno
che scada il lock, tra {3} minuti.
+edit.locked=L’utente “{1}” ha iniziato a modificare questa
pagina, ma non l’ha ancora salvata. Puoi continuare a modificare, ma
attenzione, l’altra persona potrebbe non esserne molto contenta ...
Sarebbe estremamente cortese attendere cha abbia finito - o attendere almeno
che scada il lock, tra {1} minuti.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
edit.restoring=Stai per ripristinare la versione {2}. Click su
“Salva” per ripristinare. Puoi anche modificare la pagina prima di
ripristinarla.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.sneakpreview.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties?rev=836182&r1=836181&r2=836182&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties
Sat Nov 14 14:06:04 2009
@@ -231,7 +231,7 @@
varmgr.dateformat.invalid.parm=Parameter niet herkend:
version.invalid=Versie {1} bestaat niet.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-edit.locked=Gebruiker “{2}” bewerkt momenteel dit document. Als U
wil kan U deze pagina toch wijzigen, MAAR weet dat de andere persoon dit
misschien niet zal appreciëren. Wees hoffelijk en wacht tot de pagina lock is
verlopen of tot de andere persoon zijn bewerkingen heeft beëindigd. De pagina
lock verloopt na {3} minuten.
+edit.locked=Gebruiker “{0}” bewerkt momenteel dit document. Als U
wil kan U deze pagina toch wijzigen, MAAR weet dat de andere persoon dit
misschien niet zal appreciëren. Wees hoffelijk en wacht tot de pagina lock is
verlopen of tot de andere persoon zijn bewerkingen heeft beëindigd. De pagina
lock verloopt na {1} minuten.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
edit.restoring=De actie herstelt versie {2} van deze pagina. Klik op
“Bewaar” om te herstellen. U kan de pagina ook nog bewerken indien
U dat wenst.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.sneakpreview.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties?rev=836182&r1=836181&r2=836182&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties
Sat Nov 14 14:06:04 2009
@@ -203,7 +203,7 @@
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
attach.add.changenote=\u0421\u0434\u0435\u043b\u0430\u043d\u044b\u0435
\u0438\u0441\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f:
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-edit.locked=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c
“{2}” \u043d\u0430\u0447\u0430\u043b
\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443, \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 {3}
\u043c\u0438\u043d\u0443\u0442.
+edit.locked=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c
“{0}” \u043d\u0430\u0447\u0430\u043b
\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443, \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.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
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 {2}. \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
“\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c”.
\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.
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.sneakpreview.
Modified:
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties?rev=836182&r1=836181&r2=836182&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
(original)
+++
incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
Sat Nov 14 14:06:04 2009
@@ -290,7 +290,7 @@
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
attach.add.changenote=\u53d8\u66f4\u6ce8\u91ca\uff1a
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
-edit.locked=\u7528\u6237 <strong>{2}</strong>
\u5df2\u5f00\u59cb\u7f16\u8f91\u8be5\u9875\u9762\uff0c\u4f46\u8fd8\u672a\u4fdd\u5b58\u3002\u6211\u4e0d\u4f1a\u963b\u6b62\u60a8\u7f16\u8f91\u8be5\u9875\u9762\uff0c\u4f46\u662f\u8981\u77e5\u9053\u5176\u4ed6\u4eba\u53ef\u80fd\u4f1a\u5f88\u70e6\u3002\u7b49\u5f85\u9501\u5b9a\u8fc7\u671f\u6216\u522b\u4eba\u505c\u6b62\u7f16\u8f91\uff0c\u8fd9\u6837\u4f1a\u6bd4\u8f83\u793c\u8c8c\u3002\u9501\u5b9a\u4f1a\u5728
{3} \u5206\u949f\u540e\u8fc7\u671f\u3002
+edit.locked=\u7528\u6237 <strong>{0}</strong>
\u5df2\u5f00\u59cb\u7f16\u8f91\u8be5\u9875\u9762\uff0c\u4f46\u8fd8\u672a\u4fdd\u5b58\u3002\u6211\u4e0d\u4f1a\u963b\u6b62\u60a8\u7f16\u8f91\u8be5\u9875\u9762\uff0c\u4f46\u662f\u8981\u77e5\u9053\u5176\u4ed6\u4eba\u53ef\u80fd\u4f1a\u5f88\u70e6\u3002\u7b49\u5f85\u9501\u5b9a\u8fc7\u671f\u6216\u522b\u4eba\u505c\u6b62\u7f16\u8f91\uff0c\u8fd9\u6837\u4f1a\u6bd4\u8f83\u793c\u8c8c\u3002\u9501\u5b9a\u4f1a\u5728
{1} \u5206\u949f\u540e\u8fc7\u671f\u3002
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties.
edit.restoring=\u5c06\u6062\u590d\u7248\u672c
{2}\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
#Copied from src/WebContent/WEB-INF/classes/templates/default.properties..
Formerly named editor.plain.sneakpreview.
Modified:
incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp?rev=836182&r1=836181&r2=836182&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/editors/plain.jsp
Sat Nov 14 14:06:04 2009
@@ -70,10 +70,10 @@
<table>
<tr>
<td>
- <s:label for="changeNote" />
+ <s:label for="changenote" />
</td>
<td>
- <s:text name="changeNote" size="50" maxlength="80" />
+ <s:text name="changenote" size="50" maxlength="80" />
</td>
</tr>
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=836182&r1=836181&r2=836182&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sat Nov 14
14:06:04 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "177";
+ public static final String BUILD = "178";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java?rev=836182&r1=836181&r2=836182&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/EditActionBean.java
Sat Nov 14 14:06:04 2009
@@ -83,7 +83,7 @@
private String m_text = null;
- private String m_changeNote = null;
+ private String m_changenote = null;
private boolean m_append = false;
@@ -176,7 +176,7 @@
}
// The comment field is initialized with nothing
- m_text = "";
+ setText( "" );
return new ForwardResolution( "/Comment.jsp" );
}
@@ -248,7 +248,7 @@
}
// Load the page text
- m_text = engine.getPureText( page );
+ setText( engine.getPureText( page ) );
return new ForwardResolution( "/Edit.jsp" );
}
@@ -288,9 +288,9 @@
/*
* Returns the changenote for this upload.
*/
- public String getChangeNote()
+ public String getChangenote()
{
- return m_changeNote;
+ return m_changenote;
}
/**
@@ -394,7 +394,7 @@
UserProfile profile = mgr.getUserProfile( wikiSession );
if ( profile.getEmail() != null )
{
- m_email = profile.getEmail();
+ setEmail( profile.getEmail() );
}
}
}
@@ -436,10 +436,10 @@
String conflictText = page.getContentAsString();
conflictText = StringEscapeUtils.escapeXml( conflictText );
conflictText = TextUtil.replaceString( conflictText, "\n", "<br
/>" );
- m_conflictText = conflictText;
+ setConflictText( conflictText );
// Create a validation error
- errors.add( "text", new LocalizableError( "edit.conflict" ) );
+ errors.add( "text", new LocalizableError( "edit.conflict") );
}
// Is the user trying to edit a special page? Tsk, tsk.
@@ -470,9 +470,9 @@
// Set author information and other metadata
WikiPage modifiedPage = (WikiPage)page.clone();
modifiedPage.setAuthor( m_author );
- if( m_changeNote != null )
+ if( m_changenote != null )
{
- modifiedPage.setAttribute( WikiPage.CHANGENOTE, m_changeNote );
+ modifiedPage.setAttribute( WikiPage.CHANGENOTE, m_changenote );
}
// If this is an append, add it to the page.
@@ -596,12 +596,12 @@
/**
* Sets the changenote for this upload; usually a short comment.
*
- * @param changeNote the change note
+ * @param changenote the change note
*/
@Validate( required = false )
- public void setChangeNote( String changeNote )
+ public void setChangenote( String changenote )
{
- m_changeNote = changeNote;
+ m_changenote = changenote;
}
/**
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/ChangeRateInspector.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/ChangeRateInspector.java?rev=836182&r1=836181&r2=836182&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/ChangeRateInspector.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/content/inspect/ChangeRateInspector.java
Sat Nov 14 14:06:04 2009
@@ -46,7 +46,7 @@
m_limitSimilarChanges = TextUtil.getIntegerProperty( props,
PROP_SIMILARCHANGES, m_limitSimilarChanges );
log.info( "# Spam filter initialized. Temporary ban time " +
config.getReputationManager().getBanTime()
- + " mins, max page changes/m inute: " +
m_limitSinglePageChanges );
+ + " mins, max page changes/minute: " +
m_limitSinglePageChanges );
}
/**
