зеркало из https://github.com/microsoft/git.git
i18n: mark relative dates for translation
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder
Junio C Hamano
Родитель
9a0a30aa4b
Коммит
7d29afd43c
6
cache.h
6
cache.h
|
|
@ -920,10 +920,8 @@ enum date_mode {
|
|||
};
|
||||
|
||||
const char *show_date(unsigned long time, int timezone, enum date_mode mode);
|
||||
const char *show_date_relative(unsigned long time, int tz,
|
||||
const struct timeval *now,
|
||||
char *timebuf,
|
||||
size_t timebuf_size);
|
||||
void show_date_relative(unsigned long time, int tz, const struct timeval *now,
|
||||
struct strbuf *timebuf);
|
||||
int parse_date(const char *date, char *buf, int bufsize);
|
||||
int parse_date_basic(const char *date, unsigned long *timestamp, int *offset);
|
||||
void datestamp(char *buf, int bufsize);
|
||||
|
|
|
|||
95
date.c
95
date.c
|
|
@ -86,83 +86,98 @@ static int local_tzoffset(unsigned long time)
|
|||
return offset * eastwest;
|
||||
}
|
||||
|
||||
const char *show_date_relative(unsigned long time, int tz,
|
||||
void show_date_relative(unsigned long time, int tz,
|
||||
const struct timeval *now,
|
||||
char *timebuf,
|
||||
size_t timebuf_size)
|
||||
struct strbuf *timebuf)
|
||||
{
|
||||
unsigned long diff;
|
||||
if (now->tv_sec < time)
|
||||
return "in the future";
|
||||
if (now->tv_sec < time) {
|
||||
strbuf_addstr(timebuf, _("in the future"));
|
||||
return;
|
||||
}
|
||||
diff = now->tv_sec - time;
|
||||
if (diff < 90) {
|
||||
snprintf(timebuf, timebuf_size, "%lu seconds ago", diff);
|
||||
return timebuf;
|
||||
strbuf_addf(timebuf,
|
||||
Q_("%lu second ago", "%lu seconds ago", diff), diff);
|
||||
return;
|
||||
}
|
||||
/* Turn it into minutes */
|
||||
diff = (diff + 30) / 60;
|
||||
if (diff < 90) {
|
||||
snprintf(timebuf, timebuf_size, "%lu minutes ago", diff);
|
||||
return timebuf;
|
||||
strbuf_addf(timebuf,
|
||||
Q_("%lu minute ago", "%lu minutes ago", diff), diff);
|
||||
return;
|
||||
}
|
||||
/* Turn it into hours */
|
||||
diff = (diff + 30) / 60;
|
||||
if (diff < 36) {
|
||||
snprintf(timebuf, timebuf_size, "%lu hours ago", diff);
|
||||
return timebuf;
|
||||
strbuf_addf(timebuf,
|
||||
Q_("%lu hour ago", "%lu hours ago", diff), diff);
|
||||
return;
|
||||
}
|
||||
/* We deal with number of days from here on */
|
||||
diff = (diff + 12) / 24;
|
||||
if (diff < 14) {
|
||||
snprintf(timebuf, timebuf_size, "%lu days ago", diff);
|
||||
return timebuf;
|
||||
strbuf_addf(timebuf,
|
||||
Q_("%lu day ago", "%lu days ago", diff), diff);
|
||||
return;
|
||||
}
|
||||
/* Say weeks for the past 10 weeks or so */
|
||||
if (diff < 70) {
|
||||
snprintf(timebuf, timebuf_size, "%lu weeks ago", (diff + 3) / 7);
|
||||
return timebuf;
|
||||
strbuf_addf(timebuf,
|
||||
Q_("%lu week ago", "%lu weeks ago", (diff + 3) / 7),
|
||||
(diff + 3) / 7);
|
||||
return;
|
||||
}
|
||||
/* Say months for the past 12 months or so */
|
||||
if (diff < 365) {
|
||||
snprintf(timebuf, timebuf_size, "%lu months ago", (diff + 15) / 30);
|
||||
return timebuf;
|
||||
strbuf_addf(timebuf,
|
||||
Q_("%lu month ago", "%lu months ago", (diff + 15) / 30),
|
||||
(diff + 15) / 30);
|
||||
return;
|
||||
}
|
||||
/* Give years and months for 5 years or so */
|
||||
if (diff < 1825) {
|
||||
unsigned long totalmonths = (diff * 12 * 2 + 365) / (365 * 2);
|
||||
unsigned long years = totalmonths / 12;
|
||||
unsigned long months = totalmonths % 12;
|
||||
int n;
|
||||
n = snprintf(timebuf, timebuf_size, "%lu year%s",
|
||||
years, (years > 1 ? "s" : ""));
|
||||
if (months)
|
||||
snprintf(timebuf + n, timebuf_size - n,
|
||||
", %lu month%s ago",
|
||||
months, (months > 1 ? "s" : ""));
|
||||
else
|
||||
snprintf(timebuf + n, timebuf_size - n, " ago");
|
||||
return timebuf;
|
||||
if (months) {
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
strbuf_addf(&sb, Q_("%lu year", "%lu years", years), years);
|
||||
/* TRANSLATORS: "%s" is "<n> years" */
|
||||
strbuf_addf(timebuf,
|
||||
Q_("%s, %lu month ago", "%s, %lu months ago", months),
|
||||
sb.buf, months);
|
||||
strbuf_release(&sb);
|
||||
} else
|
||||
strbuf_addf(timebuf,
|
||||
Q_("%lu year ago", "%lu years ago", years), years);
|
||||
return;
|
||||
}
|
||||
/* Otherwise, just years. Centuries is probably overkill. */
|
||||
snprintf(timebuf, timebuf_size, "%lu years ago", (diff + 183) / 365);
|
||||
return timebuf;
|
||||
strbuf_addf(timebuf,
|
||||
Q_("%lu year ago", "%lu years ago", (diff + 183) / 365),
|
||||
(diff + 183) / 365);
|
||||
}
|
||||
|
||||
const char *show_date(unsigned long time, int tz, enum date_mode mode)
|
||||
{
|
||||
struct tm *tm;
|
||||
static char timebuf[200];
|
||||
static struct strbuf timebuf = STRBUF_INIT;
|
||||
|
||||
if (mode == DATE_RAW) {
|
||||
snprintf(timebuf, sizeof(timebuf), "%lu %+05d", time, tz);
|
||||
return timebuf;
|
||||
strbuf_reset(&timebuf);
|
||||
strbuf_addf(&timebuf, "%lu %+05d", time, tz);
|
||||
return timebuf.buf;
|
||||
}
|
||||
|
||||
if (mode == DATE_RELATIVE) {
|
||||
struct timeval now;
|
||||
|
||||
strbuf_reset(&timebuf);
|
||||
gettimeofday(&now, NULL);
|
||||
return show_date_relative(time, tz, &now,
|
||||
timebuf, sizeof(timebuf));
|
||||
show_date_relative(time, tz, &now, &timebuf);
|
||||
return timebuf.buf;
|
||||
}
|
||||
|
||||
if (mode == DATE_LOCAL)
|
||||
|
|
@ -171,23 +186,25 @@ const char *show_date(unsigned long time, int tz, enum date_mode mode)
|
|||
tm = time_to_tm(time, tz);
|
||||
if (!tm)
|
||||
return NULL;
|
||||
|
||||
strbuf_reset(&timebuf);
|
||||
if (mode == DATE_SHORT)
|
||||
sprintf(timebuf, "%04d-%02d-%02d", tm->tm_year + 1900,
|
||||
strbuf_addf(&timebuf, "%04d-%02d-%02d", tm->tm_year + 1900,
|
||||
tm->tm_mon + 1, tm->tm_mday);
|
||||
else if (mode == DATE_ISO8601)
|
||||
sprintf(timebuf, "%04d-%02d-%02d %02d:%02d:%02d %+05d",
|
||||
strbuf_addf(&timebuf, "%04d-%02d-%02d %02d:%02d:%02d %+05d",
|
||||
tm->tm_year + 1900,
|
||||
tm->tm_mon + 1,
|
||||
tm->tm_mday,
|
||||
tm->tm_hour, tm->tm_min, tm->tm_sec,
|
||||
tz);
|
||||
else if (mode == DATE_RFC2822)
|
||||
sprintf(timebuf, "%.3s, %d %.3s %d %02d:%02d:%02d %+05d",
|
||||
strbuf_addf(&timebuf, "%.3s, %d %.3s %d %02d:%02d:%02d %+05d",
|
||||
weekday_names[tm->tm_wday], tm->tm_mday,
|
||||
month_names[tm->tm_mon], tm->tm_year + 1900,
|
||||
tm->tm_hour, tm->tm_min, tm->tm_sec, tz);
|
||||
else
|
||||
sprintf(timebuf, "%.3s %.3s %d %02d:%02d:%02d %d%c%+05d",
|
||||
strbuf_addf(&timebuf, "%.3s %.3s %d %02d:%02d:%02d %d%c%+05d",
|
||||
weekday_names[tm->tm_wday],
|
||||
month_names[tm->tm_mon],
|
||||
tm->tm_mday,
|
||||
|
|
@ -195,7 +212,7 @@ const char *show_date(unsigned long time, int tz, enum date_mode mode)
|
|||
tm->tm_year + 1900,
|
||||
(mode == DATE_LOCAL) ? 0 : ' ',
|
||||
tz);
|
||||
return timebuf;
|
||||
return timebuf.buf;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -7,13 +7,14 @@ static const char *usage_msg = "\n"
|
|||
|
||||
static void show_dates(char **argv, struct timeval *now)
|
||||
{
|
||||
char buf[128];
|
||||
struct strbuf buf = STRBUF_INIT;
|
||||
|
||||
for (; *argv; argv++) {
|
||||
time_t t = atoi(*argv);
|
||||
show_date_relative(t, 0, now, buf, sizeof(buf));
|
||||
printf("%s -> %s\n", *argv, buf);
|
||||
show_date_relative(t, 0, now, &buf);
|
||||
printf("%s -> %s\n", *argv, buf.buf);
|
||||
}
|
||||
strbuf_release(&buf);
|
||||
}
|
||||
|
||||
static void parse_dates(char **argv, struct timeval *now)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче