Author: tchemit Date: 2008-08-10 14:35:24 +0000 (Sun, 10 Aug 2008) New Revision: 998 Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java Log: make i18n locale libelle works Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java 2008-08-10 14:05:50 UTC (rev 997) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java 2008-08-10 14:35:24 UTC (rev 998) @@ -16,8 +16,6 @@ /** @author chemit */ -import static org.codelutin.i18n.I18n._; - import javax.swing.Action; import java.awt.event.ActionEvent; import java.util.Locale; @@ -52,12 +50,12 @@ super(name); Matcher matcher = PATTERN_NAME.matcher(name); if (!matcher.matches()) { - throw new IllegalArgumentException(_(getClass().getName() + " should have a name like this 'i18n_XX', but was {0}", name)); + throw new IllegalArgumentException(getClass().getName() + " should have a name like this 'i18n_XX', but was " + name); } locale = org.codelutin.i18n.I18n.newLocale(matcher.group(1)); - putValue(Action.NAME, _(locale.getDisplayName())); + putValue(Action.NAME, locale.getDisplayLanguage()); putValue(Action.SMALL_ICON, org.codelutin.jaxx.util.UIHelper.createImageIcon(getIcon())); } @@ -110,7 +108,6 @@ @Override public void disposeUI() { super.disposeUI(); - locale = org.codelutin.i18n.I18n.newLocale(locale.getLanguage()); - putValue(Action.NAME, _(locale.getDisplayName())); + putValue(Action.NAME, locale.getDisplayLanguage((Locale) getContext().getMainConfig().getProperty("locale"))); } }