Author: brushed
Date: Sun Jun 22 02:08:57 2008
New Revision: 670324
URL: http://svn.apache.org/viewvc?rev=670324&view=rev
Log:
2.7.0-svn-48
Fixed [JSPWIKI-141] EditGroupContebt.jsp.
Update of favicon.ico
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/etc/i18n/templates/default.properties
incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/webdocs/images/favicon.ico
incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=670324&r1=670323&r2=670324&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Jun 22 02:08:57 2008
@@ -1,3 +1,11 @@
+2008-06-22 Dirk Frederickx <[EMAIL PROTECTED]>
+
+ * 2.7.0-svn-49
+
+ * [JSPWIKI-141] I18 properties also fixed in EditGroupContent.jsp
+
+ * Included latest favicon.ico of Florian and Harry
+
2008-06-19 Janne Jalkanen <[EMAIL PROTECTED]>
* 2.7.0-svn-48
@@ -12,7 +20,7 @@
* [JSPWIKI-231]: Updated de, zh_CN and nl. Thanks to Florian
Holeczek, Harry Metske and David Gao!
-2007-06-19 Dirk Frederickx <[EMAIL PROTECTED]>
+2008-06-19 Dirk Frederickx <[EMAIL PROTECTED]>
* No version bump
@@ -25,7 +33,7 @@
* Added support for the Universal Edit Button -
universaleditbutton.org. About 3 mins before launch, even...
-2007-06-17 Dirk Frederickx <[EMAIL PROTECTED]>
+2008-06-17 Dirk Frederickx <[EMAIL PROTECTED]>
* 2.7.0-svn-46
@@ -48,7 +56,7 @@
* JSPWIKI-231: Updated Dutch and German translations.
-2007-06-15 Dirk Frederickx <[EMAIL PROTECTED]>
+2008-06-15 Dirk Frederickx <[EMAIL PROTECTED]>
* 2.7.0-svn-44
@@ -99,7 +107,7 @@
* JSPWIKI-292: Comment.jsp didn't compile. Oops! Thanks to Harry
Metske
for the patch.
-2007-06-14 Dirk Frederickx <[EMAIL PROTECTED]>
+2008-06-14 Dirk Frederickx <[EMAIL PROTECTED]>
* 2.7.0-svn-41 Many template fixes, added ajaxed edit preview,
improved IE6/IE7 compat.
@@ -255,7 +263,7 @@
* Some JSPWikiMarkupParser speed optimizations by changing all
StringBuffers to StringBuilders.
-2007-06-07 Dirk Frederickx <[EMAIL PROTECTED]>
+2008-06-07 Dirk Frederickx <[EMAIL PROTECTED]>
* 2.7.0-svn-33
@@ -344,7 +352,7 @@
* [JSPWIKI-151]: If sending a password succeeds, it is no longer
reported
as an error.
-2007-05-18 Dirk Frederickx <[EMAIL PROTECTED]>
+2008-05-18 Dirk Frederickx <[EMAIL PROTECTED]>
* 2.7.0-svn-25
@@ -511,7 +519,7 @@
implement Serializable. It could be used to improve startup
time even further, but it will be useful for the future.
-2007-04-10 Dirk Frederickx <[EMAIL PROTECTED]>
+2008-04-10 Dirk Frederickx <[EMAIL PROTECTED]>
* 2.7.0-svn-10 - Javascript fixes for IE
@@ -520,7 +528,7 @@
* Bugfixes for hide/show Favorites menu on mouse-click/hover.
-2007-04-09 Dirk Frederickx <[EMAIL PROTECTED]>
+2008-04-09 Dirk Frederickx <[EMAIL PROTECTED]>
* 2.7.0-svn-9
@@ -555,24 +563,24 @@
* [JSPWIKI-56] Replaced MultiPartLibrary with Apache Commons
FileUpload library, as MultiPartLibrary was LGPL.
-2007-04-05 Dirk Frederickx <[EMAIL PROTECTED]>
+2008-04-05 Dirk Frederickx <[EMAIL PROTECTED]>
* 2.7.0-svn-6
* [JSPWIKI-233] Bugfix PreferencesTab.jsp
-2007-04-05 Dirk Frederickx <[EMAIL PROTECTED]>
+2008-04-05 Dirk Frederickx <[EMAIL PROTECTED]>
* 2.7.0-svn-5
* [JSPWIKI-230] Make TimeZone configuration more user-friendly.
Adjusted all jsp time-formatting
to take timezone setting into account.
-2007-04-05 Dirk Frederickx <[EMAIL PROTECTED]>
+2008-04-05 Dirk Frederickx <[EMAIL PROTECTED]>
* Commit related JIRA id's
-2007-04-05 Dirk Frederickx <[EMAIL PROTECTED]>
+2008-04-05 Dirk Frederickx <[EMAIL PROTECTED]>
* 2.7.0-svn-4
@@ -767,7 +775,7 @@
* [JSPWIKI-161]. Added TranslationCheck from Florian Holeczek.
Removed
the MissingTranslations tool, as TranslationCheck does all it did.
-2007-3-01 Dirk Frederickx <[EMAIL PROTECTED]>
+2008-3-01 Dirk Frederickx <[EMAIL PROTECTED]>
* Minor stylesheet updates (no version bump)
Modified: incubator/jspwiki/trunk/etc/i18n/templates/default.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/templates/default.properties?rev=670324&r1=670323&r2=670324&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default.properties Sun Jun 22
02:08:57 2008
@@ -135,9 +135,10 @@
# GroupContent.jsp
group.tab=View Group
-group.areyousure=Are you sure you want to permanently delete group
"{0}"? \
- Users might not be able to access pages whose ACLS contain this group.
\\n\\n \
- If you click OK, the group will be removed immediately.
+#replaced by grp.deletegroup.confirm
+#group.areyousure=Are you sure you want to permanently delete group
"{0}"? \
+# Users might not be able to access pages whose ACLS contain this group.
\\n\\n \
+# If you click OK, the group will be removed immediately.
group.doesnotexist=This group does not exist.
group.createsuggestion=Why don’t you go and {0}
group.createit=create it?
@@ -564,7 +565,8 @@
#editor.plain.editassist=Edit Assist
#editor.plain.editassist.title=Toggle Edit Assist buttons
editor.plain.sneakpreview=Sneak Preview
-editor.plain.sneakpreview.title=Click outside the textarea to get a preview of
the rendered page
+editor.plain.sneakpreview.title=Sneak Preview. \
+ Click outside the textarea to refresh the sneak preview area.
editor.plain.tbLink.title=link - Insert wiki link
editor.plain.tbH1.title=h1 - Insert heading1
editor.plain.tbH2.title=h2 - Insert heading2
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=670324&r1=670323&r2=670324&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default_nl.properties Sun Jun 22
02:08:57 2008
@@ -135,8 +135,8 @@
# GroupContent.jsp
group.tab=Toon Groep
-group.areyousure=Weet U zeker dat U de groep "{0}" definitief wilt
verwijderen ? \
- Gebruikers zouden pagina's met ACLs die naar deze groep wijzen niet meer
kunnen raadplegen \\n\\n
+#group.areyousure=Weet U zeker dat U de groep "{0}" definitief wilt
verwijderen ? \
+# Gebruikers zouden pagina's met ACLs die naar deze groep wijzen niet meer
kunnen raadplegen \\n\\n
group.doesnotexist=Deze groep bestaat niet.
group.createsuggestion=Klik hier om deze nieuwe groep {0}
group.createit=aan te maken
@@ -557,7 +557,8 @@
#editor.plain.editassist=Assistentie knoppen
#editor.plain.editassist.title=Toon/verberg assistentie knoppen
editor.plain.sneakpreview=Sneak Preview
-editor.plain.sneakpreview.title=Klik buiten het tekstveld om een preview te
krijgen van de pagina
+editor.plain.sneakpreview.title=Sneak Preview\
+ Klik buiten het tekstveld om een nieuwe preview te krijgen van de pagina
editor.plain.tbLink.title=link - Voeg wiki link in
editor.plain.tbH1.title=h1 - Voeg paragraaf niveau 1 in
editor.plain.tbH2.title=h2 - Voeg paragraaf niveau 2 in
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=670324&r1=670323&r2=670324&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sun Jun 22
02:08:57 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "48";
+ public static final String BUILD = "49";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/webdocs/images/favicon.ico
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/images/favicon.ico?rev=670324&r1=670323&r2=670324&view=diff
==============================================================================
Binary files - no diff available.
Modified:
incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp?rev=670324&r1=670323&r2=670324&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
(original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
Sun Jun 22 02:08:57 2008
@@ -92,7 +92,8 @@
<form action="<wiki:Link format='url' jsp='DeleteGroup.jsp'/>"
class="wikiform"
id="deleteGroup"
- onsubmit="return( confirm('<fmt:message
key="group.areyousure"><fmt:param>${param.group}</fmt:param></fmt:message>') &&
Wiki.submitOnce(this) );"
+ onsubmit="return( confirm('<fmt:message
key="grp.deletegroup.confirm"/>')
+ && Wiki.submitOnce(this) );"
method="POST" accept-charset="UTF-8">
<input type="submit" name="ok" value="<fmt:message
key="actions.deletegroup"/>" />
<input type="hidden" name="group" value="${param.group}" />
