Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Additional patch for bug 375631 - New TASK column: Days to Due. r=fred

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@253028 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mozilla%kewis.ch
2008-07-14 14:09:30 +00:00
parent 80ed15bb6a
commit d9f3a5b131
2 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mozilla/calendar/base/content/calendar-task-tree.xml
View File

@@ -218,16 +218,26 @@
if (aTask && aTask.dueDate && aTask.dueDate.isValid){
var dur = aTask.dueDate.subtractDate(now());
if (!dur.isNegative) {
if (dur.days > 1) {
return dur.days + " " + calGetString("calendar", "days");
} else if (dur.days == 1) {
return "1 " + calGetString("calendar", "day");
} else if (dur.hours > 1) {
return dur.hours + " " + calGetString("calendar", "hours");
} else if (dur.hours == 1) {
return "1 " + calGetString("calendar", "hour");
} else
return "< 1" + calGetString("calendar", "hour");
// TODO MOZILLA_1_8_BRANCH We should use Pluralform.jsm on
// trunk here to provide better localization. Use different
// strings for 1,2 and N for now.
var minutes = Math.ceil(dur.inSeconds / 60);
if (minutes >= 4320) { // 3 days or more
return calGetString("calendar", "dueInDaysN", [dur.days]);
} else if (minutes >= 2880) { // 2 days or more
return calGetString("calendar", "dueInDays2");
} else if (minutes >= 1440) { // 1 day or more
return calGetString("calendar", "dueInDays1");
} else if (minutes >= 180) { // 3 hours or more
return calGetString("calendar", "dueInHoursN", [dur.hours]);
} else if (minutes >= 120) { // 2 hours or more
return calGetString("calendar", "dueInHours2");
} else if (minutes >= 60) { // 1 hour or more
return calGetString("calendar", "dueInHours1");
} else {
// Less than one hour
return calGetString("calendar", "dueInLessThanOneHour");
}
}
}
return null;

12
mozilla/calendar/locales/en-US/chrome/calendar/calendar.properties
View File

@@ -370,3 +370,15 @@ oneMonthForward=One Month Forward
oneWeekBack=One Week Back
oneWeekForward=One Week Forward
gotoToday=Go to Today
# Task tree, "Due In" column.
dueInDays1=1 day
# Used for "2 days"
dueInDays2=2 days
# Used for more than 2 days
dueInDaysN=%1$S days
dueInHours1=1 hour
dueInHours2=2 hours
dueInHoursN=%1$S hours
dueInLessThanOneHour=< 1 hour