From d00a0ca46fcde3e3e580afea6a548b9c12aeac25 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Jul 2012 17:18:02 -0400
Subject: [PATCH] Update to slf4j 1.6.6 and log4j 1.2.17
---
src/com/gitblit/wicket/pages/FederationRegistrationPage.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/FederationRegistrationPage.java b/src/com/gitblit/wicket/pages/FederationRegistrationPage.java
index e480eb7..19c30a5 100644
--- a/src/com/gitblit/wicket/pages/FederationRegistrationPage.java
+++ b/src/com/gitblit/wicket/pages/FederationRegistrationPage.java
@@ -41,7 +41,7 @@
FederationModel registration = GitBlit.self().getFederationRegistration(url, name);
if (registration == null) {
- error("Could not find federation registration!", true);
+ error(getString("gb.couldNotFindFederationRegistration"), true);
}
setupPage(registration.isResultData() ? getString("gb.federationResults")
@@ -52,8 +52,8 @@
add(new Label("frequency", registration.frequency));
add(new Label("folder", registration.folder));
add(new Label("token", showAdmin ? registration.token : "--"));
- add(WicketUtils.createTimestampLabel("lastPull", registration.lastPull, getTimeZone()));
- add(WicketUtils.createTimestampLabel("nextPull", registration.nextPull, getTimeZone()));
+ add(WicketUtils.createTimestampLabel("lastPull", registration.lastPull, getTimeZone(), getTimeUtils()));
+ add(WicketUtils.createTimestampLabel("nextPull", registration.nextPull, getTimeZone(), getTimeUtils()));
StringBuilder inclusions = new StringBuilder();
for (String inc : registration.inclusions) {
--
Gitblit v1.9.1