Author: bleny Date: 2011-02-21 10:16:27 +0000 (Mon, 21 Feb 2011) New Revision: 1034 Log: add trace to show where i18n bug is from Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2011-02-18 17:14:56 UTC (rev 1033) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2011-02-21 10:16:27 UTC (rev 1034) @@ -495,6 +495,23 @@ protected Locale initialValue() { return Locale.FRENCH; } + + @Override + public Locale get() { + Locale locale = super.get(); + if (log.isTraceEnabled()) { + log.trace("thread " + Thread.currentThread().getName() + " get locale " + locale); + } + return locale; + } + + @Override + public void set(Locale locale) { + if (log.isTraceEnabled()) { + log.trace("thread " + Thread.currentThread().getName() + " set locale to " + locale); + } + super.set(locale); + } }; @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-02-18 17:14:56 UTC (rev 1033) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2011-02-21 10:16:27 UTC (rev 1034) @@ -132,7 +132,7 @@ public static final String dateTimePattern = "dd/MM/yyyy HH:mm"; public static final String timePattern = "HH:mm"; - public static String formatMonthTime(Date date) { + public static String formatMonth(Date date) { return formatDate(date, monthPattern); } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2011-02-18 17:14:56 UTC (rev 1033) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2011-02-21 10:16:27 UTC (rev 1034) @@ -291,10 +291,10 @@ public void changeLocale() { Locale currentLocale = getCurrentLocale(); Locale newLocale; - if (Locale.ENGLISH.equals(currentLocale)) { + if (Locale.FRENCH.equals(currentLocale)) { + newLocale = Locale.ENGLISH; + } else { newLocale = Locale.FRENCH; - } else { - newLocale = Locale.ENGLISH; } localeService.set(newLocale); context.setLocale(newLocale);