Author: gmazza
Date: Thu Jul 10 11:34:19 2014
New Revision: 1609446
URL: http://svn.apache.org/r1609446
Log:
ROL-1630 fix width for main menu to accomodate German; some unused lang
resource tests removed.
Modified:
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css
roller/trunk/app/src/test/java/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1609446&r1=1609445&r2=1609446&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Thu Jul
10 11:34:19 2014
@@ -267,7 +267,6 @@ commentManagement.entryTitled=Regarding
commentManagement.select=Select
commentManagement.readmore=View Entire Comment
-commentManagement.editComment=Edit Comment
commentManagement.saveError=Error saving comment
# -------------------------------------------------------------- CommentServlet
@@ -1823,8 +1822,8 @@ yourWebsites.declined=You have declined
yourWebsites.resigned=You have resigned from weblog [{0}]
yourWebsites.permNotFound=Sorry, that invitation was just revoked.
-yourWebsites.userCount=Members:
-yourWebsites.todaysHits=Today''s hits:
+yourWebsites.userCount=Members
+yourWebsites.todaysHits=Today''s hits
# ---------------------------------------------------------------- Activating
User Account with E-mail
Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1609446&r1=1609445&r2=1609446&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Thu
Jul 10 11:34:19 2014
@@ -871,6 +871,7 @@ weblogEntryQuery.nowShowing={0} Weblogei
weblogEntryQuery.pending=Auf Freigabe wartend
weblogEntryQuery.prev=Vorige Seite
weblogEntryQuery.pubTime=Ver\u00F6ffentlicht
+weblogEntryQuery.scheduled=Geplante
weblogEntryQuery.sidebarDescription=Weblogeintr\u00E4ge nach Kategorie, Datum
und/oder Status filtern.
weblogEntryQuery.sidebarTitle=Filtereintr\u00E4ge
weblogEntryQuery.subtitle=Eintr\u00E4ge in Weblog <span>{0}</span> finden und
bearbeiten
@@ -969,7 +970,7 @@ yourWebsites.resign=Austreten
yourWebsites.resigned=Sie sind aus dem Weblog [{0}] ausgetreten
yourWebsites.theme=Thema
yourWebsites.title=Hauptmen\u00FC
-yourWebsites.todaysHits=Heutige Hits:
-yourWebsites.userCount=Mitglieder:
+yourWebsites.todaysHits=Heutige Hits
+yourWebsites.userCount=Mitglieder
yourWebsites.weblog=Link
yourWebsites.youAreInvited=Sie wurden in den Weblog [{0}] eingeladen -
Modified: roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_fr.properties?rev=1609446&r1=1609445&r2=1609446&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_fr.properties Thu
Jul 10 11:34:19 2014
@@ -1238,8 +1238,8 @@ yourWebsites.declined=Vous avez décli
yourWebsites.resigned=Vous avez démissionné du blog [{0}]
yourWebsites.permNotFound=Désolé, cette invitation vient d'être révoquée.
-yourWebsites.userCount=Membres :
-yourWebsites.todaysHits=Visites aujourd'hui:
+yourWebsites.userCount=Membres
+yourWebsites.todaysHits=Visites aujourd'hui
# ---------------------------------------------------------------- Activating
User Account with E-mail
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ko.properties?rev=1609446&r1=1609445&r2=1609446&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ko.properties Thu
Jul 10 11:34:19 2014
@@ -1354,8 +1354,8 @@ yourWebsites.youAreInvited=\uadc0\ud558\
yourWebsites.declined=\uadc0\ud558\ub294 \uc6f9\ub85c\uadf8, [{0}]\uc5d0
\ub300\ud55c \ucc38\uc5ec\ub97c \uac70\ubd80\ud588\uc2b5\ub2c8\ub2e4.
yourWebsites.resigned=\uadc0\ud558\ub294 \uc6f9\ub85c\uadf8,
[{0}]\ub85c\ubd80\ud130 \ubb3c\ub7ec\ub098\uc168\uc2b5\ub2c8\ub2e4.
yourWebsites.permNotFound=\uc8c4\uc1a1\ud569\ub2c8\ub2e4\ub9cc, \ud574\ub2f9
\ucd08\ub300\uac00 \ucde8\uc18c\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-yourWebsites.userCount=\uba64\ubc84\ub4e4:
-yourWebsites.todaysHits=\uae08\uc77c \ubc29\ubb38 \ud68c\uc218:
+yourWebsites.userCount=\uba64\ubc84\ub4e4
+yourWebsites.todaysHits=\uae08\uc77c \ubc29\ubb38 \ud68c\uc218
# ---------------------------------------------------------------- Activating
User Account with E-mail
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp?rev=1609446&r1=1609445&r2=1609446&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp Thu Jul 10
11:34:19 2014
@@ -70,14 +70,14 @@
<table cellpadding="0" cellspacing="0">
<tr>
- <td class="mm_subtable_label"><s:text
name='yourWebsites.weblog' /></td>
+ <td class="mm_subtable_label"><s:text
name='yourWebsites.weblog'/></td>
<td><a href='<s:property
value="#perms.weblog.absoluteURL" />'>
<s:property value="#perms.weblog.absoluteURL" />
</a></td>
</tr>
<tr>
- <td class="mm_subtable_label"><s:text
name='yourWebsites.permission' /></td>
+ <td class="mm_subtable_label"><s:text
name='yourWebsites.permission'/></td>
<td><s:if test='#perms.hasAction("admin")'
>ADMIN</s:if>
<s:if test='#perms.hasAction("post")'
>AUTHOR</s:if>
<s:if test='#perms.hasAction("edit_draft")'
>LIMITED</s:if></td>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp?rev=1609446&r1=1609445&r2=1609446&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Comments.jsp Thu Jul
10 11:34:19 2014
@@ -170,7 +170,7 @@
<s:text name="commentManagement.columnSpam" />
</th>
<th class="rollertable" width="5%" >
- <s:text name="generic.columnDelete" />
+ <s:text name="generic.delete" />
</th>
<th class="rollertable">
<s:text name="commentManagement.columnComment" />
@@ -307,7 +307,7 @@
</div>
<div class="details">
<a id="editlink-<s:property
value="#comment.id"/>" onclick='editComment("<s:property
value="#comment.id"/>")'>
- <s:text
name="commentManagement.editComment" />
+ <s:text name="generic.edit" />
</a>
</div>
<div class="details">
Modified: roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css?rev=1609446&r1=1609445&r2=1609446&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css (original)
+++ roller/trunk/app/src/main/webapp/roller-ui/styles/roller.css Thu Jul 10
11:34:19 2014
@@ -695,7 +695,7 @@ td.mm_table_actions {
padding-left: 4px;
}
td.mm_subtable_label {
- width: 100px;
+ width: 105px;
vertical-align: top;
font-weight: bold;
}
Modified:
roller/trunk/app/src/test/java/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java?rev=1609446&r1=1609445&r2=1609446&view=diff
==============================================================================
---
roller/trunk/app/src/test/java/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java
(original)
+++
roller/trunk/app/src/test/java/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java
Thu Jul 10 11:34:19 2014
@@ -42,7 +42,7 @@ import junit.framework.TestSuite;
* Note: we need to make sure that new property files are added to this
* test.
*
- * Note: commented out for Roller 5.0 - all translations need update
+ * Note: commented out - all translations need update
*
* @author <a href="mailto:[email protected]";>Jaap van der Molen</a>
* @version $Revision: 1.7 $
@@ -64,13 +64,7 @@ public class ApplicationResourcesTest ex
TestSuite suite = new TestSuite();
// suite.addTest(new
ApplicationResourcesTest("testSystemProperties"));
// suite.addTest(
-// new
ApplicationResourcesTest("testApplicationResources_nl"));
-// suite.addTest(
// new
ApplicationResourcesTest("testApplicationResources_zh_cn"));
-// suite.addTest(
-// new
ApplicationResourcesTest("testApplicationResources_zh_tw"));
-// suite.addTest(
-// new
ApplicationResourcesTest("testApplicationResources_vi"));
return suite;
}
@@ -89,16 +83,6 @@ public class ApplicationResourcesTest ex
}
/**
- * Test Dutch stuff.
- *
- * @throws Exception
- */
- public void _testApplicationResources_nl() throws Exception
- {
- verifyResourceBundle("ApplicationResources_nl");
- }
-
- /**
* Test Simple Chinese stuff.
*
* @throws Exception
@@ -108,26 +92,6 @@ public class ApplicationResourcesTest ex
verifyResourceBundle("ApplicationResources_zh_cn");
}
- /**
- * Test Traditional Chinese stuff.
- *
- * @throws Exception
- */
- public void _testApplicationResources_zh_tw() throws Exception
- {
- verifyResourceBundle("ApplicationResources_zh_tw");
- }
-
- /**
- * Test Vietnamese stuff.
- *
- * @throws Exception
- */
- public void _testApplicationResources_vi() throws Exception
- {
- verifyResourceBundle("ApplicationResources_vi");
- }
-
public void testSystemProperties()
{
Properties sysProps = System.getProperties();
@@ -161,7 +125,7 @@ public class ApplicationResourcesTest ex
boolean missingMessage = false;
// check Chinese
- System.out.println("Veriyfing " + bundle + "...");
+ System.out.println("Verifying " + bundle + "...");
for (Object key : baseProps.keySet()) {
if (props.getProperty((String) key) == null)
{
