Externalize some additional strings

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 49a57e9cfa07ba3c12e448a18ceed7aa712be424..5cc8b7f298cee00b8ee7b2db0ad37762722116bd 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -650,4 +650,9 @@ gb.hasNotReviewed = has not reviewed
 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 dde31a2a64232d2b2ad2194fb1bff3cf0da96a15..622f086705e03170b6b3d2019d784a3dd2997135 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -265,7 +265,7 @@ public class TicketPage extends TicketBasePage {
                        Label label = new Label("progress");\r
                        WicketUtils.setCssStyle(label, "width:" + progress + "%;");\r
                        milestoneProgress.add(label);\r
-                       WicketUtils.setHtmlTooltip(milestoneProgress, MessageFormat.format("{0} open, {1} closed", open, closed));\r
+                       WicketUtils.setHtmlTooltip(milestoneProgress, MessageFormat.format(getString("gb.milestoneProgress"), open, closed));\r
                        add(milestoneProgress);\r
                }\r
 \r

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.html b/src/main/java/com/gitblit/wicket/pages/TicketsPage.html
index 90544908d550d162f9cdaf0e8d44c3529bbabf21..07e6563f3c84f95b93df81f7e8656645ef2c24af 100644 (file)
--- 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">\r
                                        <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>\r
                                        <ul class="dropdown-menu">\r
-                                       <li><a wicket:id="openTickets">open</a></li>\r
-                                       <li><a wicket:id="closedTickets">closed</a></li>\r
-                                       <li><a wicket:id="allTickets">all</a></li>\r
+                                       <li><a wicket:id="openTickets"><wicket:message key="gb.open"></wicket:message></a></li>\r
+                                       <li><a wicket:id="closedTickets"><wicket:message key="gb.closed"></wicket:message></a></li>\r
+                                       <li><a wicket:id="allTickets"><wicket:message key="gb.all"></wicket:message></a></li>\r
                                        <li class="divider"></li>\r
                                        <li wicket:id="statii"><span wicket:id="statusLink"></span></li>\r
                                        </ul>\r

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
index 2d60481f4cc0771904f956b531afb0e43e81694e..489ed1aca316a635e55dfe8408f709285254a2dc 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketsPage.java
@@ -87,7 +87,7 @@ public class TicketsPage extends TicketBasePage {
                // set stateless page preference\r
                setStatelessHint(true);\r
 \r
-               any = new TicketResponsible("any", "[* TO *]", null);\r
+               any = new TicketResponsible(getString("gb.any"), "[* TO *]", null);\r
 \r
                UserModel user = GitBlitWebSession.get().getUser();\r
                boolean isAuthenticated = user != null && user.isAuthenticated;\r
@@ -185,16 +185,16 @@ public class TicketsPage extends TicketBasePage {
                        milestonePanel.add(label);\r
 \r
                        milestonePanel.add(new LinkPanel("openTickets", null,\r
-                                       currentMilestone.getOpenTickets() + " open",\r
+                                       MessageFormat.format(getString("gb.nOpenTickets"), currentMilestone.getOpenTickets()),\r
                                        TicketsPage.class,\r
                                        queryParameters(null, currentMilestone.name, openStatii, null, sortBy, desc, 1)));\r
 \r
                        milestonePanel.add(new LinkPanel("closedTickets", null,\r
-                                       currentMilestone.getClosedTickets() + " closed",\r
+                                       MessageFormat.format(getString("gb.nClosedTickets"), currentMilestone.getClosedTickets()),\r
                                        TicketsPage.class,\r
                                        queryParameters(null, currentMilestone.name, closedStatii, null, sortBy, desc, 1)));\r
 \r
-                       milestonePanel.add(new Label("totalTickets", currentMilestone.getTotalTickets() + " total"));\r
+                       milestonePanel.add(new Label("totalTickets", MessageFormat.format(getString("gb.nTotalTickets"), currentMilestone.getTotalTickets())));\r
                        add(milestonePanel);\r
                }\r
 \r