Refine localized strings

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 89ccaa3ded7faafc71eee99df7a6599cd8ac38d0..0c56df5436a49cc2e5df1672b6cca012418c34b3 100644 (file)
--- 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 fc766ce2d09ade74f3ead93230f22e04cc45e566..a6d61842623401d440f07958e1d098b79be9eccd 100644 (file)
--- 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 68b4f045dbf187fc3fc0ef94d52711b3afbc7aac..b7172db5c689ad2804996c4228d1b06739569abe 100644 (file)
--- 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 00b9e190846d084170a1e2653b1a0f687c670567..e26885808f8c61f64ecda36fcb80f6c87c5b7a9c 100644 (file)
--- 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 fb68208f026241ac88fdf2e994f25f3f117946f0..c59c1892d00809beda3855ec3bafb5316572c2c3 100644 (file)
--- 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,\r
                                        getRootPageParameters()));\r
                        if (isLoggedIn && app().tickets().isReady()) {\r
-                               pages.add(new PageRegistration("gb.mytickets", MyTicketsPage.class));\r
+                               pages.add(new PageRegistration("gb.myTickets", MyTicketsPage.class));\r
                        }\r
                        pages.add(new PageRegistration("gb.repositories", RepositoriesPage.class,\r
                                        getRootPageParameters()));\r