Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory
james.mmbase.org:/tmp/cvs-serv9290/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
Modified Files:
Tag: b1_5
NewsletterUtil.java
Log Message:
CMSC-1180(Modify the jsp's css , make the i18n go better.)
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-1180
Index: NewsletterUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterUtil.java,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -u -b -r1.40.2.1 -r1.40.2.2
--- NewsletterUtil.java 18 Dec 2008 11:28:20 -0000 1.40.2.1
+++ NewsletterUtil.java 9 Jan 2009 03:04:50 -0000 1.40.2.2
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
import java.util.ResourceBundle;
import java.util.Set;
import java.util.SortedSet;
@@ -549,7 +550,7 @@
RelationUtil.createRelation(newsletterNode, scheduleNode, POSREL);
}
- public static List<Schedule> getSchedulesBynewsletterId(int id) {
+ public static List<Schedule> getSchedulesBynewsletterId(int id,Locale
language) {
List<Schedule> schedules = new ArrayList<Schedule>();
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
Node newsletterNode = cloud.getNode(id);
@@ -559,18 +560,25 @@
Schedule schedule = new Schedule();
schedule.setId(scheduleNode.getIntValue(NUMBER));
schedule.setExpression(scheduleNode.getStringValue("expression"));
+ if(null!=language){
+
schedule.setScheduleDescription(getScheduleMessageByExpression(scheduleNode.getStringValue("expression"),language));
+ }else{
schedule.setScheduleDescription(getScheduleMessageByExpression(scheduleNode.getStringValue("expression")));
+ }
schedules.add(schedule);
}
return schedules;
}
- public static String getScheduleMessageByExpression(String expression) {
+ public static String getScheduleMessageByExpression(String
expression,Locale language) {
if (StringUtils.isEmpty(expression)) {
return "";
}
StringBuilder scheduleMessage = null;
ResourceBundle rb = ResourceBundle.getBundle("cmsc-calendar");
+ if(null!=language){
+ rb = ResourceBundle.getBundle("cmsc-calendar",language);
+ }
String[] expressions = expression.split("\\|");
String type;
if (expressions == null || expressions.length == 0) {
@@ -721,9 +729,15 @@
scheduleNode.commit();
}
+ public static String getScheduleMessageByExpression(String stringValue) {
+ return getScheduleMessageByExpression(stringValue,null);
+ }
public static void addNewsletterCreationChannel(int newsletterId ,int
editionId) {
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
RelationManager relManager = cloud.getRelationManager(NEWSLETTER,
NEWSLETTERPUBLICATION, RELATED);
relManager.createRelation(cloud.getNode(newsletterId),
cloud.getNode(editionId)).commit();
}
+ public static void getSchedulesBynewsletterId(Integer valueOf) {
+ getSchedulesBynewsletterId(valueOf,null);
+ }
}
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
