Merge branch 'ide-1.5.x' of github.com:arduino/Arduino into ide-1.5.x

cmaglie · cmaglie · commit df23af53bdca · 2012-11-14T12:32:27.000+01:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -1158,7 +1158,7 @@ public void onBoardOrPortChange() {
   }
 
   public void rebuildBoardsMenu(JMenu toolsMenu, final Editor editor) {
-    JMenu boardsMenu = makeOrGetBoardMenu(toolsMenu, "Board");
+    JMenu boardsMenu = makeOrGetBoardMenu(toolsMenu, _("Board"));
 
     String selPackage = Preferences.get("target_package");
     String selPlatform = Preferences.get("target_platform");
@@ -1324,13 +1324,12 @@ private static boolean ifThereAreVisibleItemsOn(JMenu menu) {
   }
 
   private JMenu makeOrGetBoardMenu(JMenu toolsMenu, String label) {
-    String i18nLabel = _(label);
     for (JMenu menu : Editor.boardsMenus) {
-      if (i18nLabel.equals(menu.getText())) {
+      if (label.equals(menu.getText())) {
         return menu;
       }
     }
-    JMenu menu = new JMenu(i18nLabel);
+    JMenu menu = new JMenu(label);
     Editor.boardsMenus.add(menu);
     toolsMenu.add(menu);
     return menu;
diff --git a/app/src/processing/app/debug/TargetPlatform.java b/app/src/processing/app/debug/TargetPlatform.java
@@ -23,6 +23,8 @@
  */
 package processing.app.debug;
 
+import static processing.app.I18n._;
+
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
@@ -46,6 +48,12 @@ public TargetPlatform(String _name, File _folder) {
     programmers = new HashMap<String, PreferencesMap>();
     preferences = new PreferencesMap();
 
+    if (false) {
+      // Hack to extract this word by gettext tool.
+      // This word is actually defined in the "boards.txt".
+      String notused = _("Processor");
+    }
+
     try {
       File boardsFile = new File(_folder, "boards.txt");
       if (boardsFile.exists()) {

Original file line number	Diff line number	Diff line change
`@@ -1158,7 +1158,7 @@ public void onBoardOrPortChange() {`
`1158`	`1158`	`}`
`1159`	`1159`
`1160`	`1160`	`public void rebuildBoardsMenu(JMenu toolsMenu, final Editor editor) {`
`1161`		`- JMenu boardsMenu = makeOrGetBoardMenu(toolsMenu, "Board");`
	`1161`	`+ JMenu boardsMenu = makeOrGetBoardMenu(toolsMenu, _("Board"));`
`1162`	`1162`
`1163`	`1163`	`String selPackage = Preferences.get("target_package");`
`1164`	`1164`	`String selPlatform = Preferences.get("target_platform");`
`@@ -1324,13 +1324,12 @@ private static boolean ifThereAreVisibleItemsOn(JMenu menu) {`
`1324`	`1324`	`}`
`1325`	`1325`
`1326`	`1326`	`private JMenu makeOrGetBoardMenu(JMenu toolsMenu, String label) {`
`1327`		`- String i18nLabel = _(label);`
`1328`	`1327`	`for (JMenu menu : Editor.boardsMenus) {`
`1329`		`- if (i18nLabel.equals(menu.getText())) {`
	`1328`	`+ if (label.equals(menu.getText())) {`
`1330`	`1329`	`return menu;`
`1331`	`1330`	`}`
`1332`	`1331`	`}`
`1333`		`- JMenu menu = new JMenu(i18nLabel);`
	`1332`	`+ JMenu menu = new JMenu(label);`
`1334`	`1333`	`Editor.boardsMenus.add(menu);`
`1335`	`1334`	`toolsMenu.add(menu);`
`1336`	`1335`	`return menu;`