Author: tchemit Date: 2014-04-07 19:07:49 +0200 (Mon, 07 Apr 2014) New Revision: 1857 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1857 Log: add method to translate I18nAble Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-04-07 17:07:12 UTC (rev 1856) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-04-07 17:07:49 UTC (rev 1857) @@ -21,9 +21,11 @@ * #L% */ +import fr.ifremer.wao.entity.I18nAble; import fr.ifremer.wao.entity.ObsProgram; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.time.DateUtils; +import org.nuiton.i18n.I18n; import java.text.DateFormat; import java.text.ParseException; @@ -35,8 +37,6 @@ import java.util.Locale; import java.util.regex.Pattern; -import static org.nuiton.i18n.I18n.l; - public class WaoUtils { @Deprecated @@ -78,29 +78,33 @@ } public static String formatTime(Locale locale, Date date) { - return l(locale, "wao.time.formatter", date); + return I18n.l(locale, "wao.time.formatter", date); } public static String formatDateTime(Locale locale, Date date) { - return l(locale, "wao.datetime.formatter", date); + return I18n.l(locale, "wao.datetime.formatter", date); } public static String formatDate(Locale locale, Date date) { - return l(locale, "wao.date.formatter", date); + return I18n.l(locale, "wao.date.formatter", date); } public static String formatMonth(Locale locale, Date date) { - return l(locale, "wao.month.formatter", date); + return I18n.l(locale, "wao.month.formatter", date); } public static Date parseMonth(Locale locale, String monthYear) throws ParseException { - String pattern = l(locale, "wao.month.pattern"); + String pattern = I18n.l(locale, "wao.month.pattern"); DateFormat dateFormat = new SimpleDateFormat(pattern); return dateFormat.parse(monthYear); } + public static String l(Locale locale, I18nAble i18nAble) { + return I18n.l(locale, i18nAble.getI18nKey()); + } + public static Pattern getSampleRowCodePattern(ObsProgram obsProgram) { - return Pattern.compile("^(\\d{4})_" + obsProgram.getShortCode() + "(\\d{4})$"); + return Pattern.compile("^(\\d{4})_" + obsProgram.getShortCode() + "(\\d{4})$"); } public static <T extends Enum> Collection<Integer> toOrdinals(Collection<T> enums) {