Changeset 6979

Timestamp:

Sep 20, 2010, 7:40:36 PM (14 years ago)

Author:

mlg

Message:

Bug fixing : locales listing in the connection dialog
Only locales for which a translation file exists are listed in the connection dialog.

Location:

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo

Files:

• transverse/util/Messages.java (modified) (2 diffs)
• ui/ConnexionDialog.java (modified) (4 diffs)

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/util/Messages.java

@@ -1 +1 @@
 package fr.mael.jiwigo.transverse.util;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.TreeSet;
 
 /**
@@ -46 +52 @@
     }
 
+    /**
+     * Gets available translations
+     * @return the list of available translations
+     */
+    public static List<Locale> getAvailableBundles() {
+        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        final String bundlepackage = "fr.mael.jiwigo.trad";
+        final String bundlename = "messages";
+
+        File root = new File(loader.getResource(bundlepackage.replace('.', '/')).getFile());
+        File[] files = root.listFiles(new FilenameFilter() {
+            public boolean accept(File dir, String name) {
+                return name.matches("^" + bundlename + "(_\\w{2}(_\\w{2})?)?\\.properties$");
+            }
+        });
+
+        Set<String> languages = new TreeSet<String>();
+        for (File file : files) {
+            languages.add(file.getName().replaceAll("^" + bundlename + "(_)?|\\.properties$", ""));
+        }
+
+        List<Locale> availableLocales = new ArrayList<Locale>();
+        for (Locale locale : Locale.getAvailableLocales()) {
+            for (String s : languages) {
+                if (s.equals(locale.getLanguage())) {
+                    availableLocales.add(locale);
+                }
+            }
+        }
+        return availableLocales;
+    }
+
 }

extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/ConnexionDialog.java

@@ -13 +13 @@
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Locale;
 
@@ -218 +219 @@
      */
     class localeModel extends AbstractListModel implements ComboBoxModel {
-        Locale[] locales = SimpleDateFormat.getAvailableLocales();
+        //      Locale[] locales = SimpleDateFormat.getAvailableLocales();
+        List<Locale> locales = Messages.getAvailableBundles();
         String[] localesNames;
 
@@ -224 +226 @@
 
         public localeModel() {
-            localesNames = new String[locales.length];
+            localesNames = new String[locales.size()];
             int compteur = 0;
             for (Locale locale : locales) {
@@ -238 +240 @@
 
         public int getSize() {
-            return locales.length;
+            return locales.size();
         }