From b7f591781f4bd2e3c94596a2b1f2cf73cdc0d7cd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 13 Oct 2011 17:01:51 -0400
Subject: [PATCH] Localized RPC client using server's resource file.
---
src/com/gitblit/client/GitblitClientLauncher.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/client/GitblitClientLauncher.java b/src/com/gitblit/client/GitblitClientLauncher.java
index 19e9efd..463dc96 100644
--- a/src/com/gitblit/client/GitblitClientLauncher.java
+++ b/src/com/gitblit/client/GitblitClientLauncher.java
@@ -25,6 +25,7 @@
import java.util.Collections;
import java.util.List;
+import com.gitblit.Constants;
import com.gitblit.Launcher;
import com.gitblit.build.Build;
import com.gitblit.build.Build.DownloadListener;
@@ -43,14 +44,13 @@
DownloadListener downloadListener = new DownloadListener() {
@Override
public void downloading(String name) {
- updateSplash(splash, "Downloading " + name + "...");
+ updateSplash(splash, Translation.get("gb.downloading") + " " + name + "...");
}
};
// download rpc client runtime dependencies
Build.rpcClient(downloadListener);
- updateSplash(splash, "Scanning Library Folder...");
File libFolder = new File("ext");
List<File> jars = Launcher.findJars(libFolder.getAbsoluteFile());
@@ -60,14 +60,14 @@
Collections.reverse(jars);
for (File jar : jars) {
try {
- updateSplash(splash, "Loading " + jar.getName() + "...");
+ updateSplash(splash, Translation.get("gb.loading") + " " + jar.getName() + "...");
Launcher.addJarFile(jar);
} catch (IOException e) {
}
}
- updateSplash(splash, "Starting Gitblit RPC Client...");
+ updateSplash(splash, Translation.get("gb.starting") + " Gitblit RPC Client...");
GitblitClient.main(args);
}
@@ -82,6 +82,8 @@
if (g != null) {
// Splash is 320x120
FontMetrics fm = g.getFontMetrics();
+
+ // paint startup status
g.setColor(Color.darkGray);
int h = fm.getHeight() + fm.getMaxDescent();
int x = 5;
@@ -93,6 +95,11 @@
g.setColor(Color.WHITE);
int xw = fm.stringWidth(string);
g.drawString(string, x + ((w - xw) / 2), y - 5);
+
+ // paint version
+ String ver = "v" + Constants.VERSION;
+ int vw = g.getFontMetrics().stringWidth(ver);
+ g.drawString(ver, 320 - vw - 5, 34);
g.dispose();
splash.update();
}
--
Gitblit v1.9.1