From: Anjo K. <an...@us...> - 2004-11-29 12:57:42
|
Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2765/Common/Frameworks/ERExtensions/Sources/er/extensions Modified Files: ERXTimestampFormatter.java ERXLocalizer.java ERXEditDateJavascript.java Log Message: Can now set integlligent localized date formats (en:%m/%d/%Y)->(de:%d.%m.%Y) Index: ERXTimestampFormatter.java =================================================================== RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXTimestampFormatter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ERXTimestampFormatter.java 26 Mar 2004 14:43:51 -0000 1.4 --- ERXTimestampFormatter.java 29 Nov 2004 12:57:22 -0000 1.5 *************** *** 15,19 **** --- 15,23 ---- /** holds a reference to the repository */ private static Hashtable _repository = new Hashtable(); + protected static final String DefaultKey = "ERXTimestampFormatter.DefaultKey"; + + /** The default pattern used in the UI */ + public static String DEFAULT_PATTERN = "%m/%d/%Y"; static { *************** *** 23,26 **** --- 27,32 ---- /** + * The default pattern used by WOString and friends when no pattern is set. + * Looks like this only for compatibility's sake. * @param object * @return Index: ERXLocalizer.java =================================================================== RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXLocalizer.java,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** ERXLocalizer.java 16 Nov 2004 17:03:43 -0000 1.52 --- ERXLocalizer.java 29 Nov 2004 12:57:30 -0000 1.53 *************** *** 579,584 **** public Format localizedDateFormatForKey(String formatString) { ! formatString = formatString == null ? "%Y/%m/%d" : formatString; ! Format result = (Format)_dateFormatters.get(formatString); if(result == null) { // HACK ak --- 579,589 ---- public Format localizedDateFormatForKey(String formatString) { ! String localizedFormatString = localizedStringForKey(formatString); ! formatString = formatString == null ! ? ERXTimestampFormatter.DEFAULT_PATTERN ! : localizedFormatString == null ! ? formatString ! : localizedFormatString; ! Format result = (Format)_dateFormatters.get(formatString); if(result == null) { // HACK ak *************** *** 588,592 **** Locale old = Locale.getDefault(); Locale.setDefault(locale()); ! NSTimestampFormatter formatter = new NSTimestampFormatter(formatString); result = formatter; _dateFormatters.put(formatString, result); --- 593,597 ---- Locale old = Locale.getDefault(); Locale.setDefault(locale()); ! NSTimestampFormatter formatter = new NSTimestampFormatter(localizedFormatString); result = formatter; _dateFormatters.put(formatString, result); Index: ERXEditDateJavascript.java =================================================================== RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/ERXEditDateJavascript.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ERXEditDateJavascript.java 29 Mar 2004 09:57:09 -0000 1.7 --- ERXEditDateJavascript.java 29 Nov 2004 12:57:30 -0000 1.8 *************** *** 15,19 **** protected int i = 0; public String dateString; ! public String dateformat = "%m/%d/%Y"; public ERXEditDateJavascript(WOContext context) { --- 15,19 ---- protected int i = 0; public String dateString; ! public String dateformat = ERXTimestampFormatter.DEFAULT_PATTERN; public ERXEditDateJavascript(WOContext context) { |