From d1231c63669f4bc3643985b9032de7f998612e08 Mon Sep 17 00:00:00 2001
From: Jason Pyeron <jpyeron@pdinc.us>
Date: Sun, 19 Aug 2012 21:35:52 -0400
Subject: [PATCH] fixed build to allow builds where a proxy is needed for access to outside resources see: http://ant.apache.org/manual/proxy.html
---
src/com/gitblit/wicket/pages/SendProposalPage.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/SendProposalPage.java b/src/com/gitblit/wicket/pages/SendProposalPage.java
index a7fcadc..aa9c03a 100644
--- a/src/com/gitblit/wicket/pages/SendProposalPage.java
+++ b/src/com/gitblit/wicket/pages/SendProposalPage.java
@@ -59,7 +59,7 @@
// temporary proposal
FederationProposal proposal = GitBlit.self().createFederationProposal(myUrl, token);
if (proposal == null) {
- error("Could not create federation proposal!", true);
+ error(getString("gb.couldNotCreateFederationProposal"), true);
}
CompoundPropertyModel<SendProposalPage> model = new CompoundPropertyModel<SendProposalPage>(
@@ -72,11 +72,11 @@
protected void onSubmit() {
// confirm a repository name was entered
if (StringUtils.isEmpty(myUrl)) {
- error("Please enter your Gitblit url!");
+ error(getString("gb.pleaseSetGitblitUrl"));
return;
}
if (StringUtils.isEmpty(destinationUrl)) {
- error("Please enter a destination url for your proposal!");
+ error(getString("gb.pleaseSetDestinationUrl"));
return;
}
@@ -89,32 +89,29 @@
.propose(destinationUrl, proposal);
switch (res) {
case ACCEPTED:
- info(MessageFormat.format("Proposal successfully received by {0}.",
+ info(MessageFormat.format(getString("gb.proposalReceived"),
destinationUrl));
setResponsePage(RepositoriesPage.class);
break;
case NO_POKE:
- error(MessageFormat.format(
- "Sorry, {0} could not find a Gitblit instance at {1}.",
+ error(MessageFormat.format(getString("noGitblitFound"),
destinationUrl, myUrl));
break;
case NO_PROPOSALS:
- error(MessageFormat.format(
- "Sorry, {0} is not accepting proposals at this time.",
+ error(MessageFormat.format(getString("gb.noProposals"),
destinationUrl));
break;
case FEDERATION_DISABLED:
error(MessageFormat
- .format("Sorry, {0} is not configured to federate with any Gitblit instances.",
+ .format(getString("gb.noFederation"),
destinationUrl));
break;
case MISSING_DATA:
- error(MessageFormat.format("Sorry, {0} did not receive any proposal data!",
+ error(MessageFormat.format(getString("gb.proposalFailed"),
destinationUrl));
break;
case ERROR:
- error(MessageFormat.format(
- "Sorry, {0} reports that an unexpected error occurred!",
+ error(MessageFormat.format(getString("gb.proposalError"),
destinationUrl));
break;
}
@@ -122,7 +119,7 @@
if (!StringUtils.isEmpty(e.getMessage())) {
error(e.getMessage());
} else {
- error("Failed to send proposal!");
+ error(getString("gb.failedToSendProposal"));
}
}
}
--
Gitblit v1.9.1