From 37089d4f5a9da53db2c2a15f8528b6eae0fe2fd3 Mon Sep 17 00:00:00 2001 From: mguessan Date: Sun, 10 May 2009 22:20:17 +0000 Subject: [PATCH] I18N: FrameGatewayTray git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@558 3d1905a2-6b24-0410-a738-b14d5a86fcbd --- .../davmail/ui/tray/FrameGatewayTray.java | 28 +++++++++---------- src/java/davmailmessages.properties | 3 ++ src/java/davmailmessages_fr.properties | 5 +++- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/java/davmail/ui/tray/FrameGatewayTray.java b/src/java/davmail/ui/tray/FrameGatewayTray.java index 41ab2def..7313e77e 100644 --- a/src/java/davmail/ui/tray/FrameGatewayTray.java +++ b/src/java/davmail/ui/tray/FrameGatewayTray.java @@ -84,9 +84,8 @@ public class FrameGatewayTray implements DavGatewayTrayInterface { } else if (priority.equals(Priority.ERROR)) { errorLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); errorArea.setText(message); - } else { - messageArea.setText(message); } + messageArea.setText(message); } } }); @@ -115,7 +114,8 @@ public class FrameGatewayTray implements DavGatewayTrayInterface { LF5Appender lf5Appender = (LF5Appender) rootLogger.getAppender("LF5Appender"); if (lf5Appender == null) { lf5Appender = new LF5Appender(new LogBrokerMonitor(LogLevel.getLog4JLevels()) { - @Override protected void closeAfterConfirm() { + @Override + protected void closeAfterConfirm() { hide(); } }); @@ -135,7 +135,7 @@ public class FrameGatewayTray implements DavGatewayTrayInterface { protected void buildMenu() { // create a popup menu - JMenu menu = new JMenu("DavMail"); + JMenu menu = new JMenu(BundleMessage.format("UI_DAVMAIL_GATEWAY")); JMenuBar menuBar = new JMenuBar(); menuBar.add(menu); mainFrame.setJMenuBar(menuBar); @@ -147,7 +147,7 @@ public class FrameGatewayTray implements DavGatewayTrayInterface { } }; // create menu item for the default action - JMenuItem aboutItem = new JMenuItem("About..."); + JMenuItem aboutItem = new JMenuItem(BundleMessage.format("UI_ABOUT")); aboutItem.addActionListener(aboutListener); menu.add(aboutItem); @@ -159,11 +159,11 @@ public class FrameGatewayTray implements DavGatewayTrayInterface { } }; // create menu item for the default action - JMenuItem defaultItem = new JMenuItem("Settings..."); + JMenuItem defaultItem = new JMenuItem(BundleMessage.format("UI_SETTINGS")); defaultItem.addActionListener(settingsListener); menu.add(defaultItem); - JMenuItem logItem = new JMenuItem("Show logs..."); + JMenuItem logItem = new JMenuItem(BundleMessage.format("UI_SHOW_LOGS")); logItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { showLogs(); @@ -179,7 +179,7 @@ public class FrameGatewayTray implements DavGatewayTrayInterface { } }; // create menu item for the exit action - JMenuItem exitItem = new JMenuItem("Quit"); + JMenuItem exitItem = new JMenuItem(BundleMessage.format("UI_EXIT")); exitItem.addActionListener(exitListener); menu.add(exitItem); } @@ -198,11 +198,11 @@ public class FrameGatewayTray implements DavGatewayTrayInterface { mainFrame = new JFrame(); mainFrame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - mainFrame.setTitle("DavMail Gateway"); + mainFrame.setTitle(BundleMessage.format("UI_DAVMAIL_GATEWAY")); mainFrame.setIconImage(image); JPanel errorPanel = new JPanel(); - errorPanel.setBorder(BorderFactory.createTitledBorder("Last message")); + errorPanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_LAST_MESSAGE"))); errorPanel.setLayout(new BoxLayout(errorPanel, BoxLayout.X_AXIS)); errorArea = new JTextPane(); errorArea.setEditable(false); @@ -212,11 +212,11 @@ public class FrameGatewayTray implements DavGatewayTrayInterface { errorPanel.add(errorArea); JPanel messagePanel = new JPanel(); - messagePanel.setBorder(BorderFactory.createTitledBorder("Last log")); + messagePanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_LAST_LOG"))); messagePanel.setLayout(new BoxLayout(messagePanel, BoxLayout.X_AXIS)); messageArea = new JTextPane(); - messageArea.setText("Starting DavMail Gateway..."); + messageArea.setText(BundleMessage.format("LOG_STARTING_DAVMAIL")); messageArea.setEditable(false); messageArea.setBackground(mainFrame.getBackground()); messagePanel.add(messageArea); @@ -235,8 +235,8 @@ public class FrameGatewayTray implements DavGatewayTrayInterface { mainFrame.pack(); // workaround MacOSX if (mainFrame.getSize().width < 400 || mainFrame.getSize().height < 180) { - mainFrame.setSize(Math.max(mainFrame.getSize().width, 400), - Math.max(mainFrame.getSize().height, 180)); + mainFrame.setSize(Math.max(mainFrame.getSize().width, 400), + Math.max(mainFrame.getSize().height, 180)); } // center frame mainFrame.setLocation(mainFrame.getToolkit().getScreenSize().width / 2 - diff --git a/src/java/davmailmessages.properties b/src/java/davmailmessages.properties index 4990063f..450f7cfb 100644 --- a/src/java/davmailmessages.properties +++ b/src/java/davmailmessages.properties @@ -202,3 +202,6 @@ EXCEPTION_DAVMAIL_CONFIGURATION=DavMail configuration exception: \n{0} EXCEPTION_UNKNOWN_HOST=Unknown host {0} EXCEPTION_CONNECTION_FAILED=Unable to connect to OWA at {0}, status code {1}, check configuration EXCEPTION_EXCHANGE_LOGIN_FAILED=Exchange login exception: {0} +UI_LAST_MESSAGE=Last message +UI_LAST_LOG=Last log +LOG_STARTING_DAVMAIL=Starting DavMail Gateway... diff --git a/src/java/davmailmessages_fr.properties b/src/java/davmailmessages_fr.properties index e99471f5..db9309a8 100644 --- a/src/java/davmailmessages_fr.properties +++ b/src/java/davmailmessages_fr.properties @@ -201,4 +201,7 @@ EXCEPTION_NETWORK_DOWN=Toutes les interfaces r EXCEPTION_DAVMAIL_CONFIGURATION=Erreur de configuration DavMail : \n{0} EXCEPTION_UNKNOWN_HOST=Nom de serveur {0} invalide EXCEPTION_CONNECTION_FAILED=Connection OWA à {0} impossible, code retour {1}, vérifier la configuration -EXCEPTION_EXCHANGE_LOGIN_FAILED=Exception lors de la connexion Exchange : {0} \ No newline at end of file +EXCEPTION_EXCHANGE_LOGIN_FAILED=Exception lors de la connexion Exchange : {0} +LOG_STARTING_DAVMAIL=Démarrage de la passerelle DavMail... +UI_LAST_LOG=Dernière trace +UI_LAST_MESSAGE=Dernier message \ No newline at end of file