You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2008/11/04 21:25:45 UTC
svn commit: r711382 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH:
ChangeLog etc/i18n/CoreResources_de.properties
etc/i18n/plugin/PluginResources_de.properties
src/com/ecyrd/jspwiki/Release.java
src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java
Author: metskem
Date: Tue Nov 4 12:25:45 2008
New Revision: 711382
URL: http://svn.apache.org/viewvc?rev=711382&view=rev
Log:
2.8.1-svn-8 JSPWIKI-407: de translation and timestam patch for ListlocksPlugin (thanks to Florian)
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/i18n/CoreResources_de.properties
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/i18n/plugin/PluginResources_de.properties
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=711382&r1=711381&r2=711382&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Tue Nov 4 12:25:45 2008
@@ -1,3 +1,10 @@
+2008-11-03 Harry Metske <me...@apache.org>
+
+ * 2.8.1-svn-8
+
+ * JSPWIKI-407: de translation by Florian, including the two timestamps in
+ ListLocksPlugin, found by Florian again.
+
2008-11-04 Janne Jalkanen <ja...@apache.org>
* 2.8.1-svn-7
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/i18n/CoreResources_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/i18n/CoreResources_de.properties?rev=711382&r1=711381&r2=711382&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/i18n/CoreResources_de.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/i18n/CoreResources_de.properties Tue Nov 4 12:25:45 2008
@@ -205,6 +205,17 @@
# RSSImageLinkTag
rss.title=RSS-Feed für die Seite {0}
+# AttachmentManager
+attach.unwanted.file=Unerlaubter Dateiname.
+attach.empty.file=Kein Dateiname vorhanden.
+attach.parent.not.exist=Die übergeordnete Seite existiert nicht.
+
+# VariableManager
+varmgr.not.logged.in=nicht angemeldet
+varmgr.authenticated=authentifiziert
+varmgr.asserted=angenommene Identität
+varmgr.anonymous=anonym
+
# Outdated or superfluous properties
# folgende Properties sind in der aktuellen 'default en' Datei nicht enthalten
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/i18n/plugin/PluginResources_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/i18n/plugin/PluginResources_de.properties?rev=711382&r1=711381&r2=711382&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/i18n/plugin/PluginResources_de.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/etc/i18n/plugin/PluginResources_de.properties Tue Nov 4 12:25:45 2008
@@ -66,3 +66,10 @@
formselect.namemissing=Das Element 'select' erwartet den Parameter 'name'.
formtextarea.noneedtoshow=(form textarea muss momentan nicht angezeigt werden)
formtextarea.namemissing=Das Element 'textarea' erwartet den Parameter 'name'.
+
+# ListLocks plugin
+plugin.listlocks.page=Seite
+plugin.listlocks.locked.by=gesperrt für
+plugin.listlocks.acquired=gesperrt ab
+plugin.listlocks.expires=gesperrt bis
+plugin.listlocks.no.locks.exist=Momentan existieren keine Sperren.
\ No newline at end of file
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=711382&r1=711381&r2=711382&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java Tue Nov 4 12:25:45 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "7";
+ public static final String BUILD = "8";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java?rev=711382&r1=711381&r2=711382&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/plugin/ListLocksPlugin.java Tue Nov 4 12:25:45 2008
@@ -21,6 +21,8 @@
package com.ecyrd.jspwiki.plugin;
import com.ecyrd.jspwiki.*;
+import com.ecyrd.jspwiki.preferences.Preferences;
+
import java.util.*;
/**
@@ -68,8 +70,11 @@
result.append( rowNum % 2 != 0 ? "<tr class=\"odd\">" : "<tr>" );
result.append("<td>"+lock.getPage()+"</td>");
result.append("<td>"+lock.getLocker()+"</td>");
- result.append("<td>"+lock.getAcquisitionTime()+"</td>");
- result.append("<td>"+lock.getExpiryTime()+"</td>");
+ result.append( "<td>"
+ + Preferences.renderDate( context, lock.getAcquisitionTime(), Preferences.TimeFormat.DATETIME )
+ + "</td>" );
+ result.append( "<td>" + Preferences.renderDate( context, lock.getExpiryTime(), Preferences.TimeFormat.DATETIME )
+ + "</td>" );
result.append("</tr>\n");
rowNum++;
}