From 3d1b428d612032539e9a070b2d31c7c24f265245 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 5 Mar 2014 10:53:01 -0500
Subject: Localize the ticket activity tab field name changes

---
 src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 9 ++++++++-
 src/main/java/com/gitblit/wicket/pages/TicketPage.java    | 6 +++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 5cc8b7f2..1a907bab 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -655,4 +655,11 @@ 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
+gb.nTotalTickets = {0} total
+gb.body = body
+gb.mergeSha = mergeSha
+gb.mergeTo = merge to
+gb.labels = labels
+gb.reviewers = reviewers
+gb.voters = voters
+gb.mentions = mentions
\ 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 622f0867..3c1dbdf9 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -895,7 +895,11 @@ public class TicketPage extends TicketBasePage {
 								break;
 						}
 						sb.append("<tr><th style=\"width:70px;\">");
-						sb.append(entry.getKey().name());
+						try {
+							sb.append(getString("gb." + entry.getKey().name()));
+						} catch (Exception e) {
+							sb.append(entry.getKey().name());
+						}
 						sb.append("</th><td>");
 						sb.append(value);
 						sb.append("</td></tr>");
-- 
cgit v1.2.3