additional edits to clean up #3025

processing · Apr 1, 2015 · 742884e · 742884e
1 parent 88b9e12
commit 742884e
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 104 deletions.
diff --git a/app/src/processing/app/Language.java b/app/src/processing/app/Language.java
@@ -131,7 +131,7 @@ static private String loadLanguage() {
       if (prefFile.exists()) {
         String language = PApplet.loadStrings(prefFile)[0];
         language = language.trim().toLowerCase();
-        if (!language.equals("")) {
+        if (language.trim().length() != 0) {
           return language;
         }
       }
@@ -207,7 +207,10 @@ static public Map<String, String> getLanguages() {
   }
 
 
-  /** Get current language */
+  /** 
+   * Get the current language.
+   * @return two digit ISO code (lowercase)  
+   */
   static public String getLanguage() {
     return init().language;
   }

diff --git a/app/src/processing/app/Toolkit.java b/app/src/processing/app/Toolkit.java
@@ -722,10 +722,14 @@ static public Font getMonoFont(int size, int style) {
         monoFont = createFont("SourceCodePro-Regular.ttf", size);
         //monoBoldFont = createFont("SourceCodePro-Semibold.ttf", size);
         monoBoldFont = createFont("SourceCodePro-Bold.ttf", size);
-        if (!monoFont.canDisplay(GREEK_SMALL_LETTER_ALPHA) ||
-            !monoFont.canDisplay(GREEK_CAPITAL_LETTER_OMEGA)) {
-          monoFont = createFont("Anonymous Pro.ttf", size);
-          monoBoldFont = createFont("Anonymous Pro B.ttf", size);
+
+        // additional language constraints
+        if ("el".equals(Language.getLanguage())) {
+          if (!monoFont.canDisplay(GREEK_SMALL_LETTER_ALPHA) ||
+              !monoFont.canDisplay(GREEK_CAPITAL_LETTER_OMEGA)) {
+            monoFont = createFont("AnonymousPro-Regular.ttf", size);
+            monoBoldFont = createFont("AnonymousPro-Bold.ttf", size);
+          }
         }
       } catch (Exception e) {
         Base.loge("Could not load mono font", e);
@@ -754,12 +758,15 @@ static public Font getSansFont(int size, int style) {
       try {
         sansFont = createFont("SourceSansPro-Regular.ttf", size);
         sansBoldFont = createFont("SourceSansPro-Semibold.ttf", size);
-        if (!sansFont.canDisplay(GREEK_SMALL_LETTER_ALPHA) ||
-            !sansFont.canDisplay(GREEK_CAPITAL_LETTER_OMEGA)) {
-          sansFont = createFont("Carlito-Regular.ttf", size);
-          sansBoldFont = createFont("Carlito-Bold.ttf", size);
+
+        // additional language constraints
+        if ("el".equals(Language.getLanguage())) {
+          if (!sansFont.canDisplay(GREEK_SMALL_LETTER_ALPHA) ||
+              !sansFont.canDisplay(GREEK_CAPITAL_LETTER_OMEGA)) {
+            sansFont = createFont("Carlito-Regular.ttf", size);
+            sansBoldFont = createFont("Carlito-Bold.ttf", size);
+          }
         }
-
       } catch (Exception e) {
         Base.loge("Could not load sans font", e);
         sansFont = new Font("SansSerif", Font.PLAIN, size);

diff --git a/build/shared/lib/fonts/Anonymous Pro B.ttf → build/shared/lib/fonts/AnonymousPro-Bold.ttf b/build/shared/lib/fonts/Anonymous Pro B.ttf → build/shared/lib/fonts/AnonymousPro-Bold.ttf
diff --git a/...hared/lib/fonts/Anonymous-Pro-LICENSE.txt → ...shared/lib/fonts/AnonymousPro-LICENSE.txt b/...hared/lib/fonts/Anonymous-Pro-LICENSE.txt → ...shared/lib/fonts/AnonymousPro-LICENSE.txt
diff --git a/build/shared/lib/fonts/Anonymous Pro.ttf → ...shared/lib/fonts/AnonymousPro-Regular.ttf b/build/shared/lib/fonts/Anonymous Pro.ttf → ...shared/lib/fonts/AnonymousPro-Regular.ttf
diff --git a/build/shared/lib/fonts/Carlito-LICENSE → build/shared/lib/fonts/Carlito-LICENSE.txt b/build/shared/lib/fonts/Carlito-LICENSE → build/shared/lib/fonts/Carlito-LICENSE.txt
diff --git a/build/shared/lib/fonts/LICENSE.txt b/build/shared/lib/fonts/LICENSE.txt
diff --git a/todo.txt b/todo.txt
@@ -16,6 +16,9 @@ _   don't return here, allow contrib types to fail:
 _   https://github.com/processing/processing/blob/master/app/src/processing/app/contrib/ContributionListing.java#L509
 _ trying to add a second tab with the same name causes an error
 
+_ Opening and closing preferences window prompts user to save unmodified sketch
+_   https://github.com/processing/processing/issues/3074
+
 _ implement line numbers in the editor
 _   5px between line number (right-aligned) and the right edge of the gutter
 _   ie textAlign(RIGHT) / text(lineNum, LEFT_GUTTER - 5, y)