You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/08/09 15:06:20 UTC
svn commit: r1616941 - in /roller/trunk/app/src/main:
java/org/apache/roller/weblogger/ui/struts2/util/ resources/
Author: gmazza
Date: Sat Aug 9 13:06:19 2014
New Revision: 1616941
URL: http://svn.apache.org/r1616941
Log:
Reduced comment days options to 3,7,14,30,60,90 & unlimited.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java?rev=1616941&r1=1616940&r2=1616941&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java Sat Aug 9 13:06:19 2014
@@ -377,19 +377,14 @@ public abstract class UIAction extends A
return getMinutesList();
}
- public List getCommentDaysList() {
+ public List<KeyValueObject> getCommentDaysList() {
- List opts = new ArrayList();
+ List<KeyValueObject> opts = new ArrayList<KeyValueObject>();
opts.add(new KeyValueObject(0, getText("weblogEdit.unlimitedCommentDays")));
- opts.add(new KeyValueObject(1, getText("weblogEdit.days1")));
- opts.add(new KeyValueObject(2, getText("weblogEdit.days2")));
opts.add(new KeyValueObject(3, getText("weblogEdit.days3")));
- opts.add(new KeyValueObject(4, getText("weblogEdit.days4")));
- opts.add(new KeyValueObject(5, getText("weblogEdit.days5")));
opts.add(new KeyValueObject(7, getText("weblogEdit.days7")));
- opts.add(new KeyValueObject(10, getText("weblogEdit.days10")));
- opts.add(new KeyValueObject(20, getText("weblogEdit.days20")));
+ opts.add(new KeyValueObject(14, getText("weblogEdit.days14")));
opts.add(new KeyValueObject(30, getText("weblogEdit.days30")));
opts.add(new KeyValueObject(60, getText("weblogEdit.days60")));
opts.add(new KeyValueObject(90, getText("weblogEdit.days90")));
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1616941&r1=1616940&r2=1616941&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Sat Aug 9 13:06:19 2014
@@ -778,10 +778,8 @@ mediaFileSuccess.mediaFileView=Return to
# -- Media File Edit
mediaFileEdit.subtitle=Editing media file <span>{0}</span>
-mediaFileEdit.pagetip=You may edit the informaton stored about this media \
-file. Each file must have a name, but all other fields are optional. \
-Or you can use the links at the bottom of the page to create a new weblog \
-entry that includes this file.
+mediaFileEdit.pagetip=You may edit the information stored about this media \
+file. Each file must have a name, but all other fields are optional.
mediaFileEdit.tags=Tags (space separated)
mediaFileEdit.copyright=Copyright statement
mediaFileEdit.directory=Folder
@@ -1506,14 +1504,9 @@ weblogEdit.updateTime=Last updated
weblogEdit.allowComments=Allow comments
weblogEdit.commentDays=for
weblogEdit.unlimitedCommentDays=unlimited days
-weblogEdit.days1=1 day
-weblogEdit.days2=2 days
weblogEdit.days3=3 days
-weblogEdit.days4=4 days
-weblogEdit.days5=5 days
weblogEdit.days7=7 days
-weblogEdit.days10=10 days
-weblogEdit.days20=20 days
+weblogEdit.days14=14 days
weblogEdit.days30=30 days
weblogEdit.days60=60 days
weblogEdit.days90=90 days
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=1616941&r1=1616940&r2=1616941&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Sat Aug 9 13:06:19 2014
@@ -748,17 +748,12 @@ weblogEdit.commentDays=f\u00FCr
weblogEdit.comments=Kommentare
weblogEdit.content=Inhalt
# ------------------------------------------------------------- Theme
-weblogEdit.days1=1 Tag
-weblogEdit.days10=10 Tage
-weblogEdit.days2=2 Tage
-weblogEdit.days20=20 Tage
+weblogEdit.unlimitedCommentDays=unbestimmte Anzahl Tage
weblogEdit.days3=3 Tage
+weblogEdit.days7=7 Tage
+weblogEdit.days14=14 Tage
weblogEdit.days30=30 Tage
-weblogEdit.days4=4 Tage
-# ------------------------------------------------------------- Uploads
-weblogEdit.days5=5 Tage
weblogEdit.days60=60 Tage
-weblogEdit.days7=7 Tage
weblogEdit.days90=90 Tage
weblogEdit.deleteEntry=Eintrag l\u00F6schen
weblogEdit.draft=Entwurf
@@ -814,7 +809,6 @@ weblogEdit.trackbackFailure=Trackback fe
weblogEdit.trackbackSuccess=Trackbacks erfolgt
weblogEdit.trackbackUrl=Trackback URL
# ------------------------------------------------------------- Weblog edit
-weblogEdit.unlimitedCommentDays=unbestimmte Anzahl Tage
weblogEdit.unsaved=Nicht gesichert
weblogEdit.updateTime=Letzter Update
weblogEntriesPager.day.dateFormat=d. MMMM yyyy
Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1616941&r1=1616940&r2=1616941&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Sat Aug 9 13:06:19 2014
@@ -482,14 +482,9 @@ weblogEdit.updateTime=\u00DAltima actual
weblogEdit.allowComments=Permitir comentarios
weblogEdit.commentDays=durante
weblogEdit.unlimitedCommentDays=d\u00EDas ilimitados
-weblogEdit.days1=1 d\u00EDa
-weblogEdit.days2=2 d\u00EDas
weblogEdit.days3=3 d\u00EDas
-weblogEdit.days4=4 d\u00EDas
-weblogEdit.days5=5 d\u00EDas
weblogEdit.days7=7 d\u00EDas
-weblogEdit.days10=10 d\u00EDas
-weblogEdit.days20=20 d\u00EDas
+weblogEdit.days14=14 d\u00EDas
weblogEdit.days30=30 d\u00EDas
weblogEdit.days60=60 d\u00EDas
weblogEdit.days90=90 d\u00EDas
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=1616941&r1=1616940&r2=1616941&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_fr.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_fr.properties Sat Aug 9 13:06:19 2014
@@ -972,14 +972,9 @@ weblogEdit.updateTime=dernière mise �
weblogEdit.allowComments=Autoriser les commentaires
weblogEdit.commentDays=pour
weblogEdit.unlimitedCommentDays=Temps illimité
-weblogEdit.days1=1 journée
-weblogEdit.days2=2 jours
weblogEdit.days3=3 jours
-weblogEdit.days4=4 jours
-weblogEdit.days5=5 jours
weblogEdit.days7=7 jours
-weblogEdit.days10=10 jours
-weblogEdit.days20=20 jours
+weblogEdit.days14=14 jours
weblogEdit.days30=30 jours
weblogEdit.days60=60 jours
weblogEdit.days90=90 jours
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties?rev=1616941&r1=1616940&r2=1616941&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties Sat Aug 9 13:06:19 2014
@@ -740,14 +740,9 @@ weblogEdit.updateTime=\u6700\u7D42\u66F4
weblogEdit.allowComments=\u30B3\u30E1\u30F3\u30C8\u3092\u8A31\u53EF\u3059\u308B
weblogEdit.commentDays=\u65E5\u6570
weblogEdit.unlimitedCommentDays=\u7121\u671F\u9650
-weblogEdit.days1=1\u65E5
-weblogEdit.days2=2\u65E5
weblogEdit.days3=3\u65E5
-weblogEdit.days4=4\u65E5
-weblogEdit.days5=5\u65E5
weblogEdit.days7=7\u65E5
-weblogEdit.days10=10\u65E5
-weblogEdit.days20=20\u65E5
+weblogEdit.days14=14\u65E5
weblogEdit.days30=30\u65E5
weblogEdit.days60=60\u65E5
weblogEdit.days90=90\u65E5
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=1616941&r1=1616940&r2=1616941&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ko.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ko.properties Sat Aug 9 13:06:19 2014
@@ -1081,14 +1081,9 @@ weblogEdit.updateTime=\ub9c8\uc9c0\ub9c9
weblogEdit.allowComments=\uc758\uacac \ud5c8\uc6a9
weblogEdit.commentDays=\uc81c\ud55c \uc77c\uc218:
weblogEdit.unlimitedCommentDays=\ubb34\uc81c\ud55c
-weblogEdit.days1=1\uc77c
-weblogEdit.days2=2\uc77c
weblogEdit.days3=3\uc77c
-weblogEdit.days4=4\uc77c
-weblogEdit.days5=5\uc77c
weblogEdit.days7=7\uc77c
-weblogEdit.days10=10\uc77c
-weblogEdit.days20=20\uc77c
+weblogEdit.days14=14\uc77c
weblogEdit.days30=30\uc77c
weblogEdit.days60=60\uc77c
weblogEdit.days90=90\uc77c
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1616941&r1=1616940&r2=1616941&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Sat Aug 9 13:06:19 2014
@@ -703,14 +703,9 @@ weblogEdit.updateTime = \u041f\u043e\u04
weblogEdit.allowComments = \u0412\u0441\u0435 \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0438
weblogEdit.commentDays = \u0434\u043b\u044f
weblogEdit.unlimitedCommentDays = \u043d\u0435\u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u044b\u0435 \u0434\u043d\u0435\u0439
-weblogEdit.days1=1 \u0434\u0435\u043d\u044c
-weblogEdit.days2=2 \u0434\u043d\u044f
weblogEdit.days3=3 \u0434\u043d\u044f
-weblogEdit.days4=4 \u0434\u043d\u044f
-weblogEdit.days5=5 \u0434\u043d\u0435\u0439
weblogEdit.days7=7 \u0434\u043d\u0435\u0439
-weblogEdit.days10=10 \u0434\u043d\u0435\u0439
-weblogEdit.days20=20 \u0434\u043d\u0435\u0439
+weblogEdit.days14=14 \u0434\u043d\u0435\u0439
weblogEdit.days30=30 \u0434\u043d\u0435\u0439
weblogEdit.days60=60 \u0434\u043d\u0435\u0439
weblogEdit.days90=90 \u0434\u043d\u0435\u0439
Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1616941&r1=1616940&r2=1616941&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties Sat Aug 9 13:06:19 2014
@@ -468,16 +468,11 @@ weblogEdit.comment=\u7559\u8a00
weblogEdit.commentDays=\u5728
weblogEdit.comments=\u8bc4\u8bba
weblogEdit.content=\u5185\u5bb9
-weblogEdit.days1=1 \u5929
-weblogEdit.days10=10 \u5929
-weblogEdit.days2=2 \u5929
-weblogEdit.days20=20 \u5929
weblogEdit.days3=3 \u5929
+weblogEdit.days7=7\u5929
+weblogEdit.days14=14 \u5929
weblogEdit.days30=30 \u5929
-weblogEdit.days4=4 \u5929
-weblogEdit.days5=5 \u5929
weblogEdit.days60=60 \u5929
-weblogEdit.days7=7\u5929
weblogEdit.days90=90 \u5929
weblogEdit.deleteEntry=\u5220\u9664\u65e5\u5fd7
weblogEdit.draft=\u8349\u7a3f