From 9bdf88df00e9abf99442e14a33ed6215b32026b6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 02 Oct 2012 17:22:35 -0400
Subject: [PATCH] Use a custom redirect mechanism to workaround servlet container interference
---
src/com/gitblit/wicket/pages/ReviewProposalPage.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/ReviewProposalPage.java b/src/com/gitblit/wicket/pages/ReviewProposalPage.java
index 2b095f9..df7b1bc 100644
--- a/src/com/gitblit/wicket/pages/ReviewProposalPage.java
+++ b/src/com/gitblit/wicket/pages/ReviewProposalPage.java
@@ -46,7 +46,7 @@
FederationProposal proposal = GitBlit.self().getPendingFederationProposal(token);
if (proposal == null) {
- error("Could not find federation proposal!", true);
+ error(getString("gb.couldNotFindFederationProposal"), true);
}
setupPage(getString("gb.proposals"), proposal.url);
@@ -54,7 +54,7 @@
add(new Label("url", proposal.url));
add(new Label("message", proposal.message));
- add(WicketUtils.createTimestampLabel("received", proposal.received, getTimeZone()));
+ add(WicketUtils.createTimestampLabel("received", proposal.received, getTimeZone(), getTimeUtils()));
add(new Label("token", proposal.token));
add(new Label("tokenType", proposal.tokenType.name()));
--
Gitblit v1.9.1