Author: tchemit
Date: 2008-02-21 23:05:43 +0000 (Thu, 21 Feb 2008)
New Revision: 1185
Added:
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/i18n-en.png
Removed:
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeI18nFRAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeI18nGBAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeI18nAbstractAction.java
trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/i18n-gb.png
Modified:
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java
trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java
trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties
trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties
trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties
trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties
trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx
Log:
refactoring i18n
Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeI18nFRAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeI18nFRAction.java 2008-02-21 15:47:04 UTC (rev 1184)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeI18nFRAction.java 2008-02-21 23:05:43 UTC (rev 1185)
@@ -1,39 +0,0 @@
-/*
-* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin,
-* Tony Chemit, Gabriel Landais
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-* ##% */
-package fr.cemagref.simexplorer.is.ui.swing.actions;
-
-import fr.cemagref.simexplorer.is.ui.swing.actions.util.ChangeI18nAbstractAction;
-
-/** @author chemit */
- at jaxx.runtime.builder.ActionConfig(
- actionCommand = "i18n_fr_FR",
- name = "simexplorer.action.i18n.fr",
- shortDescription = "simexplorer.action.i18n.fr.tooltip",
- longDescription = "simexplorer.action.i18n.fr.help",
- mnemonic = 'F',
- smallIcon = "action/i18n-fr.png",
- hideActionText = false
-)
-public class ChangeI18nFRAction extends ChangeI18nAbstractAction {
- private static final long serialVersionUID = 7616779035801280791L;
-
- public ChangeI18nFRAction(String name) {
- super(name);
- }
-}
Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeI18nGBAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeI18nGBAction.java 2008-02-21 15:47:04 UTC (rev 1184)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeI18nGBAction.java 2008-02-21 23:05:43 UTC (rev 1185)
@@ -1,39 +0,0 @@
-/*
-* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin,
-* Tony Chemit, Gabriel Landais
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-* ##% */
-package fr.cemagref.simexplorer.is.ui.swing.actions;
-
-import fr.cemagref.simexplorer.is.ui.swing.actions.util.ChangeI18nAbstractAction;
-
-/** @author chemit */
- at jaxx.runtime.builder.ActionConfig(
- actionCommand = "i18n_en_GB",
- name = "simexplorer.action.i18n.en",
- shortDescription = "simexplorer.action.i18n.en.tooltip",
- longDescription = "simexplorer.action.i18n.en.help",
- mnemonic = 'n',
- smallIcon = "action/i18n-gb.png",
- hideActionText = false
-)
-public class ChangeI18nGBAction extends ChangeI18nAbstractAction {
- private static final long serialVersionUID = 7616779035801280791L;
-
- public ChangeI18nGBAction(String name) {
- super(name);
- }
-}
\ No newline at end of file
Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeI18nAbstractAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeI18nAbstractAction.java 2008-02-21 15:47:04 UTC (rev 1184)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeI18nAbstractAction.java 2008-02-21 23:05:43 UTC (rev 1185)
@@ -1,88 +0,0 @@
-/*
-* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin,
-* Tony Chemit, Gabriel Landais
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-* ##% */
-package fr.cemagref.simexplorer.is.ui.swing.actions.util;
-
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorer;
-import org.apache.commons.beanutils.Converter;
-import org.codelutin.i18n.CountryEnum;
-import org.codelutin.i18n.I18n;
-import org.codelutin.i18n.LanguageEnum;
-import org.codelutin.util.ConverterUtil;
-
-import java.awt.event.ActionEvent;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Une action pour recharger la locale.
- * <p/>
- * Le nom de l'action doit etre de la forme i18n_XX_YY où XX est la langue
- * et YY le pays de la locale à charger.
- *
- * @author chemit
- * @see LanguageEnum
- * @see CountryEnum
- */
-public abstract class ChangeI18nAbstractAction extends SimExplorerAbstractAction {
-
- public static final Pattern PATTERN_NAME = Pattern.compile("i18n_(\\w\\w)_(\\w\\w)");
-
- protected LanguageEnum language;
- protected CountryEnum country;
-
- private static final long serialVersionUID = 4180668477670765253L;
-
- public ChangeI18nAbstractAction(String name) {
- super(name);
- Matcher matcher = PATTERN_NAME.matcher(name);
- if (!matcher.matches()) {
- throw new IllegalArgumentException(I18n._(getClass().getName() + " should have a nmae like this 'i18n_XX_YY', but was {0}", name));
- }
- Converter convertorLanguage = ConverterUtil.getConverter(LanguageEnum.class);
- language = (LanguageEnum) convertorLanguage.convert(LanguageEnum.class, matcher.group(1));
-
- convertorLanguage = ConverterUtil.getConverter(CountryEnum.class);
- country = (CountryEnum) convertorLanguage.convert(CountryEnum.class, matcher.group(2));
- }
-
- @Override
- public void doAction(ActionEvent e) {
-
- //TODO Should ask confirm from user since it will close ui, and re instanciate ui
- //getMainUI().getQuit().getAction().actionPerformed(new ActionEvent(this, ActionEvent.ACTION_FIRST, "cancel"));
- getContext().getConfig().setI18n(language, country);
- // on doit initialiser la nouvelle locale avant de decharger les ui
- // au cas ou un appel à une ui surviendrait et dans quel cas la locale
- // serait toujours sur l'ancienne valeur ...
- getContext().getConfig().initI18n();
- // save config
- getContext().saveSafely();
- // dispose then reload main ui
- SimExplorer.dispose(true);
- }
-
- public boolean equalsLocale(LanguageEnum lang, CountryEnum countr) {
- return language == lang && country == countr;
- }
-
- @Override
- public String toString() {
- return super.toString() + " Language " + language + " Country " + country;
- }
-}
\ No newline at end of file
Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java (rev 0)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-02-21 23:05:43 UTC (rev 1185)
@@ -0,0 +1,113 @@
+/*
+* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin,
+* Tony Chemit, Gabriel Landais
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+* ##% */
+package fr.cemagref.simexplorer.is.ui.swing.actions.util;
+
+import fr.cemagref.simexplorer.is.ui.swing.SimExplorer;
+import org.codelutin.i18n.I18n;
+import org.codelutin.i18n.LocaleEnum;
+import static org.codelutin.i18n.I18n.*;
+
+import javax.swing.Action;
+import java.awt.event.ActionEvent;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Une action pour recharger la locale.
+ * <p/>
+ * Le nom de l'action doit etre de la forme i18n_XX_YY où XX est la langue
+ * et YY le pays de la locale à charger.
+ *
+ * @author chemit
+ * @see org.codelutin.i18n.LanguageEnum
+ * @see org.codelutin.i18n.CountryEnum
+ */
+ at jaxx.runtime.builder.ActionConfig(
+ actionCommand = "changeLocale",
+ //name = "simexplorer.action.changeLocale",
+ shortDescription = "simexplorer.action.changeLocale.tooltip",
+ longDescription = "simexplorer.action.changeLocale.help",
+ //mnemonic = 'F',
+ //smallIcon = "action/i18n-fr.png",
+ hideActionText = false
+)
+public class ChangeLocaleAction extends SimExplorerAbstractAction {
+
+ public static final Pattern PATTERN_NAME = Pattern.compile("i18n_(\\w\\w)");
+
+ protected LocaleEnum locale;
+
+ private static final long serialVersionUID = 4180668477670765253L;
+
+ public ChangeLocaleAction(String name) {
+ super(name);
+ Matcher matcher = PATTERN_NAME.matcher(name);
+ if (!matcher.matches()) {
+ throw new IllegalArgumentException(_(getClass().getName() + " should have a nmae like this 'i18n_XX', but was {0}", name));
+ }
+
+ locale = LocaleEnum.valueOf(matcher.group(1));
+
+ putValue(Action.NAME, _(locale.getLibelle()));
+ putValue(Action.SMALL_ICON, jaxx.runtime.UIHelper.createImageIcon(getIcon()));
+ putValue(Action.SHORT_DESCRIPTION, jaxx.runtime.UIHelper.createImageIcon(getIcon()));
+ }
+
+ @Override
+ public String getI18nToolTipText() {
+ return "simexplorer.action.changeLocale.tooltip";
+ }
+
+ public String getIcon() {
+ return "action/i18n-" + locale.name() + ".png";
+ }
+
+ @Override
+ public void doAction(ActionEvent e) {
+
+ //TODO Should ask confirm from user since it will close ui, and re instanciate ui
+ //getMainUI().getQuit().getAction().actionPerformed(new ActionEvent(this, ActionEvent.ACTION_FIRST, "cancel"));
+ getContext().getConfig().setI18n(locale);
+ // on doit initialiser la nouvelle locale avant de decharger les ui
+ // au cas ou un appel à une ui surviendrait et dans quel cas la locale
+ // serait toujours sur l'ancienne valeur ...
+ getContext().getConfig().initI18n();
+ // save config
+ getContext().saveSafely();
+ // dispose then reload main ui
+ SimExplorer.dispose(true);
+ }
+
+ //public boolean equalsLocale(LanguageEnum lang, CountryEnum countr) {
+ // return language == lang && country == countr;
+ //}
+
+ @Override
+ public String toString() {
+ return super.toString() + " Locale " + locale;
+ }
+
+ public boolean equalsLocale(LocaleEnum locale) {
+ return this.locale == locale;
+ }
+
+ public LocaleEnum getLocale() {
+ return locale;
+ }
+}
\ No newline at end of file
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java 2008-02-21 15:47:04 UTC (rev 1184)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java 2008-02-21 23:05:43 UTC (rev 1185)
@@ -23,10 +23,9 @@
import fr.cemagref.simexplorer.is.ui.swing.commandline.options.SimExplorerOptionConfigFile;
import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerOptionParser;
import fr.cemagref.simexplorer.is.ui.swing.SimExplorer;
-import org.codelutin.i18n.CountryEnum;
import org.codelutin.i18n.I18n;
import static org.codelutin.i18n.I18n._;
-import org.codelutin.i18n.LanguageEnum;
+import org.codelutin.i18n.LocaleEnum;
import org.codelutin.option.ConfigPropertyKey;
import org.codelutin.option.OptionParser;
@@ -103,7 +102,7 @@
}
public void initI18n() {
- I18n.initISO88591(getUserLanguage().name(), getUserCountry().name());
+ I18n.initISO88591(getUserLocale());
}
protected void loadFromOptions(SimExplorerOptionParser parser) {
@@ -126,8 +125,12 @@
}
}
- public void setI18n(LanguageEnum language, CountryEnum country) {
+ /*public void setI18n(LanguageEnum language, CountryEnum country) {
setUserLanguage(language);
setUserCountry(country);
+ }*/
+
+ public void setI18n(LocaleEnum locale) {
+ setUserLocale(locale);
}
}
\ No newline at end of file
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2008-02-21 15:47:04 UTC (rev 1184)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerMainUI.java 2008-02-21 23:05:43 UTC (rev 1185)
@@ -25,10 +25,9 @@
import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
import fr.cemagref.simexplorer.is.ui.swing.SimExplorerContext;
import fr.cemagref.simexplorer.is.ui.swing.actions.ExportElementAction;
-import fr.cemagref.simexplorer.is.ui.swing.actions.util.ChangeI18nAbstractAction;
import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction;
-import org.codelutin.i18n.CountryEnum;
-import org.codelutin.i18n.LanguageEnum;
+import fr.cemagref.simexplorer.is.ui.swing.actions.util.ChangeLocaleAction;
+import org.codelutin.i18n.LocaleEnum;
import static org.codelutin.i18n.I18n.*;
import javax.swing.AbstractButton;
@@ -105,18 +104,19 @@
*/
public void refreshI18nActions(SimExplorerContext context) {
- LanguageEnum language = context.getConfig().getUserLanguage();
- CountryEnum country = context.getConfig().getUserCountry();
+ LocaleEnum locale = context.getConfig().getUserLocale();
+ //CountryEnum country = context.getConfig().getUserCountry();
String[] actions = SimExplorerActionManager.getFactory().getActionNames();
for (String actionName : actions) {
- Matcher matcher = ChangeI18nAbstractAction.PATTERN_NAME.matcher(actionName);
+ Matcher matcher = ChangeLocaleAction.PATTERN_NAME.matcher(actionName);
if (!matcher.matches()) {
continue;
}
AbstractButton button = (AbstractButton) getObjectById(actionName);
- ChangeI18nAbstractAction action = (ChangeI18nAbstractAction) button.getAction();
- boolean enable = !action.equalsLocale(language, country);
- button.setEnabled(enable);
+ ChangeLocaleAction action = (ChangeLocaleAction) button.getAction();
+ boolean enable = !action.equalsLocale(locale);
+ UpdateButton(button,enable, enable?action.getLocale():null);
+ //button.setEnabled(enable);
}
}
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-21 15:47:04 UTC (rev 1184)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-21 23:05:43 UTC (rev 1185)
@@ -87,14 +87,12 @@
###
### user properties
###
-main.config.definition.userCountry=org.codelutin.i18n.CountryEnum:FR
-main.config.modifiers.userCountry=mandatory
main.config.definition.userFirstName=java.lang.String
main.config.modifiers.userFirstName=mandatory
-main.config.definition.userLanguage=org.codelutin.i18n.LanguageEnum:fr
-main.config.modifiers.userLanguage=mandatory
+main.config.definition.userLocale=org.codelutin.i18n.LocaleEnum:fr
+main.config.modifiers.userLocale=mandatory
main.config.definition.userLastName=java.lang.String
main.config.modifiers.userLastName=mandatory
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-21 15:47:04 UTC (rev 1184)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-21 23:05:43 UTC (rev 1185)
@@ -4,6 +4,8 @@
simexplorer.action.advancedSearch=Advanced search
simexplorer.action.advancedSearch.help=
simexplorer.action.advancedSearch.tooltip=Show advanced search dialog
+simexplorer.action.changeLocale.help=
+simexplorer.action.changeLocale.tooltip=Change to ''{0}'' language
simexplorer.action.changeSizor=Change Page size
simexplorer.action.changeSizor.help=
simexplorer.action.changeSizor.tooltip=Select the number of results to display in a page
@@ -88,12 +90,6 @@
simexplorer.action.historyUnconnect=Reset remote from history
simexplorer.action.historyUnconnect.help=
simexplorer.action.historyUnconnect.tooltip=Delete from history remote elements
-simexplorer.action.i18n.en=English
-simexplorer.action.i18n.en.help=
-simexplorer.action.i18n.en.tooltip=Change to english language
-simexplorer.action.i18n.fr=French
-simexplorer.action.i18n.fr.help=
-simexplorer.action.i18n.fr.tooltip=Change to french language
simexplorer.action.importElement=import
simexplorer.action.importElement.help=
simexplorer.action.importElementToLocal.tooltip=Import into local database
@@ -164,10 +160,9 @@
simexplorer.config.main.showLocalTab.description=Show at launch time, the local tab
simexplorer.config.main.showRemoteTab.description=Show at launch time, the remote tab
simexplorer.config.main.siteURL.description=Simexplorer-is site URL
-simexplorer.config.main.userCountry.description=Country of the user's locale
simexplorer.config.main.userFirstName.description=User first name
-simexplorer.config.main.userLanguage.description=Language of user's locale
simexplorer.config.main.userLastName.description=User last name
+simexplorer.config.main.userLocale.description=User locale
simexplorer.config.main.userMail.description=User email adress
simexplorer.config.main.version.description=Version of application
simexplorer.config.menu=Configuration
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-21 15:47:04 UTC (rev 1184)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-21 23:05:43 UTC (rev 1185)
@@ -4,6 +4,8 @@
simexplorer.action.advancedSearch=Recherche avanc\u00E9e
simexplorer.action.advancedSearch.help=
simexplorer.action.advancedSearch.tooltip=Cliquer pour afficher le recherche avanc\u00E9e
+simexplorer.action.changeLocale.help=
+simexplorer.action.changeLocale.tooltip=Changer de langue ''{0}''
simexplorer.action.changeSizor=Change fen\u00EAtre
simexplorer.action.changeSizor.help=
simexplorer.action.changeSizor.tooltip=Choisir le nombre de r\u00E9sultats par page
@@ -88,12 +90,6 @@
simexplorer.action.historyUnconnect=Supprimer les \u00E9l\u00E9ments distants
simexplorer.action.historyUnconnect.help=
simexplorer.action.historyUnconnect.tooltip=Supprimer les \u00E9l\u00E9ments distants de l'historique
-simexplorer.action.i18n.en=Anglais
-simexplorer.action.i18n.en.help=
-simexplorer.action.i18n.en.tooltip=Traduire l'application en anglais
-simexplorer.action.i18n.fr=Fran\u00E7ais
-simexplorer.action.i18n.fr.help=
-simexplorer.action.i18n.fr.tooltip=Traduire l'application en fran\u00E7ais
simexplorer.action.importElement=importer
simexplorer.action.importElement.help=
simexplorer.action.importElementToLocal.tooltip=Importer dans la base locale
@@ -164,10 +160,9 @@
simexplorer.config.main.showLocalTab.description=Voir au d\u00E9marrage l'onglet Local
simexplorer.config.main.showRemoteTab.description=Voir au d\u00E9mrrage l'onglet Distant
simexplorer.config.main.siteURL.description=L'URL du site de Simexplorer-is
-simexplorer.config.main.userCountry.description=Le pays de la locale utilisateur
simexplorer.config.main.userFirstName.description=Le pr\u00E9nom de l'utilisateur
-simexplorer.config.main.userLanguage.description=La langue de la locale utilisateur
simexplorer.config.main.userLastName.description=Le nom de l'utilisateur
+simexplorer.config.main.userLocale.description=La langue de l'utilisateur
simexplorer.config.main.userMail.description=Le courriel de l'utilisateur
simexplorer.config.main.version.description=La version du logiciel
simexplorer.config.menu=Configuration
Copied: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/i18n-en.png (from rev 1184, trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/i18n-gb.png)
===================================================================
(Binary files differ)
Property changes on: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/i18n-en.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/i18n-gb.png
===================================================================
(Binary files differ)
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties 2008-02-21 15:47:04 UTC (rev 1184)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/jaxx/simexplorer-is-swing-actions.properties 2008-02-21 23:05:43 UTC (rev 1185)
@@ -10,8 +10,8 @@
action.quit=fr.cemagref.simexplorer.is.ui.swing.actions.QuitAction
# i18n actions
-action.i18n_fr_FR=fr.cemagref.simexplorer.is.ui.swing.actions.ChangeI18nFRAction
-action.i18n_en_GB=fr.cemagref.simexplorer.is.ui.swing.actions.ChangeI18nGBAction
+action.i18n_fr=fr.cemagref.simexplorer.is.ui.swing.actions.util.ChangeLocaleAction
+action.i18n_en=fr.cemagref.simexplorer.is.ui.swing.actions.util.ChangeLocaleAction
# close tab actions
action.closeTab=fr.cemagref.simexplorer.is.ui.swing.actions.CloseTabAction
Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx 2008-02-21 15:47:04 UTC (rev 1184)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/ui/SimExplorerUI.jaxx 2008-02-21 23:05:43 UTC (rev 1185)
@@ -24,8 +24,8 @@
<JMenu text='simexplorer.config.menu' mnemonic="{'C'}">
<JMenu text='simexplorer.config.i18n.menu' mnemonic="{'L'}"
icon='{createImageIcon("action/translate.png")}'>
- <JMenuItem id="i18n_fr_FR"/>
- <JMenuItem id="i18n_en_GB"/>
+ <JMenuItem id="i18n_fr"/>
+ <JMenuItem id="i18n_en"/>
</JMenu>
<JMenuItem id="config"/>
<JMenuItem id="resetPassword"/>
