[Wonder-cvs] CVS: ProjectWonder/Frameworks/ERExtensionsJava ERXLocalizer.java,1.7,1.8 ERXValidation.java,1.6,1.7

[Anjo K. <an...@us...>]

Update of /cvsroot/wonder/ProjectWonder/Frameworks/ERExtensionsJava
In directory usw-pr-cvs1:/tmp/cvs-serv6380/ProjectWonder/Frameworks/ERExtensionsJava

Modified Files:
	ERXLocalizer.java ERXValidation.java 
Log Message:
More Localization


Index: ERXLocalizer.java
===================================================================
RCS file: /cvsroot/wonder/ProjectWonder/Frameworks/ERExtensionsJava/ERXLocalizer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ERXLocalizer.java	16 Apr 2002 19:47:51 -0000	1.7
--- ERXLocalizer.java	16 Apr 2002 22:06:27 -0000	1.8
***************
*** 188,191 ****
--- 188,195 ----
      }
  
+     public static ERXLocalizer localizerForSession(Object session) {
+         return ((ERXSession)session).localizer();
+     }
+     
      public String localizedStringForKeyWithDefault(String key) {
          String result = localizedStringForKey(key);

Index: ERXValidation.java
===================================================================
RCS file: /cvsroot/wonder/ProjectWonder/Frameworks/ERExtensionsJava/ERXValidation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ERXValidation.java	16 Apr 2002 19:47:51 -0000	1.6
--- ERXValidation.java	16 Apr 2002 22:06:27 -0000	1.7
***************
*** 38,42 ****
                                                       String keyPath,
                                                       NSMutableDictionary errorMessages,
!                                                      String displayPropertyKeyPath) {
          validationFailedWithException(e,value,keyPath,errorMessages,displayPropertyKeyPath,null);
      }
--- 38,44 ----
                                                       String keyPath,
                                                       NSMutableDictionary errorMessages,
!                                                      String displayPropertyKeyPath,
!                                                      ERXLocalizer localizer
!                                                      ) {
          validationFailedWithException(e,value,keyPath,errorMessages,displayPropertyKeyPath,null);
      }
***************
*** 47,52 ****
                                                       NSMutableDictionary errorMessages,
                                                       String displayPropertyKeyPath,
!                                                      EOEntity entity) {
!         validationFailedWithException(e,value,keyPath,errorMessages, displayPropertyKeyPath, entity, pushChangesDefault);
      }
  
--- 49,56 ----
                                                       NSMutableDictionary errorMessages,
                                                       String displayPropertyKeyPath,
!                                                      EOEntity entity,
!                                                      ERXLocalizer localizer
!                                                      ) {
!         validationFailedWithException(e,value,keyPath,errorMessages, displayPropertyKeyPath, entity, localizer, pushChangesDefault);
      }
  
***************
*** 57,61 ****
                                                       String displayPropertyKeyPath,
                                                       EOEntity entity,
!                                                      boolean pushChanges) {
          if (cat.isDebugEnabled())
              cat.debug("ValidationFailedWithException: " + e.getClass().getName() + " message: " + e.getMessage());
--- 61,67 ----
                                                       String displayPropertyKeyPath,
                                                       EOEntity entity,
!                                                      ERXLocalizer localizer,
!                                                      boolean pushChanges
!                                                      ) {
          if (cat.isDebugEnabled())
              cat.debug("ValidationFailedWithException: " + e.getClass().getName() + " message: " + e.getMessage());
***************
*** 100,107 ****
              propertyNameContext.setPropertyKey(key);
              //FIXME: (ak) this is just until I can rethink the whole message processing
!             ERXLocalizer l = ERXLocalizer.localizerForLanguage(((ERXValidationException)e).targetLanguage());
!             NSMutableDictionary fakeSession = new NSMutableDictionary(l, "localizer");
              propertyNameContext.takeValueForKey( fakeSession, "session");
!             errorMessages.setObjectForKey(newErrorMessage, propertyNameContext.displayNameForProperty());
          } else {
              errorMessages.setObjectForKey(newErrorMessage, key);
--- 106,113 ----
              propertyNameContext.setPropertyKey(key);
              //FIXME: (ak) this is just until I can rethink the whole message processing
!             NSMutableDictionary fakeSession = new NSMutableDictionary(localizer, "localizer");
              propertyNameContext.takeValueForKey( fakeSession, "session");
!             if(newErrorMessage != null)
!                 errorMessages.setObjectForKey(newErrorMessage, propertyNameContext.displayNameForProperty());
          } else {
              errorMessages.setObjectForKey(newErrorMessage, key);