From 56d1c441d3b591c161e36e5a001cca83a7d17c93 Mon Sep 17 00:00:00 2001
From: Dongsu, KIM <ds5apn@gmail.com>
Date: Fri, 19 Jul 2013 05:39:08 -0400
Subject: [PATCH] Update Korean Translation
---
src/main/java/com/gitblit/wicket/pages/DashboardPage.java | 105 +++++++++++++++++++---------------------------------
1 files changed, 38 insertions(+), 67 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/DashboardPage.java b/src/main/java/com/gitblit/wicket/pages/DashboardPage.java
index 3c2828b..0af46c7 100644
--- a/src/main/java/com/gitblit/wicket/pages/DashboardPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/DashboardPage.java
@@ -15,10 +15,7 @@
*/
package com.gitblit.wicket.pages;
-import java.io.Serializable;
-import java.text.DateFormat;
import java.text.MessageFormat;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
@@ -55,7 +52,6 @@
import com.gitblit.wicket.charting.GoogleChart;
import com.gitblit.wicket.charting.GoogleCharts;
import com.gitblit.wicket.charting.GooglePieChart;
-import com.gitblit.wicket.ng.NgController;
import com.gitblit.wicket.panels.DigestsPanel;
import com.gitblit.wicket.panels.LinkPanel;
@@ -74,7 +70,7 @@
return true;
}
- protected void addActivity(UserModel user, Collection<RepositoryModel> repositories, boolean isStarred, int daysBack) {
+ protected void addActivity(UserModel user, Collection<RepositoryModel> repositories, String feedTitle, int daysBack) {
Calendar c = Calendar.getInstance();
c.add(Calendar.DATE, -1*daysBack);
Date minimumDate = c.getTime();
@@ -83,25 +79,38 @@
// create daily commit digest feed
List<DailyLogEntry> digests = new ArrayList<DailyLogEntry>();
for (RepositoryModel model : repositories) {
- Repository repository = GitBlit.self().getRepository(model.name);
- List<DailyLogEntry> entries = RefLogUtils.getDailyLogByRef(model.name, repository, minimumDate, timezone);
- digests.addAll(entries);
- repository.close();
+ if (model.isCollectingGarbage) {
+ continue;
+ }
+ if (model.hasCommits && model.lastChange.after(minimumDate)) {
+ Repository repository = GitBlit.self().getRepository(model.name);
+ List<DailyLogEntry> entries = RefLogUtils.getDailyLogByRef(model.name, repository, minimumDate, timezone);
+ digests.addAll(entries);
+ repository.close();
+ }
}
Fragment activityFragment = new Fragment("activity", "activityFragment", this);
add(activityFragment);
- activityFragment.add(new Label("feedTitle", getString( isStarred ? "gb.starredAndOwned" : "gb.recentActivity")));
+ activityFragment.add(new Label("feedTitle", feedTitle));
if (digests.size() == 0) {
// quiet or no starred repositories
if (repositories.size() == 0) {
if (UserModel.ANONYMOUS.equals(user)) {
- activityFragment.add(new Label("digests", MessageFormat.format(getString("gb.noActivity"), daysBack)));
+ if (daysBack == 1) {
+ activityFragment.add(new Label("digests", getString("gb.noActivityToday")));
+ } else {
+ activityFragment.add(new Label("digests", MessageFormat.format(getString("gb.noActivity"), daysBack)));
+ }
} else {
activityFragment.add(new LinkPanel("digests", null, getString("gb.findSomeRepositories"), RepositoriesPage.class));
}
} else {
- activityFragment.add(new Label("digests", MessageFormat.format(getString("gb.noActivity"), daysBack)));
+ if (daysBack == 1) {
+ activityFragment.add(new Label("digests", getString("gb.noActivityToday")));
+ } else {
+ activityFragment.add(new Label("digests", MessageFormat.format(getString("gb.noActivity"), daysBack)));
+ }
}
} else {
// show daily commit digest feed
@@ -132,51 +141,12 @@
}
}
- protected Fragment createNgList(String wicketId, String fragmentId, String ngController, List<RepositoryModel> repositories) {
- String format = GitBlit.getString(Keys.web.datestampShortFormat, "MM/dd/yy");
- final DateFormat df = new SimpleDateFormat(format);
- df.setTimeZone(getTimeZone());
-
- Fragment fragment = new Fragment(wicketId, fragmentId, this);
-
- List<RepoListItem> list = new ArrayList<RepoListItem>();
- for (RepositoryModel repo : repositories) {
- String name = StringUtils.stripDotGit(repo.name);
- String path = "";
- if (name.indexOf('/') > -1) {
- path = name.substring(0, name.lastIndexOf('/') + 1);
- name = name.substring(name.lastIndexOf('/') + 1);
- }
-
- RepoListItem item = new RepoListItem();
- item.n = name;
- item.p = path;
- item.r = repo.name;
- item.i = repo.description;
- item.s = GitBlit.self().getStarCount(repo);
- item.t = getTimeUtils().timeAgo(repo.lastChange);
- item.d = df.format(repo.lastChange);
- item.c = StringUtils.getColor(StringUtils.stripDotGit(repo.name));
- item.wc = repo.isBare ? 0 : 1;
- list.add(item);
- }
-
- // inject an AngularJS controller with static data
- NgController ctrl = new NgController(ngController);
- ctrl.addVariable(wicketId, list);
- add(new HeaderContributor(ctrl));
-
- return fragment;
- }
-
@Override
protected void addDropDownMenus(List<PageRegistration> pages) {
PageParameters params = getPageParameters();
DropDownMenuRegistration menu = new DropDownMenuRegistration("gb.filters",
GitBlitWebApp.HOME_PAGE_CLASS);
- // preserve time filter option on repository choices
- menu.menuItems.addAll(getRepositoryFilterItems(params));
// preserve repository filter option on time choices
menu.menuItems.addAll(getTimeFilterItems(params));
@@ -228,7 +198,23 @@
}
}
- frag.add(new Label("feedheader", MessageFormat.format(getString("gb.recentActivityStats"),
+ String headerPattern;
+ if (daysBack == 1) {
+ // today
+ if (totalCommits == 0) {
+ headerPattern = getString("gb.todaysActivityNone");
+ } else {
+ headerPattern = getString("gb.todaysActivityStats");
+ }
+ } else {
+ // multiple days
+ if (totalCommits == 0) {
+ headerPattern = getString("gb.recentActivityNone");
+ } else {
+ headerPattern = getString("gb.recentActivityStats");
+ }
+ }
+ frag.add(new Label("feedheader", MessageFormat.format(headerPattern,
daysBack, totalCommits, authorMetrics.size())));
// build google charts
@@ -254,20 +240,5 @@
add(new HeaderContributor(charts));
frag.add(new Fragment("charts", "chartsFragment", this));
- }
-
- protected class RepoListItem implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- String r; // repository
- String n; // name
- String p; // project/path
- String t; // time ago
- String d; // last updated
- String i; // information/description
- long s; // stars
- String c; // html color
- int wc; // working copy, 1 = true
}
}
--
Gitblit v1.9.1