Author: metskem
Date: Tue Aug 12 11:03:09 2008
New Revision: 685249
URL: http://svn.apache.org/viewvc?rev=685249&view=rev
Log:
JSPWIKI-300: required changes for the TableOfContents JUnit test
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/etc/i18n/templates/default_de.properties
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=685249&r1=685248&r2=685249&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Aug 12 11:03:09 2008
@@ -1,3 +1,11 @@
+2008-08-12 Harry Metske <[EMAIL PROTECTED]>
+
+ * 2.7.0-alpha-14
+
+ * [JSPWIKI-231] updated de translation, thanks to Florian
+
+ * fix for [JSPWIKI-300] required some extra changes to the JUnit test
for the TableOfContents Plugin
+
2008-08-12 Dirk Frederickx <[EMAIL PROTECTED]>
* 2.7.0-alpha-13
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=685249&r1=685248&r2=685249&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/templates/default_de.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/templates/default_de.properties Tue Aug 12
11:03:09 2008
@@ -374,7 +374,8 @@
prefs.user.orientation=Position der Favoriten
prefs.user.orientation.left=links
prefs.user.orientation.right=rechts
-prefs.user.editorareaheight=Höhe des Editorbereichs
+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]
@@ -640,6 +641,8 @@
javascript.slimbox.close=Schließen ×
javascript.slimbox.close.title=Schließen [Esc]
+javascript.sectionediting.label=Vorhandene Abschnitte
+
javascript.tip.default.title=Weitere...
javascript.prefs.areyousure=Wenn du nicht auf 'Benutzereinstellungen
speichern' klickst, \
@@ -665,4 +668,6 @@
# seit v2.7.0-svn-49
group.areyousure=Soll die Gruppe {0} wirklich dauerhaft gelöscht werden?
Benutzer können dann unter Umständen auf \
Seiten, deren Zugangsberechtigungslisten (ACLs) diese Gruppe enthalten,
nicht mehr zugreifen.\\n\\n \
- Wenn du auf OK klickst, wird diese Gruppe sofort gelöscht!
\ No newline at end of file
+ Wenn du auf OK klickst, wird diese Gruppe sofort gelöscht!
+# seit v2.7.0-alpha-12
+prefs.user.editorareaheight=Höhe des Editorbereichs
\ No newline at end of file
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java?rev=685249&r1=685248&r2=685249&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java
(original)
+++
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/plugin/TableOfContentsTest.java
Tue Aug 12 11:03:09 2008
@@ -56,7 +56,7 @@
// FIXME: The <p> should not be here.
assertEquals( "<p><div class=\"toc\">\n<div class=\"collapsebox\">\n"+
- "<h4>Table of Contents</h4>\n"+
+ "<h4 id=\"section-TOC\">Table of Contents</h4>\n"+
"<ul>\n"+
"<li class=\"toclevel-1\"><a class=\"wikipage\"
href=\"/Wiki.jsp?page=Test#section-Test-HeadingBar\">Heading bar</a></li>\n"+
"</ul>\n</div>\n</div>\n\n</p>"+
@@ -75,7 +75,7 @@
// FIXME: The <p> should not be here.
String expecting = "<p><div class=\"toc\">\n<div
class=\"collapsebox\">\n"+
- "<h4>Table of Contents</h4>\n"+
+ "<h4 id=\"section-TOC\">Table of Contents</h4>\n"+
"<ul>\n"+
"<li class=\"toclevel-1\"><a class=\"wikipage\"
href=\"/Wiki.jsp?page=Test#section-Test-HeadingBar\">3 Heading bar</a></li>\n"+
"<li class=\"toclevel-2\"><a class=\"wikipage\"
href=\"/Wiki.jsp?page=Test#section-Test-Subheading\">3.1 Subheading</a></li>\n"+
@@ -100,7 +100,7 @@
// FIXME: The <p> should not be here.
String expecting = "<p><div class=\"toc\">\n<div
class=\"collapsebox\">\n"+
- "<h4>Table of Contents</h4>\n"+
+ "<h4 id=\"section-TOC\">Table of Contents</h4>\n"+
"<ul>\n"+
"<li class=\"toclevel-1\"><a class=\"wikipage\"
href=\"/Wiki.jsp?page=Test#section-Test-HeadingBar\">3 Heading bar</a></li>\n"+
"<li class=\"toclevel-2\"><a class=\"wikipage\"
href=\"/Wiki.jsp?page=Test#section-Test-Subheading\">3.1 Subheading</a></li>\n"+
@@ -135,7 +135,7 @@
// FIXME: The <p> should not be here.
String expecting = "<p><div class=\"toc\">\n<div
class=\"collapsebox\">\n"+
- "<h4>Table of Contents</h4>\n"+
+ "<h4 id=\"section-TOC\">Table of Contents</h4>\n"+
"<ul>\n"+
"<li class=\"toclevel-2\"><a class=\"wikipage\"
href=\"/Wiki.jsp?page=Test#section-Test-Subheading0\">3.1
Subheading0</a></li>\n"+
"<li class=\"toclevel-1\"><a class=\"wikipage\"
href=\"/Wiki.jsp?page=Test#section-Test-HeadingBar\">4 Heading bar</a></li>\n"+
@@ -172,7 +172,7 @@
// FIXME: The <p> should not be here.
String expecting = "<p><div class=\"toc\">\n<div
class=\"collapsebox\">\n"+
- "<h4>Table of Contents</h4>\n"+
+ "<h4 id=\"section-TOC\">Table of Contents</h4>\n"+
"<ul>\n"+
"<li class=\"toclevel-1\"><a class=\"wikipage\"
href=\"/Wiki.jsp?page=Test#section-Test-HeadingBar\">FooBar-3 Heading
bar</a></li>\n"+
"<li class=\"toclevel-2\"><a class=\"wikipage\"
href=\"/Wiki.jsp?page=Test#section-Test-Subheading\">FooBar-3.1
Subheading</a></li>\n"+
