"Boards" must be wrapped in _(...) call.

Shigeru KANEMOTO · Shigeru KANEMOTO · commit 27b8048fc60e · 2012-11-11T14:57:40.000+09:00
For internationalization, the word "Boards" must be wrapped directly in
_(...) call. The call was done in makeOrGetBoardMenu(). However, the second
call to makeOrGetBoardMenu() has the argument already wrapped by _(...).
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -1124,7 +1124,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");
@@ -1287,13 +1287,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;

Original file line number	Diff line number	Diff line change
`@@ -1124,7 +1124,7 @@ public void onBoardOrPortChange() {`
`1124`	`1124`	`}`
`1125`	`1125`
`1126`	`1126`	`public void rebuildBoardsMenu(JMenu toolsMenu, final Editor editor) {`
`1127`		`- JMenu boardsMenu = makeOrGetBoardMenu(toolsMenu, "Board");`
	`1127`	`+ JMenu boardsMenu = makeOrGetBoardMenu(toolsMenu, _("Board"));`
`1128`	`1128`
`1129`	`1129`	`String selPackage = Preferences.get("target_package");`
`1130`	`1130`	`String selPlatform = Preferences.get("target_platform");`
`@@ -1287,13 +1287,12 @@ private static boolean ifThereAreVisibleItemsOn(JMenu menu) {`
`1287`	`1287`	`}`
`1288`	`1288`
`1289`	`1289`	`private JMenu makeOrGetBoardMenu(JMenu toolsMenu, String label) {`
`1290`		`- String i18nLabel = _(label);`
`1291`	`1290`	`for (JMenu menu : Editor.boardsMenus) {`
`1292`		`- if (i18nLabel.equals(menu.getText())) {`
	`1291`	`+ if (label.equals(menu.getText())) {`
`1293`	`1292`	`return menu;`
`1294`	`1293`	`}`
`1295`	`1294`	`}`
`1296`		`- JMenu menu = new JMenu(i18nLabel);`
	`1295`	`+ JMenu menu = new JMenu(label);`
`1297`	`1296`	`Editor.boardsMenus.add(menu);`
`1298`	`1297`	`toolsMenu.add(menu);`
`1299`	`1298`	`return menu;`