Upstream/SKCraft-Launcher
1
0
Fork 0
mirror of https://github.com/SKCraft/Launcher.git synced 2024-11-30 13:13:58 +01:00
Code Issues Projects Releases Wiki Activity

[Bootstrap] Rename _() to tr().

Browse Source
This commit is contained in:
sk89q 2015-07-24 17:06:42 -07:00
parent 8c1c871484
commit b06600a376
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
launcher-bootstrap/src/main/java/com/skcraft/launcher/Bootstrap.java
View File

@ -23,7 +23,7 @@ import java.net.URLClassLoader;
import java.util.*; import java.util.*;
import java.util.logging.Level; import java.util.logging.Level;
import static com.skcraft.launcher.bootstrap.SharedLocale._; import static com.skcraft.launcher.bootstrap.SharedLocale.tr;
@Log @Log
public class Bootstrap { public class Bootstrap {
@ -49,7 +49,7 @@ public class Bootstrap {
} catch (Throwable t) { } catch (Throwable t) {
Bootstrap.log.log(Level.WARNING, "Error", t); Bootstrap.log.log(Level.WARNING, "Error", t);
Bootstrap.setSwingLookAndFeel(); Bootstrap.setSwingLookAndFeel();
SwingHelper.showErrorDialog(null, _("errors.bootstrapError"), _("errorTitle"), t); SwingHelper.showErrorDialog(null, tr("errors.bootstrapError"), tr("errorTitle"), t);
} }
} }

12
launcher-bootstrap/src/main/java/com/skcraft/launcher/bootstrap/DownloadFrame.java
View File

@ -18,7 +18,7 @@ import java.awt.event.WindowEvent;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
import static com.skcraft.launcher.bootstrap.SharedLocale._; import static com.skcraft.launcher.bootstrap.SharedLocale.tr;
@Log @Log
public class DownloadFrame extends JFrame { public class DownloadFrame extends JFrame {
@ -31,13 +31,13 @@ public class DownloadFrame extends JFrame {
private final JPanel textAreaPanel = new JPanel(new BorderLayout()); private final JPanel textAreaPanel = new JPanel(new BorderLayout());
private final JProgressBar progressBar = new JProgressBar(); private final JProgressBar progressBar = new JProgressBar();
private final LinedBoxPanel buttonsPanel = new LinedBoxPanel(true); private final LinedBoxPanel buttonsPanel = new LinedBoxPanel(true);
private final JButton cancelButton = new JButton(_("button.cancal")); private final JButton cancelButton = new JButton(tr("button.cancal"));
public DownloadFrame(ProgressObservable observable) { public DownloadFrame(ProgressObservable observable) {
super(_("downloader.title")); super(tr("downloader.title"));
setResizable(false); setResizable(false);
initComponents(); initComponents();
label.setText(_("downloader.pleaseWait")); label.setText(tr("downloader.pleaseWait"));
setMinimumSize(new Dimension(400, 100)); setMinimumSize(new Dimension(400, 100));
pack(); pack();
setLocationRelativeTo(null); setLocationRelativeTo(null);
@ -87,7 +87,7 @@ public class DownloadFrame extends JFrame {
} }
private boolean confirmCancel() { private boolean confirmCancel() {
return SwingHelper.confirmDialog(this, _("progress.confirmCancel"), _("progress.confirmCancelTitle")); return SwingHelper.confirmDialog(this, tr("progress.confirmCancel"), tr("progress.confirmCancelTitle"));
} }
private void cancel() { private void cancel() {
@ -138,7 +138,7 @@ public class DownloadFrame extends JFrame {
progressBar.setValue((int) (1000 * progress)); progressBar.setValue((int) (1000 * progress));
} }
} else { } else {
label.setText(_("downloader.pleaseWait")); label.setText(tr("downloader.pleaseWait"));
progressBar.setIndeterminate(true); progressBar.setIndeterminate(true);
} }
} }

8
launcher-bootstrap/src/main/java/com/skcraft/launcher/bootstrap/Downloader.java
View File

@ -20,7 +20,7 @@ import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import static com.skcraft.launcher.bootstrap.BootstrapUtils.checkInterrupted; import static com.skcraft.launcher.bootstrap.BootstrapUtils.checkInterrupted;
import static com.skcraft.launcher.bootstrap.SharedLocale._; import static com.skcraft.launcher.bootstrap.SharedLocale.tr;
@Log @Log
public class Downloader implements Runnable, ProgressObservable { public class Downloader implements Runnable, ProgressObservable {
@ -45,7 +45,7 @@ public class Downloader implements Runnable, ProgressObservable {
System.exit(0); System.exit(0);
} catch (Throwable t) { } catch (Throwable t) {
log.log(Level.WARNING, "Failed to download launcher", t); log.log(Level.WARNING, "Failed to download launcher", t);
SwingHelper.showErrorDialog(null, _("errors.failedDownloadError"), _("errorTitle"), t); SwingHelper.showErrorDialog(null, tr("errors.failedDownloadError"), tr("errorTitle"), t);
System.exit(0); System.exit(0);
} }
} }
@ -128,11 +128,11 @@ public class Downloader implements Runnable, ProgressObservable {
if (httpRequest != null) { if (httpRequest != null) {
double progress = httpRequest.getProgress(); double progress = httpRequest.getProgress();
if (progress >= 0) { if (progress >= 0) {
return String.format(_("downloader.progressStatus"), progress * 100); return String.format(tr("downloader.progressStatus"), progress * 100);
} }
} }
return _("downloader.status"); return tr("downloader.status");
} }
@Override @Override

6
launcher-bootstrap/src/main/java/com/skcraft/launcher/bootstrap/SharedLocale.java
View File

@ -50,7 +50,7 @@ public class SharedLocale {
* @param key the key * @param key the key
* @return the translated string * @return the translated string
*/ */
public static String _(String key) { public static String tr(String key) {
if (bundle != null) { if (bundle != null) {
try { try {
return bundle.getString(key); return bundle.getString(key);
@ -71,10 +71,10 @@ public class SharedLocale {
* @param args arguments * @param args arguments
* @return a translated string * @return a translated string
*/ */
public static String _(String key, Object... args) { public static String tr(String key, Object... args) {
if (bundle != null) { if (bundle != null) {
try { try {
MessageFormat formatter = new MessageFormat(_(key)); MessageFormat formatter = new MessageFormat(tr(key));
formatter.setLocale(getLocale()); formatter.setLocale(getLocale());
return formatter.format(args); return formatter.format(args);
} catch (MissingResourceException e) { } catch (MissingResourceException e) {

4
launcher-bootstrap/src/main/java/com/skcraft/launcher/bootstrap/SwingHelper.java
View File

@ -22,7 +22,7 @@ import java.lang.reflect.InvocationTargetException;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import static com.skcraft.launcher.bootstrap.BootstrapUtils.closeQuietly; import static com.skcraft.launcher.bootstrap.BootstrapUtils.closeQuietly;
import static com.skcraft.launcher.bootstrap.SharedLocale._; import static com.skcraft.launcher.bootstrap.SharedLocale.tr;
/** /**
* Swing utility methods. * Swing utility methods.
@ -114,7 +114,7 @@ public final class SwingHelper {
// Add the extra details // Add the extra details
if (detailsText != null) { if (detailsText != null) {
JTextArea textArea = new JTextArea(_("errorDialog.reportError") + "\n\n" + detailsText); JTextArea textArea = new JTextArea(tr("errorDialog.reportError") + "\n\n" + detailsText);
JLabel tempLabel = new JLabel(); JLabel tempLabel = new JLabel();
textArea.setFont(tempLabel.getFont()); textArea.setFont(tempLabel.getFont());
textArea.setBackground(tempLabel.getBackground()); textArea.setBackground(tempLabel.getBackground());