From 332e93c9e8b2ef756ac2b2ec1055262046f988fa Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 30 Mar 2012 20:01:03 -0400
Subject: [PATCH] Merge pull request #10 from jonnybbb/master
---
src/com/gitblit/wicket/pages/RootPage.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RootPage.java b/src/com/gitblit/wicket/pages/RootPage.java
index d7b3ab7..deb2f4b 100644
--- a/src/com/gitblit/wicket/pages/RootPage.java
+++ b/src/com/gitblit/wicket/pages/RootPage.java
@@ -130,11 +130,11 @@
UserModel user = GitBlit.self().authenticate(username, password);
if (user == null) {
- error("Invalid username or password!");
+ error(getString("gb.invalidUsernameOrPassword"));
} else if (user.username.equals(Constants.FEDERATION_USER)) {
// disallow the federation user from logging in via the
// web ui
- error("Invalid username or password!");
+ error(getString("gb.invalidUsernameOrPassword"));
user = null;
} else {
loginUser(user);
@@ -162,9 +162,9 @@
} else if (showAdmin) {
int pendingProposals = GitBlit.self().getPendingFederationProposals().size();
if (pendingProposals == 1) {
- info("There is 1 federation proposal awaiting review.");
+ info(getString("gb.OneProposalToReview"));
} else if (pendingProposals > 1) {
- info(MessageFormat.format("There are {0} federation proposals awaiting review.",
+ info(MessageFormat.format(getString("gb.nFederationProposalsToReview"),
pendingProposals));
}
}
--
Gitblit v1.9.1