From 6cdd3f6a5e77717e280fae2a33b25a672d533bd5 Mon Sep 17 00:00:00 2001 From: George Bateman Date: Tue, 18 Nov 2014 19:24:16 +0000 Subject: [PATCH] Translate cut and copy in the edit menu. Also condense some code. --- app/src/processing/app/Editor.java | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index 2e89379d1..81426c182 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -733,11 +733,11 @@ public abstract class Editor extends JFrame implements RunnerListener { menu.addSeparator(); - cutItems = Toolkit.newJMenuItem("Cut", 'X'); + cutItems = Toolkit.newJMenuItem(Language.text("menu.edit.cut"), 'X'); cutItems.addActionListener(cutAction = new CutAction()); menu.add(cutItems); - copyItems = Toolkit.newJMenuItem("Copy", 'C'); + copyItems = Toolkit.newJMenuItem(Language.text("menu.edit.copy"), 'C'); copyItems.addActionListener(copyAction = new CopyAction()); menu.add(copyItems); @@ -1286,7 +1286,7 @@ public abstract class Editor extends JFrame implements RunnerListener { class CutAction extends AbstractAction { public CutAction() { - super("Cut"); + super(Language.text("menu.edit.cut")); this.setEnabled(false); } @@ -1296,11 +1296,7 @@ public abstract class Editor extends JFrame implements RunnerListener { } public void updateCutState() { - if (canCut()) { - cutItems.setEnabled(true); - } else { - cutItems.setEnabled(false); - } + cutItems.setEnabled(canCut()); } public boolean canCut() { @@ -1310,7 +1306,7 @@ public abstract class Editor extends JFrame implements RunnerListener { class CopyAction extends AbstractAction { public CopyAction() { - super("Copy"); + super(Language.text("menu.edit.copy")); this.setEnabled(false); } @@ -1319,11 +1315,7 @@ public abstract class Editor extends JFrame implements RunnerListener { } public void updateCopyState() { - if (canCopy()) { - copyItems.setEnabled(true); - } else { - copyItems.setEnabled(false); - } + copyItems.setEnabled(canCopy()); } public boolean canCopy() {