diff options
| author | James Moger <james.moger@gitblit.com> | 2011-05-28 17:05:34 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2011-05-28 17:05:34 -0400 |
| commit | 28d6b2a860740557bf93dd0f9a48d059379ed696 (patch) | |
| tree | 1a32491a9d2d42e08c40dc6707ff4cf6112a1771 /src/com/gitblit/utils/TimeUtils.java | |
| parent | 1f9daef870a8c7a984955166a542628d69012ed5 (diff) | |
| download | gitblit-28d6b2a860740557bf93dd0f9a48d059379ed696.tar.gz gitblit-28d6b2a860740557bf93dd0f9a48d059379ed696.zip | |
Unit testing. Removal of some unused code paths.
Diffstat (limited to 'src/com/gitblit/utils/TimeUtils.java')
| -rw-r--r-- | src/com/gitblit/utils/TimeUtils.java | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/src/com/gitblit/utils/TimeUtils.java b/src/com/gitblit/utils/TimeUtils.java index 16aea77c..ac8e2098 100644 --- a/src/com/gitblit/utils/TimeUtils.java +++ b/src/com/gitblit/utils/TimeUtils.java @@ -45,9 +45,9 @@ public class TimeUtils { public static String duration(int days) {
if (days <= 60) {
return days + (days > 1 ? " days" : " day");
- } else if (days <= 365) {
+ } else if (days < 365) {
int rem = days % 30;
- return (days / 30) + " months, " + rem + (rem > 1 ? " days" : " day");
+ return (days / 30) + (rem >= 15 ? 1 : 0) + " months";
} else {
int years = days / 365;
int rem = days % 365;
@@ -56,23 +56,17 @@ public class TimeUtils { if (rem == 0) {
return yearsString;
} else {
- return yearsString + ", " + rem + (rem > 1 ? " days" : " day");
+ return yearsString + (rem >= 15 ? ", 1 month" : "");
}
} else {
int months = rem / 30;
int remDays = rem % 30;
- String monthsString;
- if (months == 0) {
- monthsString = yearsString;
- } else {
- monthsString = yearsString + ", " + months
- + (months > 1 ? " months" : " month");
- }
- if (remDays == 0) {
- return monthsString;
- } else {
- return monthsString + ", " + remDays + (remDays > 1 ? " days" : " day");
+ if (remDays >= 15) {
+ months++;
}
+ String monthsString = yearsString + ", " + months
+ + (months > 1 ? " months" : " month");
+ return monthsString;
}
}
}
@@ -120,7 +114,7 @@ public class TimeUtils { String ago = null;
if (isToday(date) || isYesterday(date)) {
int mins = minutesAgo(date, true);
- if (mins > 120) {
+ if (mins >= 120) {
if (css) {
return "age1";
}
@@ -128,7 +122,7 @@ public class TimeUtils { if (hours > 23) {
ago = "yesterday";
} else {
- ago = hours + " hour" + (hours > 1 ? "s" : "") + " ago";
+ ago = hours + " hours ago";
}
} else {
if (css) {
@@ -158,8 +152,6 @@ public class TimeUtils { months++;
}
ago = months + " month" + (months > 1 ? "s" : "") + " ago";
- } else {
- ago = days + " day" + (days > 1 ? "s" : "") + " ago";
}
} else if (days == 365) {
ago = "1 year ago";
|