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

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

Author: akushunin
Date: 2007-12-18 09:34:08 -0500 (Tue, 18 Dec 2007)
New Revision: 4894

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-18 13:01:06 UTC (rev 4893)
+++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java	2007-12-18 14:34:08 UTC (rev 4894)
@@ -536,7 +536,7 @@
 				String applyLabel = bundle.getString("applyLabel");
 				writer.writeText("apply:'"+applyLabel + "', ", null);
 			} catch (MissingResourceException e) {
-				// Current key wasn't found in bundle use default
+				// Current key wasn't found in bundle, use default
 				writer.writeText("apply:'Apply', ", null);
 			}
 			
@@ -544,7 +544,7 @@
 				String todayLabel = bundle.getString("todayLabel");
 				writer.writeText("today:'"+todayLabel + "', ", null);
 			} catch (MissingResourceException e) {
-				// Current key wasn't found in bundle use default
+				// Current key wasn't found in bundle, use default
 				writer.writeText("today:'Today', ", null);
 			}
 			
@@ -552,20 +552,34 @@
 				String cleanLabel = bundle.getString("cleanLabel");
 				writer.writeText("clean:'"+cleanLabel + "', ", null);
 			} catch (MissingResourceException e) {
-				// Current key wasn't found in bundle use default
+				// Current key wasn't found in bundle, use default
 				writer.writeText("clean:'Clean', ", null);
 			}
+			try {
+				String okLabel = bundle.getString("okLabel");
+				writer.writeText("ok:'"+okLabel + "', ", null);
+			} catch (MissingResourceException e) {
+				// Current key wasn't found in bundle, use default
+				writer.writeText("ok:'OK', ", null);
+			}
+			try {
+				String cancelLabel = bundle.getString("cancelLabel");
+				writer.writeText("cancel:'"+cancelLabel + "', ", null);
+			} catch (MissingResourceException e) {
+				// Current key wasn't found in bundle, use default
+				writer.writeText("cancel:'Cancel', ", null);
+			}
 			
 			try {
 				String closeLabel = bundle.getString("closeLabel");
 				writer.writeText("close:'"+closeLabel+"'", null);
 			} catch (MissingResourceException e) {
-				// Current key wasn't found in bundle use default
+				// Current key wasn't found in bundle, use default
 				writer.writeText("close:'X'", null);
 			}			
 			
 		}else{
-			writer.writeText("apply:'Apply', today:'Today', clean:'Clean', close:'X'", null);
+			writer.writeText("apply:'Apply', today:'Today', clean:'Clean', ok:'OK', cancel:'Cancel', close:'X'", null);
 		}
 		writer.writeText("}", null);
 	}