From 9f50fd56848e8b5ff70eba7054035ecb1b2d9a36 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 05 Mar 2014 08:07:36 -0500
Subject: [PATCH] Externalize some additional strings
---
src/main/java/com/gitblit/wicket/pages/TicketsPage.java | 8 ++++----
src/main/java/com/gitblit/wicket/pages/TicketPage.java | 2 +-
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 7 ++++++-
src/main/java/com/gitblit/wicket/pages/TicketsPage.html | 6 +++---
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 49a57e9..5cc8b7f 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -650,4 +650,9 @@
gb.about = about
gb.ticketN = ticket #{0}
gb.disableUser = disable user
-gb.disableUserDescription = prevent this account from authenticating
\ No newline at end of file
+gb.disableUserDescription = prevent this account from authenticating
+gb.any = any
+gb.milestoneProgress = {0} open, {1} closed
+gb.nOpenTickets = {0} open
+gb.nClosedTickets = {0} closed
+gb.nTotalTickets = {0} total
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index dde31a2..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);
}
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html
index 9054490..07e6563 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html
@@ -53,9 +53,9 @@
<div class="btn-group">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#"><wicket:message key="gb.status"></wicket:message>: <span style="font-weight:bold;" wicket:id="selectedStatii"></span> <span class="caret"></span></a>
<ul class="dropdown-menu">
- <li><a wicket:id="openTickets">open</a></li>
- <li><a wicket:id="closedTickets">closed</a></li>
- <li><a wicket:id="allTickets">all</a></li>
+ <li><a wicket:id="openTickets"><wicket:message key="gb.open"></wicket:message></a></li>
+ <li><a wicket:id="closedTickets"><wicket:message key="gb.closed"></wicket:message></a></li>
+ <li><a wicket:id="allTickets"><wicket:message key="gb.all"></wicket:message></a></li>
<li class="divider"></li>
<li wicket:id="statii"><span wicket:id="statusLink"></span></li>
</ul>
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
index 2d60481..489ed1a 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
@@ -87,7 +87,7 @@
// set stateless page preference
setStatelessHint(true);
- any = new TicketResponsible("any", "[* TO *]", null);
+ any = new TicketResponsible(getString("gb.any"), "[* TO *]", null);
UserModel user = GitBlitWebSession.get().getUser();
boolean isAuthenticated = user != null && user.isAuthenticated;
@@ -185,16 +185,16 @@
milestonePanel.add(label);
milestonePanel.add(new LinkPanel("openTickets", null,
- currentMilestone.getOpenTickets() + " open",
+ MessageFormat.format(getString("gb.nOpenTickets"), currentMilestone.getOpenTickets()),
TicketsPage.class,
queryParameters(null, currentMilestone.name, openStatii, null, sortBy, desc, 1)));
milestonePanel.add(new LinkPanel("closedTickets", null,
- currentMilestone.getClosedTickets() + " closed",
+ MessageFormat.format(getString("gb.nClosedTickets"), currentMilestone.getClosedTickets()),
TicketsPage.class,
queryParameters(null, currentMilestone.name, closedStatii, null, sortBy, desc, 1)));
- milestonePanel.add(new Label("totalTickets", currentMilestone.getTotalTickets() + " total"));
+ milestonePanel.add(new Label("totalTickets", MessageFormat.format(getString("gb.nTotalTickets"), currentMilestone.getTotalTickets())));
add(milestonePanel);
}
--
Gitblit v1.9.1