From 863d40a1c1f6591ef1ee8594b12ae4b0942fe810 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 5 Mar 2020 22:17:08 +0000 Subject: Made Enigma gui translatable (#193) * made enigma gui translatable * key renamings * missed strings * string.format() & another missed string * cached content (thanks @liach) * added a dialog when changing language * better sentence * more %s * liach's requests * empty map * the last (?) missed strings * IT WORKS * French translation * Update fr_fr.json --- src/main/java/cuchaz/enigma/gui/dialog/AboutDialog.java | 5 +++-- src/main/java/cuchaz/enigma/gui/dialog/CrashDialog.java | 11 ++++++----- src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java | 9 +++++---- src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java | 3 ++- src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java | 3 ++- 5 files changed, 18 insertions(+), 13 deletions(-) (limited to 'src/main/java/cuchaz/enigma/gui/dialog') diff --git a/src/main/java/cuchaz/enigma/gui/dialog/AboutDialog.java b/src/main/java/cuchaz/enigma/gui/dialog/AboutDialog.java index 7b3234d..82fd6a5 100644 --- a/src/main/java/cuchaz/enigma/gui/dialog/AboutDialog.java +++ b/src/main/java/cuchaz/enigma/gui/dialog/AboutDialog.java @@ -12,6 +12,7 @@ package cuchaz.enigma.gui.dialog; import cuchaz.enigma.Constants; +import cuchaz.enigma.utils.I18n; import cuchaz.enigma.utils.Utils; import javax.swing.*; @@ -22,7 +23,7 @@ public class AboutDialog { public static void show(JFrame parent) { // init frame - final JFrame frame = new JFrame(Constants.NAME + " - About"); + final JFrame frame = new JFrame(String.format(I18n.translate("menu.help.about.title"), Constants.NAME)); final Container pane = frame.getContentPane(); pane.setLayout(new FlowLayout()); @@ -52,7 +53,7 @@ public class AboutDialog { pane.add(linkPanel); // show ok button - JButton okButton = new JButton("Ok"); + JButton okButton = new JButton(I18n.translate("menu.help.about.ok")); pane.add(okButton); okButton.addActionListener(arg0 -> frame.dispose()); diff --git a/src/main/java/cuchaz/enigma/gui/dialog/CrashDialog.java b/src/main/java/cuchaz/enigma/gui/dialog/CrashDialog.java index 04dd5d7..7e66ecd 100644 --- a/src/main/java/cuchaz/enigma/gui/dialog/CrashDialog.java +++ b/src/main/java/cuchaz/enigma/gui/dialog/CrashDialog.java @@ -12,6 +12,7 @@ package cuchaz.enigma.gui.dialog; import cuchaz.enigma.Constants; +import cuchaz.enigma.utils.I18n; import cuchaz.enigma.utils.Utils; import javax.swing.*; @@ -28,11 +29,11 @@ public class CrashDialog { private CrashDialog(JFrame parent) { // init frame - frame = new JFrame(Constants.NAME + " - Crash Report"); + frame = new JFrame(String.format(I18n.translate("crash.title"), Constants.NAME)); final Container pane = frame.getContentPane(); pane.setLayout(new BorderLayout()); - JLabel label = new JLabel(Constants.NAME + " has crashed! =("); + JLabel label = new JLabel(String.format(I18n.translate("crash.summary"), Constants.NAME)); label.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); pane.add(label, BorderLayout.NORTH); @@ -46,14 +47,14 @@ public class CrashDialog { FlowLayout buttonsLayout = new FlowLayout(); buttonsLayout.setAlignment(FlowLayout.RIGHT); buttonsPanel.setLayout(buttonsLayout); - buttonsPanel.add(Utils.unboldLabel(new JLabel("If you choose exit, you will lose any unsaved work."))); - JButton ignoreButton = new JButton("Ignore"); + buttonsPanel.add(Utils.unboldLabel(new JLabel(I18n.translate("crash.exit.warning")))); + JButton ignoreButton = new JButton(I18n.translate("crash.ignore")); ignoreButton.addActionListener(event -> { // close (hide) the dialog frame.setVisible(false); }); buttonsPanel.add(ignoreButton); - JButton exitButton = new JButton("Exit"); + JButton exitButton = new JButton(I18n.translate("crash.exit")); exitButton.addActionListener(event -> { // exit enigma System.exit(1); diff --git a/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java b/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java index 84e4d8f..57811ee 100644 --- a/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java +++ b/src/main/java/cuchaz/enigma/gui/dialog/JavadocDialog.java @@ -11,6 +11,7 @@ package cuchaz.enigma.gui.dialog; +import cuchaz.enigma.utils.I18n; import cuchaz.enigma.utils.Utils; import javax.swing.*; @@ -26,7 +27,7 @@ public class JavadocDialog { private JavadocDialog(JFrame parent, JTextArea text, Callback callback) { // init frame - frame = new JFrame("Edit Javadocs"); + frame = new JFrame(I18n.translate("javadocs.edit")); final Container pane = frame.getContentPane(); pane.setLayout(new BorderLayout()); @@ -55,14 +56,14 @@ public class JavadocDialog { FlowLayout buttonsLayout = new FlowLayout(); buttonsLayout.setAlignment(FlowLayout.RIGHT); buttonsPanel.setLayout(buttonsLayout); - buttonsPanel.add(Utils.unboldLabel(new JLabel("Edit javadocs here."))); - JButton cancelButton = new JButton("Cancel"); + buttonsPanel.add(Utils.unboldLabel(new JLabel(I18n.translate("javadocs.instruction")))); + JButton cancelButton = new JButton(I18n.translate("javadocs.cancel")); cancelButton.addActionListener(event -> { // close (hide) the dialog callback.closeUi(frame, false); }); buttonsPanel.add(cancelButton); - JButton saveButton = new JButton("Save"); + JButton saveButton = new JButton(I18n.translate("javadocs.save")); saveButton.addActionListener(event -> { // exit enigma callback.closeUi(frame, true); diff --git a/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java b/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java index ae30667..6d9a419 100644 --- a/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java +++ b/src/main/java/cuchaz/enigma/gui/dialog/ProgressDialog.java @@ -13,6 +13,7 @@ package cuchaz.enigma.gui.dialog; import cuchaz.enigma.Constants; import cuchaz.enigma.ProgressListener; +import cuchaz.enigma.utils.I18n; import cuchaz.enigma.utils.Utils; import javax.swing.*; @@ -29,7 +30,7 @@ public class ProgressDialog implements ProgressListener, AutoCloseable { public ProgressDialog(JFrame parent) { // init frame - this.frame = new JFrame(Constants.NAME + " - Operation in progress"); + this.frame = new JFrame(String.format(I18n.translate("progress.operation"), Constants.NAME)); final Container pane = this.frame.getContentPane(); FlowLayout layout = new FlowLayout(); layout.setAlignment(FlowLayout.LEFT); diff --git a/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java b/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java index 1657d7b..47f9149 100644 --- a/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java +++ b/src/main/java/cuchaz/enigma/gui/dialog/SearchDialog.java @@ -14,6 +14,7 @@ package cuchaz.enigma.gui.dialog; import com.google.common.collect.Lists; import cuchaz.enigma.gui.Gui; import cuchaz.enigma.translation.representation.entry.ClassEntry; +import cuchaz.enigma.utils.I18n; import me.xdrop.fuzzywuzzy.FuzzySearch; import me.xdrop.fuzzywuzzy.model.ExtractedResult; @@ -45,7 +46,7 @@ public class SearchDialog { } public void show() { - frame = new JFrame("Search"); + frame = new JFrame(I18n.translate("menu.view.search")); frame.setVisible(false); JPanel pane = new JPanel(); pane.setBorder(new EmptyBorder(5, 10, 5, 10)); -- cgit v1.2.3