Localize the ticket activity tab field name changes

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 5cc8b7f298cee00b8ee7b2db0ad37762722116bd..1a907babfe8677f9d36cbbc117fad42f1498c8b8 100644 (file)
--- 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 622f086705e03170b6b3d2019d784a3dd2997135..3c1dbdf96a5acaa110336ba2cddba1ac2e5a135c 100644 (file)
--- 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;\r
                                                }\r
                                                sb.append("<tr><th style=\"width:70px;\">");\r
-                                               sb.append(entry.getKey().name());\r
+                                               try {\r
+                                                       sb.append(getString("gb." + entry.getKey().name()));\r
+                                               } catch (Exception e) {\r
+                                                       sb.append(entry.getKey().name());\r
+                                               }\r
                                                sb.append("</th><td>");\r
                                                sb.append(value);\r
                                                sb.append("</td></tr>");\r