Author: echatellier Date: 2010-02-09 18:00:40 +0100 (Tue, 09 Feb 2010) New Revision: 1762 Modified: trunk/src/main/java/org/nuiton/i18n/I18n.java Log: Add a quick fix when key to translate is null. Modified: trunk/src/main/java/org/nuiton/i18n/I18n.java =================================================================== --- trunk/src/main/java/org/nuiton/i18n/I18n.java 2010-01-28 10:25:42 UTC (rev 1761) +++ trunk/src/main/java/org/nuiton/i18n/I18n.java 2010-02-09 17:00:40 UTC (rev 1762) @@ -131,6 +131,12 @@ * sinon. */ public static String _(String message) { + + // if the key to translate is null, just return null + if (message == null) { + return null; + } + if (loader == null || loader.getLanguage() == null) { return applyFilter(message); } @@ -146,6 +152,12 @@ * sinon. */ public static String _(String message, Object... args) { + + // if the key to translate is null, just return null + if (message == null) { + return null; + } + String result = message; Language language = loader == null ? null : loader.getLanguage(); if (language != null) {