[richfaces-svn-commits] JBoss Rich Faces SVN: r4871 - trunk/ui/calendar/src/main/java/org/richfaces/renderkit.

[richfaces-svn-commits at lists.jboss.org]

Author: akushunin
Date: 2007-12-17 10:43:36 -0500 (Mon, 17 Dec 2007)
New Revision: 4871

Modified:
   trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
RF-1461 additional commit

Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java	2007-12-17 15:18:47 UTC (rev 4870)
+++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java	2007-12-17 15:43:36 UTC (rev 4871)
@@ -31,6 +31,7 @@
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
+import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import java.util.Set;
 
@@ -522,17 +523,40 @@
 		ResponseWriter writer = context.getResponseWriter();
 		writer.writeText("\n labels:{", null);
 	
-		if (null != bundle && messageBundle.contains("rich_calendar_labels")) {
-
-			String applyLabel = bundle.getString("applyLabel");
-			writer.writeText("apply:'"+applyLabel + "', ", null);
-			String todayLabel = bundle.getString("todayLabel");
-			writer.writeText("today:'"+todayLabel + "', ", null);
-			String cleanLabel = bundle.getString("cleanLabel");
-			writer.writeText("clean:'"+cleanLabel + "', ", null);
-			String closeLabel = bundle.getString("closeLabel");
-			writer.writeText("close:'"+closeLabel+"', ", null);
+		if (null != bundle && messageBundle.contains("calendar")) {
 			
+			try {
+				String applyLabel = bundle.getString("applyLabel");
+				writer.writeText("apply:'"+applyLabel + "', ", null);
+			} catch (MissingResourceException e) {
+				// Current key wasn't found in bundle use default
+				writer.writeText("apply:'Apply', ", null);
+			}
+			
+			try {
+				String todayLabel = bundle.getString("todayLabel");
+				writer.writeText("today:'"+todayLabel + "', ", null);
+			} catch (MissingResourceException e) {
+				// Current key wasn't found in bundle use default
+				writer.writeText("today:'Today', ", null);
+			}
+			
+			try {
+				String cleanLabel = bundle.getString("cleanLabel");
+				writer.writeText("clean:'"+cleanLabel + "', ", null);
+			} catch (MissingResourceException e) {
+				// Current key wasn't found in bundle use default
+				writer.writeText("clean:'Clean', ", null);
+			}
+			
+			try {
+				String closeLabel = bundle.getString("closeLabel");
+				writer.writeText("close:'"+closeLabel+"', ", null);
+			} catch (MissingResourceException e) {
+				// Current key wasn't found in bundle use default
+				writer.writeText("close:'Close', ", null);
+			}			
+			
 		}else{
 			writer.writeText("apply:'Apply', today:'Today', clean:'Clean', close:'X'", null);
 		}