Changeset 6842 for extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo
- Timestamp:
- Sep 2, 2010, 11:06:12 PM (14 years ago)
- Location:
- extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/util/Messages.java
r6821 r6842 1 1 package fr.mael.jiwigo.transverse.util; 2 2 3 import java.util.Locale; 3 4 import java.util.ResourceBundle; 4 5 … … 34 35 public class Messages { 35 36 37 public static Locale usedLocale = Locale.getDefault(); 38 36 39 /** 37 40 * Recuperation d'un message … … 40 43 */ 41 44 public static String getMessage(String key) { 42 return ResourceBundle.getBundle("fr.mael.jiwigo.trad.messages" ).getString(key);45 return ResourceBundle.getBundle("fr.mael.jiwigo.trad.messages", usedLocale).getString(key); 43 46 } 44 47 -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/ConnexionDialog.java
r6821 r6842 7 7 import java.awt.event.ActionEvent; 8 8 import java.awt.event.ActionListener; 9 9 import java.awt.event.ItemEvent; 10 import java.awt.event.ItemListener; 11 import java.awt.event.KeyEvent; 12 import java.awt.event.KeyListener; 13 import java.text.SimpleDateFormat; 14 import java.util.Arrays; 15 import java.util.Locale; 16 17 import javax.swing.AbstractListModel; 18 import javax.swing.ComboBoxModel; 10 19 import javax.swing.JButton; 11 20 import javax.swing.JCheckBox; 21 import javax.swing.JComboBox; 12 22 import javax.swing.JDialog; 13 23 import javax.swing.JLabel; … … 51 61 * Dialog de connexion au site 52 62 */ 53 public class ConnexionDialog extends JDialog implements ActionListener {63 public class ConnexionDialog extends JDialog implements ActionListener, ItemListener, KeyListener { 54 64 /** 55 65 * Logger … … 92 102 93 103 /** 104 * Combo containing all locales 105 */ 106 private JComboBox comboLocales; 107 108 /** 94 109 * Constructeur 95 110 */ 96 111 public ConnexionDialog() { 112 Locale defautLocale = Messages.usedLocale; 97 113 labelUrl = new JLabel(Messages.getMessage("connexionDialog_urlSite")); 98 114 labelLogin = new JLabel(Messages.getMessage("connexionDialog_login")); 99 115 labelPass = new JLabel(Messages.getMessage("connexionDialog_pass")); 116 comboLocales = new JComboBox(); 100 117 boutonOk = new JButton("Ok"); 101 118 String url = PreferencesManagement.getValue(PreferencesEnum.URL_SITE.getLabel()); … … 111 128 Dimension fieldDimensions = new Dimension(300, 30); 112 129 fieldUrl.setPreferredSize(fieldDimensions); 130 fieldUrl.addActionListener(this); 113 131 loginField.setPreferredSize(fieldDimensions); 132 loginField.addActionListener(this); 114 133 passwordField.setPreferredSize(fieldDimensions); 134 passwordField.addActionListener(this); 115 135 this.getContentPane().setLayout(new GridBagLayout()); 116 136 GridBagConstraints constraints = new GridBagConstraints(); … … 133 153 constraints.gridx = 0; 134 154 constraints.gridy++; 155 this.getContentPane().add(comboLocales, constraints); 156 constraints.gridx++; 157 this.getContentPane().add(checkBoxRetenir, constraints); 158 constraints.gridx = 0; 159 constraints.gridy++;// 160 // for (Locale locale : SimpleDateFormat.getAvailableLocales()) { 161 // comboLocales.addItem(locale.getDisplayName(Locale.ENGLISH)); 162 // } 163 comboLocales.setPreferredSize(new Dimension(130, 25)); 164 comboLocales.addItemListener(this); 165 localeModel model = new localeModel(); 166 comboLocales.setModel(model); 167 model.setSelectedItem(defautLocale.getDisplayLanguage(Locale.ENGLISH)); 135 168 this.getContentPane().add(boutonOk, constraints); 136 constraints.gridx++;137 this.getContentPane().add(checkBoxRetenir, constraints);138 169 boutonOk.setPreferredSize(new Dimension(80, 30)); 139 170 boutonOk.addActionListener(this); … … 173 204 .getMessage("error"), JOptionPane.ERROR_MESSAGE); 174 205 } else { 206 // Locale.setDefault((Locale) comboLocales.getSelectedItem()); 175 207 Main.showFrame(); 176 208 //on cache le dialog de connexion … … 179 211 } 180 212 } 213 214 /** 215 * @author mael 216 * Internal class that represents the modal of the combobox that allows 217 * to choose a locale 218 */ 219 class localeModel extends AbstractListModel implements ComboBoxModel { 220 Locale[] locales = SimpleDateFormat.getAvailableLocales(); 221 String[] localesNames; 222 223 String selection = null; 224 225 public localeModel() { 226 localesNames = new String[locales.length]; 227 int compteur = 0; 228 for (Locale locale : locales) { 229 localesNames[compteur] = locale.getDisplayName(Locale.ENGLISH); 230 compteur++; 231 } 232 Arrays.sort(localesNames); 233 } 234 235 public Object getElementAt(int index) { 236 return localesNames[index]; 237 } 238 239 public int getSize() { 240 return locales.length; 241 } 242 243 public void setSelectedItem(Object anItem) { 244 selection = (String) anItem; 245 } 246 247 public Object getSelectedItem() { 248 if (selection != null) 249 return selection; 250 else 251 return null; 252 } 253 } 254 255 @Override 256 public void itemStateChanged(ItemEvent paramItemEvent) { 257 for (Locale locale : SimpleDateFormat.getAvailableLocales()) { 258 if (locale.getDisplayName(Locale.ENGLISH).equals(paramItemEvent.getItem())) { 259 Messages.usedLocale = locale; 260 dispose(); 261 ConnexionDialog dial = new ConnexionDialog(); 262 dial.showDialog(); 263 264 } 265 266 } 267 } 268 269 @Override 270 public void keyPressed(KeyEvent arg0) { 271 } 272 273 @Override 274 public void keyReleased(KeyEvent arg0) { 275 276 } 277 278 @Override 279 public void keyTyped(KeyEvent arg0) { 280 } 181 281 }
Note: See TracChangeset
for help on using the changeset viewer.