Fix localization in OS X

federicobond · federicobond · commit 75007764bc2e · 2014-09-08T23:27:53.000-03:00
diff --git a/app/src/processing/app/Language.java b/app/src/processing/app/Language.java
@@ -87,6 +87,7 @@ private Language() {
   
   static private String[] listSupported() {
     // List of languages in alphabetical order. (Add yours here.)
+    // Also remember to add it to the corresponding build/build.xml rule.
     final String[] SUPPORTED = {
       "de", // German, Deutsch
       "en", // English
@@ -147,6 +148,7 @@ static public void saveLanguage(String language) {
     } catch (Exception e) {
       e.printStackTrace();
     }
+    Base.getPlatform().saveLanguage(language);
   }
   
   
diff --git a/app/src/processing/app/Platform.java b/app/src/processing/app/Platform.java
@@ -74,6 +74,7 @@ public void setLookAndFeel() throws Exception {
     }
   }
 
+  public void saveLanguage(String languageCode) {}
 
   public void init(Base base) {
     this.base = base;
@@ -216,4 +217,4 @@ protected void showLauncherWarning() {
                      null);
   }
   */
-}
+}
diff --git a/app/src/processing/app/platform/MacPlatform.java b/app/src/processing/app/platform/MacPlatform.java
@@ -24,6 +24,7 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 
 import com.apple.eio.FileManager;
 
@@ -47,6 +48,18 @@ public void setLookAndFeel() throws Exception {
   }
   */
 
+  public void saveLanguage(String language) {
+    String[] cmdarray = new String[]{
+      "defaults", "write",
+      System.getProperty("user.home") + "/Library/Preferences/org.processing.app",
+      "AppleLanguages", "-array", language
+    };
+    try {
+      Runtime.getRuntime().exec(cmdarray);
+    } catch (IOException e) {
+      Base.log("Error saving platform language: " + e.getMessage());
+    }
+  }
 
   public void init(Base base) {
     super.init(base);
@@ -205,4 +218,4 @@ protected String getLibraryFolder() throws FileNotFoundException {
   protected String getDocumentsFolder() throws FileNotFoundException {
     return FileManager.findFolder(kUserDomain, kDocumentsFolderType);
   }
-}
+}
diff --git a/build/build.xml b/build/build.xml
@@ -496,6 +496,8 @@
              value="macosx/work/Processing.app/Contents/Java" />
     </antcall>
 
+    <exec executable="macosx/language_gen.py" />
+
     <property name="launch4j.dir" value="macosx/work/Processing.app/Contents/Java/modes/java/application/launch4j" />
 
     <!-- rename the version we need -->
diff --git a/build/macosx/language_gen.py b/build/macosx/language_gen.py
@@ -0,0 +1,26 @@
+#!/usr/bin/python
+
+import os, re
+
+BASEDIR = os.path.dirname(os.path.realpath(__file__))
+
+def supported_languages():
+    path = "../../app/src/processing/app/languages/languages.txt"
+    with open(os.path.join(BASEDIR, path)) as f:
+        lines = f.read().splitlines()
+
+    lines = filter(lambda l: re.match(r'^[a-z]{2}', l), lines)
+    lines = map(lambda l: re.sub(r'#.*', '', l).strip(), lines)
+    return lines
+
+def lproj_directory(lang):
+    path = "work/Processing.app/Contents/Resources/{}.lproj".format(lang)
+    return os.path.join(BASEDIR, path)
+
+
+if __name__ == "__main__":
+    for lang in supported_languages():
+        try:
+            os.mkdir(lproj_directory(lang))
+        except OSError:
+            pass

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ private Language() {`
`87`	`87`
`88`	`88`	`static private String[] listSupported() {`
`89`	`89`	`// List of languages in alphabetical order. (Add yours here.)`
	`90`	`+ // Also remember to add it to the corresponding build/build.xml rule.`
`90`	`91`	`final String[] SUPPORTED = {`
`91`	`92`	`"de", // German, Deutsch`
`92`	`93`	`"en", // English`
`@@ -147,6 +148,7 @@ static public void saveLanguage(String language) {`
`147`	`148`	`} catch (Exception e) {`
`148`	`149`	`e.printStackTrace();`
`149`	`150`	`}`
	`151`	`+ Base.getPlatform().saveLanguage(language);`
`150`	`152`	`}`
`151`	`153`
`152`	`154`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ public void setLookAndFeel() throws Exception {`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
	`77`	`+ public void saveLanguage(String languageCode) {}`
`77`	`78`
`78`	`79`	`public void init(Base base) {`
`79`	`80`	`this.base = base;`
`@@ -216,4 +217,4 @@ protected void showLauncherWarning() {`
`216`	`217`	`null);`
`217`	`218`	`}`
`218`	`219`	`*/`
`219`		`-}`
	`220`	`+}`