From 6569dffdee2deb3da1c8ef8f9a5acce0154309aa Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 05 Mar 2014 11:31:22 -0500
Subject: [PATCH] Merge pull request #145 from yin8086/ChineseTrans
---
src/main/java/com/gitblit/wicket/pages/TicketPage.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index 0d60ec2..622f086 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -265,7 +265,7 @@
Label label = new Label("progress");
WicketUtils.setCssStyle(label, "width:" + progress + "%;");
milestoneProgress.add(label);
- WicketUtils.setHtmlTooltip(milestoneProgress, MessageFormat.format("{0} open, {1} closed", open, closed));
+ WicketUtils.setHtmlTooltip(milestoneProgress, MessageFormat.format(getString("gb.milestoneProgress"), open, closed));
add(milestoneProgress);
}
@@ -456,7 +456,7 @@
public void onClick(AjaxRequestTarget target) {
TicketMilestone milestone = getModel().getObject();
Change change = new Change(user.username);
- if (NIL.equals(milestone.name)) {
+ if (NIL.equals(milestone.name) || ESC_NIL.equals(milestone.name)) {
change.setField(Field.milestone, "");
} else {
change.setField(Field.milestone, milestone.name);
@@ -491,7 +491,7 @@
add(new Label("ticketTopic").setVisible(false));
} else {
// process the topic using the bugtraq config to link things
- String topic = messageProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.topic);
+ String topic = bugtraqProcessor().processPlainCommitMessage(getRepository(), repositoryName, ticket.topic);
add(new Label("ticketTopic", topic).setEscapeModelStrings(false));
}
--
Gitblit v1.9.1