From: James Moger <james.moger@gitblit.com>
Date: Fri, 25 Apr 2014 13:14:27 +0000 (-0400)
Subject: Refine localized strings
X-Git-Tag: v1.6.0~98^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0514f28dc561e030af42f6df00ff785594f72646;p=gitblit.git

Refine localized strings
---

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 89ccaa3d..0c56df54 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -678,5 +678,5 @@ gb.notifyChangedOpenTickets = send notification for changed open tickets
 gb.overdue = overdue
 gb.openMilestones = open milestones
 gb.closedMilestones = closed milestones
-gb.mytickets = my tickets
-gb.responsibleMeTickets = you are responsible of
\ No newline at end of file
+gb.myTickets = my tickets
+gb.yourAssignedTickets = assigned to you
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
index fc766ce2..a6d61842 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
@@ -670,5 +670,5 @@ gb.repositoryDoesNotAcceptPatchsets = Ce d
 gb.serverDoesNotAcceptPatchsets = Ce serveur n'accepte pas de patchsets.
 gb.ticketIsClosed = Ce ticket est clos.
 gb.mergeToDescription = default integration branch for merging ticket patchsets
-gb.mytickets = mes tickets
-gb.responsibleMeTickets = dont vous êtes responsable
+gb.myTickets = mes tickets
+gb.yourAssignedTickets = dont vous êtes responsable
diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html
index 68b4f045..b7172db5 100644
--- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html
@@ -17,7 +17,7 @@
 								<div style="display:inline-block;vertical-align:top;padding-right:2px;"><img wicket:id="userGravatar"></img></div>
 								<div style="display:inline-block;">
 									<div style="font-size:1.5em;" wicket:id="userDisplayName"></div>
-									<div style="color:#888;font-size:1.2em;"><wicket:message key="gb.mytickets"></wicket:message></div>
+									<div style="color:#888;font-size:1.2em;"><wicket:message key="gb.myTickets"></wicket:message></div>
 								</div>
 							</div>
 							
@@ -31,9 +31,9 @@
 								<li><a wicket:id="questionsQuery"><i class="fa fa-question"></i> <wicket:message key="gb.questionTickets"></wicket:message></a></li>
 								<li wicket:id="userDivider" class="divider"></li>
 								<li><a wicket:id="createdQuery"><i class="fa fa-user"></i> <wicket:message key="gb.yourCreatedTickets"></wicket:message></a></li>
+								<li><a wicket:id="responsibleQuery"><i class="fa fa-user"></i> <wicket:message key="gb.yourAssignedTickets"></wicket:message></a></li>
 								<li><a wicket:id="watchedQuery"><i class="fa fa-eye"></i> <wicket:message key="gb.yourWatchedTickets"></wicket:message></a></li>
 								<li><a wicket:id="mentionsQuery"><i class="fa fa-comment"></i> <wicket:message key="gb.mentionsMeTickets"></wicket:message></a></li>
-								<li><a wicket:id="responsibleQuery"><i class="fa fa-user"></i> <wicket:message key="gb.responsibleMeTickets"></wicket:message></a></li>
 								<li class="divider"></li>
 								<li><a wicket:id="resetQuery"><i class="fa fa-bolt"></i> <wicket:message key="gb.reset"></wicket:message></a></li>
 							</ul>
diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java
index 00b9e190..e2688580 100644
--- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java
@@ -56,7 +56,7 @@ public class MyTicketsPage extends RootPage {
 	public MyTicketsPage(PageParameters params)
 	{
 		super(params);
-		setupPage("", getString("gb.mytickets"));
+		setupPage("", getString("gb.myTickets"));
 
 		UserModel currentUser = GitBlitWebSession.get().getUser();
 		if (currentUser == null) {
diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java
index fb68208f..c59c1892 100644
--- a/src/main/java/com/gitblit/wicket/pages/RootPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java
@@ -173,7 +173,7 @@ public abstract class RootPage extends BasePage {
 			pages.add(new PageRegistration(isLoggedIn ? "gb.myDashboard" : "gb.dashboard", MyDashboardPage.class,
 					getRootPageParameters()));
 			if (isLoggedIn && app().tickets().isReady()) {
-				pages.add(new PageRegistration("gb.mytickets", MyTicketsPage.class));
+				pages.add(new PageRegistration("gb.myTickets", MyTicketsPage.class));
 			}
 			pages.add(new PageRegistration("gb.repositories", RepositoriesPage.class,
 					getRootPageParameters()));