James Moger
2014-03-05 9f50fd56848e8b5ff70eba7054035ecb1b2d9a36
Externalize some additional strings
4 files modified
23 ■■■■■ changed files
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties 7 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/TicketPage.java 2 ●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/TicketsPage.html 6 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/TicketsPage.java 8 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -650,4 +650,9 @@
gb.about = about
gb.ticketN = ticket #{0}
gb.disableUser = disable user
gb.disableUserDescription = prevent this account from authenticating
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
src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -265,7 +265,7 @@
            Label label = new Label("progress");
            WicketUtils.setCssStyle(label, "width:" + progress + "%;");
            milestoneProgress.add(label);
            WicketUtils.setHtmlTooltip(milestoneProgress, MessageFormat.format("{0} open, {1} closed", open, closed));
            WicketUtils.setHtmlTooltip(milestoneProgress, MessageFormat.format(getString("gb.milestoneProgress"), open, closed));
            add(milestoneProgress);
        }
src/main/java/com/gitblit/wicket/pages/TicketsPage.html
@@ -53,9 +53,9 @@
                <div class="btn-group">
                      <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>
                      <ul class="dropdown-menu">
                        <li><a wicket:id="openTickets">open</a></li>
                        <li><a wicket:id="closedTickets">closed</a></li>
                        <li><a wicket:id="allTickets">all</a></li>
                        <li><a wicket:id="openTickets"><wicket:message key="gb.open"></wicket:message></a></li>
                        <li><a wicket:id="closedTickets"><wicket:message key="gb.closed"></wicket:message></a></li>
                        <li><a wicket:id="allTickets"><wicket:message key="gb.all"></wicket:message></a></li>
                        <li class="divider"></li>
                        <li wicket:id="statii"><span wicket:id="statusLink"></span></li>
                      </ul>
src/main/java/com/gitblit/wicket/pages/TicketsPage.java
@@ -87,7 +87,7 @@
        // set stateless page preference
        setStatelessHint(true);
        any = new TicketResponsible("any", "[* TO *]", null);
        any = new TicketResponsible(getString("gb.any"), "[* TO *]", null);
        UserModel user = GitBlitWebSession.get().getUser();
        boolean isAuthenticated = user != null && user.isAuthenticated;
@@ -185,16 +185,16 @@
            milestonePanel.add(label);
            milestonePanel.add(new LinkPanel("openTickets", null,
                    currentMilestone.getOpenTickets() + " open",
                    MessageFormat.format(getString("gb.nOpenTickets"), currentMilestone.getOpenTickets()),
                    TicketsPage.class,
                    queryParameters(null, currentMilestone.name, openStatii, null, sortBy, desc, 1)));
            milestonePanel.add(new LinkPanel("closedTickets", null,
                    currentMilestone.getClosedTickets() + " closed",
                    MessageFormat.format(getString("gb.nClosedTickets"), currentMilestone.getClosedTickets()),
                    TicketsPage.class,
                    queryParameters(null, currentMilestone.name, closedStatii, null, sortBy, desc, 1)));
            milestonePanel.add(new Label("totalTickets", currentMilestone.getTotalTickets() + " total"));
            milestonePanel.add(new Label("totalTickets", MessageFormat.format(getString("gb.nTotalTickets"), currentMilestone.getTotalTickets())));
            add(milestonePanel);
        }