Author: tchemit Date: 2008-07-23 17:55:56 +0000 (Wed, 23 Jul 2008) New Revision: 895 Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/AboutAction.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ChangeLocaleAction.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ConfigAction.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/HelpAction.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/QuitAction.java trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/SiteAction.java trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties Log: i18n Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/AboutAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/AboutAction.java 2008-07-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/AboutAction.java 2008-07-23 17:55:56 UTC (rev 895) @@ -21,9 +21,9 @@ */ @org.codelutin.jaxx.action.ActionConfig( actionCommand = "about", - name = "lima.action.about", - shortDescription = "lima.action.about.tooltip", - longDescription = "lima.action.about.help", + name = "commandlinedemo.action.about", + shortDescription = "commandlinedemo.action.about.tooltip", + longDescription = "commandlinedemo.action.about.help", smallIcon = "action/about.png", mnemonic = 'a', hideActionText = false Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ChangeLocaleAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ChangeLocaleAction.java 2008-07-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ChangeLocaleAction.java 2008-07-23 17:55:56 UTC (rev 895) @@ -35,8 +35,8 @@ */ @org.codelutin.jaxx.action.ActionConfig( actionCommand = "changeLocale", - shortDescription = "lima.action.changeLocale.tooltip", - longDescription = "lima.action.changeLocale.help", + shortDescription = "commandlinedemo.action.changeLocale.tooltip", + longDescription = "commandlinedemo.action.changeLocale.help", hideActionText = false, multiNames = {"i18n_fr", "i18n_en"} ) @@ -66,7 +66,7 @@ @Override public String getI18nToolTipText() { - return "lima.action.changeLocale.tooltip"; + return "commandlinedemo.action.changeLocale.tooltip"; } public String getIcon() { @@ -78,7 +78,7 @@ return true; //TODO Faut-il proposer une confirmation ? //String s = _(locale.getLibelle()); - //int result = JOptionPane.showConfirmDialog(null, _("lima.confirm.changeLanguage", s), "changeLanguage", JOptionPane.YES_NO_OPTION); + //int result = JOptionPane.showConfirmDialog(null, _("commandlinedemo.confirm.changeLanguage", s), "changeLanguage", JOptionPane.YES_NO_OPTION); //return result == JOptionPane.OK_OPTION; } Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ConfigAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ConfigAction.java 2008-07-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/ConfigAction.java 2008-07-23 17:55:56 UTC (rev 895) @@ -24,9 +24,9 @@ */ @org.codelutin.jaxx.action.ActionConfig( actionCommand = "config", - name = "lima.action.config", - shortDescription = "lima.action.config.tooltip", - longDescription = "lima.action.config.help", + name = "commandlinedemo.action.config", + shortDescription = "commandlinedemo.action.config.tooltip", + longDescription = "commandlinedemo.action.config.help", smallIcon = "action/config.png", mnemonic = 'P', hideActionText = false Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/HelpAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/HelpAction.java 2008-07-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/HelpAction.java 2008-07-23 17:55:56 UTC (rev 895) @@ -21,9 +21,9 @@ */ @org.codelutin.jaxx.action.ActionConfig( actionCommand = "help", - name = "lima.action.help", - shortDescription = "lima.action.help.tooltip", - longDescription = "lima.action.help.help", + name = "commandlinedemo.action.help", + shortDescription = "commandlinedemo.action.help.tooltip", + longDescription = "commandlinedemo.action.help.help", smallIcon = "action/help.png", mnemonic = 'h', hideActionText = false Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/QuitAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/QuitAction.java 2008-07-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/QuitAction.java 2008-07-23 17:55:56 UTC (rev 895) @@ -28,9 +28,9 @@ */ @org.codelutin.jaxx.action.ActionConfig( actionCommand = "quit", - name = "lima.action.quit", - shortDescription = "lima.action.quit.tooltip", - longDescription = "lima.action.quit.help", + name = "commandlinedemo.action.quit", + shortDescription = "commandlinedemo.action.quit.tooltip", + longDescription = "commandlinedemo.action.quit.help", smallIcon = "action/quit.png", mnemonic = 'q', hideActionText = false @@ -48,10 +48,10 @@ boolean result = super.beforeAction(e); if (result) { - String[] response = {_("lima.yes"), _("lima.no")}; + String[] response = {_("commandlinedemo.yes"), _("commandlinedemo.no")}; int n = JOptionPane.showOptionDialog(null, - _("lima.close_question"), - _("lima.question"), + _("commandlinedemo.close_question"), + _("commandlinedemo.question"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, //do not use a custom Icon Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/SiteAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/SiteAction.java 2008-07-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/SiteAction.java 2008-07-23 17:55:56 UTC (rev 895) @@ -26,9 +26,9 @@ */ @org.codelutin.jaxx.action.ActionConfig( actionCommand = "site", - name = "lima.action.site", - shortDescription = "lima.action.site.tooltip", - longDescription = "lima.action.site.help", + name = "commandlinedemo.action.site", + shortDescription = "commandlinedemo.action.site.tooltip", + longDescription = "commandlinedemo.action.site.help", smallIcon = "action/site.png", mnemonic = 's', hideActionText = false Modified: trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties =================================================================== --- trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties 2008-07-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties 2008-07-23 17:55:56 UTC (rev 895) @@ -1,3 +1,21 @@ +commandlinedemo.action.about=About +commandlinedemo.action.about.help= +commandlinedemo.action.about.tooltip= +commandlinedemo.action.changeLocale.help= +commandlinedemo.action.changeLocale.tooltip= +commandlinedemo.action.config=Preferences +commandlinedemo.action.config.help= +commandlinedemo.action.config.tooltip= +commandlinedemo.action.help=Help +commandlinedemo.action.help.help= +commandlinedemo.action.help.tooltip= +commandlinedemo.action.quit=Quite +commandlinedemo.action.quit.help= +commandlinedemo.action.quit.tooltip= +commandlinedemo.action.site=Site +commandlinedemo.action.site.help= +commandlinedemo.action.site.tooltip= +commandlinedemo.close_question=Really quit ? commandlinedemo.config.main.configFileName.description= commandlinedemo.config.main.debugMode.description= commandlinedemo.config.main.description= @@ -16,6 +34,8 @@ commandlinedemo.config.remote.proxyLogin.description= commandlinedemo.config.remote.proxyPassword.description= commandlinedemo.config.remote.useProxy.description= +commandlinedemo.confirm.changeLanguage= +commandlinedemo.no=No commandlinedemo.option.description.changeConfig= commandlinedemo.option.description.changeFileConfig= commandlinedemo.option.description.editConfig= @@ -24,30 +44,10 @@ commandlinedemo.option.description.resetConfig= commandlinedemo.option.description.showConfig= commandlinedemo.option.description.ui= -lima.action.about= -lima.action.about.help= -lima.action.about.tooltip= -lima.action.changeLocale.help= -lima.action.changeLocale.tooltip= -lima.action.config= -lima.action.config.help= -lima.action.config.tooltip= -lima.action.help= -lima.action.help.help= -lima.action.help.tooltip= -lima.action.quit= -lima.action.quit.help= -lima.action.quit.tooltip= -lima.action.site= -lima.action.site.help= -lima.action.site.tooltip= -lima.close_question= -lima.confirm.changeLanguage= -lima.no= -lima.question= -lima.yes= -mainui.menu.edit= -mainui.menu.file= -mainui.menu.help= -mainui.menu.help.i18n= -mainui.title= +commandlinedemo.question=Quit +commandlinedemo.yes=Yes +mainui.menu.edit=Edit +mainui.menu.file=File +mainui.menu.help=Help +mainui.menu.help.i18n=Language +mainui.title=Commandline demo Modified: trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties =================================================================== --- trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties 2008-07-23 16:16:51 UTC (rev 894) +++ trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties 2008-07-23 17:55:56 UTC (rev 895) @@ -1,3 +1,21 @@ +commandlinedemo.action.about=A propos +commandlinedemo.action.about.help= +commandlinedemo.action.about.tooltip= +commandlinedemo.action.changeLocale.help= +commandlinedemo.action.changeLocale.tooltip= +commandlinedemo.action.config=Pr\u00E9f\u00E9rences +commandlinedemo.action.config.help= +commandlinedemo.action.config.tooltip= +commandlinedemo.action.help=Aide +commandlinedemo.action.help.help= +commandlinedemo.action.help.tooltip= +commandlinedemo.action.quit=Quitter +commandlinedemo.action.quit.help= +commandlinedemo.action.quit.tooltip= +commandlinedemo.action.site=Site +commandlinedemo.action.site.help= +commandlinedemo.action.site.tooltip= +commandlinedemo.close_question=Voulez-vous quitter ? commandlinedemo.config.main.configFileName.description= commandlinedemo.config.main.debugMode.description= commandlinedemo.config.main.description= @@ -16,6 +34,8 @@ commandlinedemo.config.remote.proxyLogin.description= commandlinedemo.config.remote.proxyPassword.description= commandlinedemo.config.remote.useProxy.description= +commandlinedemo.confirm.changeLanguage= +commandlinedemo.no=Non commandlinedemo.option.description.changeConfig= commandlinedemo.option.description.changeFileConfig= commandlinedemo.option.description.editConfig= @@ -24,30 +44,10 @@ commandlinedemo.option.description.resetConfig= commandlinedemo.option.description.showConfig= commandlinedemo.option.description.ui= -lima.action.about= -lima.action.about.help= -lima.action.about.tooltip= -lima.action.changeLocale.help= -lima.action.changeLocale.tooltip= -lima.action.config= -lima.action.config.help= -lima.action.config.tooltip= -lima.action.help= -lima.action.help.help= -lima.action.help.tooltip= -lima.action.quit= -lima.action.quit.help= -lima.action.quit.tooltip= -lima.action.site= -lima.action.site.help= -lima.action.site.tooltip= -lima.close_question= -lima.confirm.changeLanguage= -lima.no= -lima.question= -lima.yes= -mainui.menu.edit= -mainui.menu.file= -mainui.menu.help= -mainui.menu.help.i18n= -mainui.title= +commandlinedemo.question=Quitter +commandlinedemo.yes=Oui +mainui.menu.edit=Edit +mainui.menu.file=Fichier +mainui.menu.help=Aide +mainui.menu.help.i18n=Langue +mainui.title=Commandline D\u00E9mo