Merge remote-tracking branch 'origin/ide-1.5.x' into ide-1.5.x

Author: Fede85

app/src/processing/app/I18n.java

@@ -13,8 +13,10 @@
 
 package processing.app;
 
-import java.util.*;
 import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 
 public class I18n {
   // start using current locale but still allow using the dropdown list later
@@ -28,23 +30,24 @@ public class I18n {
   static String PROMPT_OK;
   static String PROMPT_BROWSE;
 
-  static protected void init (String language) throws MissingResourceException {
-    // there might be a null pointer exception ... most likely will never happen but the jvm gets mad
-    try {
-      if (language != null && language.trim().length() > 0) {
-        Locale locale = new Locale(language);
-        i18n = ResourceBundle.getBundle("processing.app.i18n.Resources", locale);
-        Locale.setDefault(locale);
-      } else {
-        i18n = ResourceBundle.getBundle("processing.app.i18n.Resources", Locale.getDefault());
-      }
-      PROMPT_YES = _("Yes");
-      PROMPT_NO = _("No");
-      PROMPT_CANCEL = _("Cancel");
-      PROMPT_OK = _("OK");
-      PROMPT_BROWSE = _("Browse");
-    } catch (java.lang.NullPointerException e) {
+  static protected void init(String language) throws MissingResourceException {
+    String[] languageParts = language.split("_");
+    Locale locale = Locale.getDefault();
+    // both language and country
+    if (languageParts.length == 2) {
+      locale = new Locale(languageParts[0], languageParts[1]);
+      // just language
+    } else if (languageParts.length == 1 && !"".equals(languageParts[0])) {
+      locale = new Locale(languageParts[0]);
     }
+    // there might be a null pointer exception ... most likely will never happen but the jvm gets mad
+    Locale.setDefault(locale);
+    i18n = ResourceBundle.getBundle("processing.app.i18n.Resources", Locale.getDefault());
+    PROMPT_YES = _("Yes");
+    PROMPT_NO = _("No");
+    PROMPT_CANCEL = _("Cancel");
+    PROMPT_OK = _("OK");
+    PROMPT_BROWSE = _("Browse");
   }
 
   public static String _(String s) {
@@ -54,29 +57,29 @@ public static String _(String s) {
     } catch (MissingResourceException e) {
       res = s;
     }
-    
+
     // The single % is the arguments selector in .PO files.
     // We must put double %% inside the translations to avoid
     // getting .PO processing in the way.
     res = res.replace("%%", "%");
-    
+
     return res;
   }
 
-  public static String format(String fmt, Object ... args) {
+  public static String format(String fmt, Object... args) {
     // Single quote is used to escape curly bracket arguments.
-    
+
     // - Prevents strings fixed at translation time to be fixed again
     fmt = fmt.replace("''", "'");
     // - Replace ' with the escaped version ''
     fmt = fmt.replace("'", "''");
 
     return MessageFormat.format(fmt, args);
   }
-  
+
   /**
    * Does nothing.
-   * 
+   * <p/>
    * This method is an hack to extract words with gettext tool.
    */
   protected static void unusedStrings() {

app/src/processing/app/Preferences.java

@@ -95,23 +95,28 @@ public String toString() {
       new Language(_("System Default"), "", ""),
       new Language(_("Arabic"), "العربية", "ar"),
       new Language(_("Aragonese"), "Aragonés", "an"),
+      new Language(_("Belarusian"), "Беларуская мова", "be"),
       new Language(_("Bulgarian"), "български", "bg"),
       new Language(_("Catalan"), "Català", "ca"),
-      new Language(_("Croatian"), "Hrvatski", "hr_HR"),
-      new Language(_("Czech"), "český", "cs_CZ"),
       new Language(_("Chinese Simplified"), "简体中文", "zh_CN"),
       new Language(_("Chinese Traditional"), "繁體中文", "zh_TW"),
+      new Language(_("Croatian"), "Hrvatski", "hr_HR"),
+      new Language(_("Czech"), "český", "cs_CZ"),
       new Language(_("Danish"), "Dansk", "da_DK"),
       new Language(_("Dutch"), "Nederlands", "nl"),
       new Language(_("English"), "English", "en"),
+      new Language(_("English (United Kingdom)"), "English (United Kingdom)", "en_GB"),
       new Language(_("Estonian"), "Eesti", "et"),
-      new Language(_("Filipino"), "Pilipino", "tl"),
+      new Language(_("Estonian (Estonia)"), "Eesti keel", "et_EE"),
+      new Language(_("Filipino"), "Pilipino", "fil"),
+      new Language(_("Finnish"), "Suomi", "fi"),
       new Language(_("French"), "Français", "fr"),
       new Language(_("Canadian French"), "Canadienne-français", "fr_CA"),
       new Language(_("Galician"), "Galego", "gl"),
       new Language(_("Georgian"), "საქართველოს", "ka_GE"),
       new Language(_("German"), "Deutsch", "de_DE"),
       new Language(_("Greek"), "ελληνικά", "el_GR"),
+      new Language(_("Hebrew"), "עברית", "he"),
       new Language(_("Hindi"), "हिंदी", "hi"),
       new Language(_("Hungarian"), "Magyar", "hu"),
       new Language(_("Indonesian"), "Bahasa Indonesia", "id"),
@@ -120,40 +125,37 @@ public String toString() {
       new Language(_("Korean"), "한국어", "ko_KR"),
       new Language(_("Latvian"), "Latviešu", "lv_LV"),
       new Language(_("Lithuaninan"), "Lietuvių Kalba", "lt_LT"),
-      new Language(_("Marathi"), "मराठी", "mr"),
       new Language(_("Norwegian Bokmål"), "Norsk bokmål", "nb_NO"),
       new Language(_("Persian"), "فارسی", "fa"),
       new Language(_("Polish"), "Język Polski", "pl"),
       new Language(_("Portuguese (Brazil)"), "Português (Brazil)", "pt_BR"),
       new Language(_("Portuguese (Portugal)"), "Português (Portugal)", "pt_PT"),
       new Language(_("Romanian"), "Română", "ro"),
       new Language(_("Russian"), "Русский", "ru"),
+      new Language(_("Slovenian"), "Slovenščina", "sl_SI"),
       new Language(_("Spanish"), "Español", "es"),
+      new Language(_("Swedish"), "Svenska", "sv"),
       new Language(_("Tamil"), "தமிழ்", "ta"),
       new Language(_("Turkish"), "Türk", "tr"),
-      new Language(_("Ukrainian"), "Український", "uk"), };
+      new Language(_("Ukrainian"), "Український", "uk"), 
+      new Language(_("Vietnamese"), "Tiếng Việt", "vi"), 
+      };
 
+  // Incomplete languages 
   Language missingLanguages[] = {
       new Language(_("Armenian"), "Հայերեն", "hy"),
       new Language(_("Asturian"), "Asturianu", "ast"),
-      new Language(_("Belarusian"), "Беларуская мова", "be"),
       new Language(_("Bosnian"), "Bosanski", "bs"),
       new Language(_("Burmese (Myanmar)"), "ဗမာစကား", "my_MM"),
       new Language(_("Chinese (China)"), "", "zh_CN"),
       new Language(_("Chinese (Hong Kong)"), "", "zh_HK"),
       new Language(_("Chinese (Taiwan)"), "", "zh_TW"),
       new Language(_("Chinese (Taiwan) (Big5)"), "", "zh_TW.Big5"),
       new Language(_("Dutch (Netherlands)"), "Nederlands", "nl_NL"),
-      new Language(_("English (United Kingdom)"), "English (United Kingdom)", "en_GB"),
-      new Language(_("Estonian (Estonia)"), "Eesti keel", "et_EE"),
-      new Language(_("Finnish"), "Suomi", "fi"),
-      new Language(_("Hebrew"), "עברית", "he"),
       new Language(_("Nepali"), "नेपाली", "ne"),
-      new Language(_("Norwegian"), "Norsk", "no_NB"),
+      new Language(_("Marathi"), "मराठी", "mr"),
       new Language(_("Portugese"), "Português", "pt"),
-      new Language(_("Slovenian"), "Slovenščina", "sl_SL"),
-      new Language(_("Swedish"), "Svenska", "sv"),
-      new Language(_("Vietnamese"), "Tiếng Việt", "vi"), };
+      };
 
   /**
    * Standardized width for buttons. Mac OS X 10.3 wants 70 as its default,

app/src/processing/app/Sketch.java

@@ -1424,10 +1424,7 @@ public String preprocess(String buildPath, PdePreprocessor preprocessor) throws
 
     importedLibraries = new LibraryList();
     for (String item : preprocessor.getExtraImports()) {
-
       Library lib = Base.importToLibraryTable.get(item);
-      //If needed can Debug libraryPath here
-
       if (lib != null && !importedLibraries.contains(lib)) {
         importedLibraries.add(lib);
       }

app/src/processing/app/debug/Compiler.java

@@ -75,7 +75,7 @@ public boolean compile(Sketch _sketch, String _buildPath,
                          String _primaryClassName, boolean _verbose)
       throws RunnerException {
     sketch = _sketch;
-    verbose = _verbose;
+    verbose = _verbose || Preferences.getBoolean("build.verbose");
     sketchIsCompiled = false;
     objectFiles = new ArrayList<File>();
 
@@ -87,10 +87,17 @@ public boolean compile(Sketch _sketch, String _buildPath,
     includePaths.add(prefs.get("build.core.path"));
     if (prefs.get("build.variant.path").length() != 0)
       includePaths.add(prefs.get("build.variant.path"));
-    for (Library lib : sketch.getImportedLibraries())
+    for (Library lib : sketch.getImportedLibraries()) {
+      if (verbose)
+        System.out.println(I18n
+            .format(_("Using library {0} in folder: {1} {2}"), lib.getName(),
+                    lib.getFolder(), lib.isPre15Lib() ? "(pre-1.5)" : ""));
       for (File folder : lib.getSrcFolders(targetArch))
         includePaths.add(folder.getPath());
-
+    }
+    if (verbose)
+      System.out.println();
+    
     // 1. compile the sketch (already in the buildPath)
     sketch.setCompilingProgress(30);
     compileSketch(includePaths);
@@ -308,8 +315,8 @@ private boolean is_already_compiled(File src, File obj, File dep, Map<String, St
     } catch (Exception e) {
       return false;  // any error reading dep file = recompile it
     }
-    if (ret && (verbose || Preferences.getBoolean("build.verbose"))) {
-      System.out.println("  Using previously compiled: " + obj.getPath());
+    if (ret && verbose) {
+      System.out.println(I18n.format(_("Using previously compiled file: {0}"), obj.getPath()));
     }
     return ret;
   }
@@ -334,7 +341,7 @@ private void execAsynchronously(String[] command) throws RunnerException {
       return;
     int result = 0;
 
-    if (verbose || Preferences.getBoolean("build.verbose")) {
+    if (verbose) {
       for (String c : command)
         System.out.print(c + " ");
       System.out.println();