From 419c22651defa99a3e52df20a5cb110c0bd755cd Mon Sep 17 00:00:00 2001 From: Federico Bond Date: Sun, 3 Aug 2014 13:37:55 -0300 Subject: [PATCH] Add missing translations for OS X menu --- app/src/processing/app/Base.java | 4 ++-- app/src/processing/app/languages/PDE.properties | 3 ++- app/src/processing/app/platform/ThinkDifferent.java | 11 ++++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index 373d09196..dd90a9cc6 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -1322,7 +1322,7 @@ public class Base { "An error occurred while trying to list the sketchbook.", e); } if (!found) { - JMenuItem empty = new JMenuItem("Empty Sketchbook"); + JMenuItem empty = new JMenuItem(Language.text("menu.file.sketchbook.empty")); empty.setEnabled(false); menu.add(empty); } @@ -1331,7 +1331,7 @@ public class Base { public JMenu getSketchbookMenu() { if (sketchbookMenu == null) { - sketchbookMenu = new JMenu(Language.text("sketchbook")); + sketchbookMenu = new JMenu(Language.text("menu.file.sketchbook")); rebuildSketchbookMenu(); } return sketchbookMenu; diff --git a/app/src/processing/app/languages/PDE.properties b/app/src/processing/app/languages/PDE.properties index 8c1e1a507..6b68ec339 100644 --- a/app/src/processing/app/languages/PDE.properties +++ b/app/src/processing/app/languages/PDE.properties @@ -15,6 +15,7 @@ menu.file.new = New menu.file.open = Open... menu.file.recent = Open Recent menu.file.sketchbook = Sketchbook... +menu.file.sketchbook.empty = Empty Sketchbook menu.file.examples = Examples... menu.file.close = Close menu.file.save = Save @@ -275,4 +276,4 @@ contributions.unsupported_operating_system = Your operating system doesn't appea warn.delete = Delete warn.delete.sketch = Are you sure you want to delete this sketch? -warn.delete.file = Are you sure you want to delete "%s"? \ No newline at end of file +warn.delete.file = Are you sure you want to delete "%s"? diff --git a/app/src/processing/app/platform/ThinkDifferent.java b/app/src/processing/app/platform/ThinkDifferent.java index e13db6f0b..9e2349f1e 100644 --- a/app/src/processing/app/platform/ThinkDifferent.java +++ b/app/src/processing/app/platform/ThinkDifferent.java @@ -29,6 +29,7 @@ import javax.swing.*; import processing.app.About; import processing.app.Base; import processing.app.Toolkit; +import processing.app.Language; import com.apple.eawt.*; @@ -116,9 +117,9 @@ public class ThinkDifferent implements ApplicationListener { */ static protected JMenu buildFileMenu(final Base base) { JMenuItem item; - JMenu fileMenu = new JMenu("File"); + JMenu fileMenu = new JMenu(Language.text("menu.file")); - item = Toolkit.newJMenuItem("New", 'N'); + item = Toolkit.newJMenuItem(Language.text("menu.file.new"), 'N'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { base.handleNew(); @@ -126,7 +127,7 @@ public class ThinkDifferent implements ApplicationListener { }); fileMenu.add(item); - item = Toolkit.newJMenuItem("Open...", 'O'); + item = Toolkit.newJMenuItem(Language.text("menu.file.open"), 'O'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { base.handleOpenPrompt(); @@ -136,7 +137,7 @@ public class ThinkDifferent implements ApplicationListener { fileMenu.add(base.getSketchbookMenu()); - item = Toolkit.newJMenuItemShift("Examples...", 'O'); + item = Toolkit.newJMenuItemShift(Language.text("menu.file.examples"), 'O'); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { base.thinkDifferentExamples(); @@ -206,4 +207,4 @@ public class ThinkDifferent implements ApplicationListener { public void handleReOpenApplication(ApplicationEvent arg0) { } -} \ No newline at end of file +}