From 80c58327faaa4873369f6bb949e62792c2f708e0 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/BuildListDownloadErrorPanel.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/BuildListDownloadErrorPanel.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/BuildListDownloadErrorPanel.java
index 96786fb..3d1f387 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/BuildListDownloadErrorPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/ui/BuildListDownloadErrorPanel.java
@@ -27,11 +27,13 @@
package org.opends.quicksetup.upgrader.ui;
+import org.opends.messages.Message;
+import static org.opends.messages.QuickSetupMessages.*;
+
import org.opends.quicksetup.upgrader.RemoteBuildManager;
import org.opends.quicksetup.ui.CustomHTMLEditorKit;
import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.ui.WebProxyDialog;
-import org.opends.quicksetup.i18n.ResourceProvider;
import javax.swing.*;
import java.awt.*;
@@ -71,22 +73,21 @@
private void layoutPanel() {
setLayout(new GridBagLayout());
- String proxyString = getMsg("general-none");
+ String proxyString = INFO_GENERAL_NONE.get().toString();
Proxy proxy = rbm.getProxy();
if (proxy != null) {
SocketAddress addr = proxy.address();
proxyString = addr.toString();
}
- String baseContext = getMsg("general-unspecified");
+ String baseContext = INFO_GENERAL_UNSPECIFIED.get().toString();
URL url = rbm.getBaseContext();
if (url != null) {
baseContext = url.toString();
}
- String html =
- getMsg("upgrade-choose-version-build-list-error",
- baseContext,
+ Message html =
+ INFO_UPGRADE_CHOOSE_VERSION_BUILD_LIST_ERROR.get(baseContext,
reason.getLocalizedMessage(),
proxyString);
@@ -123,14 +124,6 @@
add(UIFactory.makeHtmlPane(html, ek, UIFactory.INSTRUCTIONS_FONT));
}
- private String getMsg(String key) {
- return ResourceProvider.getInstance().getMsg(key);
- }
-
- private String getMsg(String key, String... args) {
- return ResourceProvider.getInstance().getMsg(key, args);
- }
-
/**
* Displays a dialog prompting the user for proxy information
* after which applys the new proxy information to the available
--
Gitblit v1.10.0