From 1e47ab18a003df93e749211271554981e3af7689 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 07 Apr 2011 17:59:56 -0400
Subject: [PATCH] Localized all strings for translation. Removed old resources.
---
src/com/gitblit/wicket/pages/TicGitTicketPage.java | 31 +++----------------------------
1 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/TicGitTicketPage.java b/src/com/gitblit/wicket/pages/TicGitTicketPage.java
index 76d9c1a..06a7a5a 100644
--- a/src/com/gitblit/wicket/pages/TicGitTicketPage.java
+++ b/src/com/gitblit/wicket/pages/TicGitTicketPage.java
@@ -1,7 +1,5 @@
package com.gitblit.wicket.pages;
-import java.util.List;
-
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -32,21 +30,9 @@
String openDate = GitBlitWebSession.get().formatDateTimeLong(t.date);
add(new Label("ticketOpenDate", openDate));
Label stateLabel = new Label("ticketState", t.state);
- String css = null;
- if (t.state.equals("open")) {
- css = "bug_open";
- } else if (t.state.equals("hold")) {
- css = "bug_hold";
- } else if (t.state.equals("resolved")) {
- css = "bug_resolved";
- } else if (t.state.equals("invalid")) {
- css = "bug_invalid";
- }
- if (css != null) {
- WicketUtils.setCssClass(stateLabel, css);
- }
+ WicketUtils.setTicketCssClass(stateLabel, t.state);
add(stateLabel);
- add(new Label("ticketTags", flattenStrings(t.tags)));
+ add(new Label("ticketTags", WicketUtils.flattenStrings(t.tags)));
ListDataProvider<Comment> commentsDp = new ListDataProvider<Comment>(t.comments);
DataView<Comment> commentsView = new DataView<Comment>("comment", commentsDp) {
@@ -63,26 +49,15 @@
}
};
add(commentsView);
-
- // footer
- addFooter();
}
@Override
protected String getPageName() {
- return "ticket";
+ return getString("gb.ticket");
}
private String prepareComment(String comment) {
String html = WicketUtils.breakLines(comment).trim();
return html.replaceAll("\\bcommit\\s*([A-Za-z0-9]*)\\b", "<a href=\"/commit/" + repositoryName + "/$1\">commit $1</a>");
- }
-
- private String flattenStrings(List<String> values) {
- StringBuilder sb = new StringBuilder();
- for (String value : values) {
- sb.append(value).append(" ");
- }
- return sb.toString().trim();
}
}
--
Gitblit v1.9.1