diff options
| -rw-r--r-- | include/cutils/tztime.h | 1 | ||||
| -rw-r--r-- | libcutils/tzstrftime.c | 15 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/cutils/tztime.h b/include/cutils/tztime.h index 4af2ce49..cf103cae 100644 --- a/include/cutils/tztime.h +++ b/include/cutils/tztime.h @@ -32,6 +32,7 @@ void localtime_tz(const time_t * const timep, struct tm * tmp, const char* tz); struct strftime_locale { const char *mon[12]; /* short names */ const char *month[12]; /* long names */ + const char *standalone_month[12]; /* long standalone names */ const char *wday[7]; /* short names */ const char *weekday[7]; /* long names */ const char *X_fmt; diff --git a/libcutils/tzstrftime.c b/libcutils/tzstrftime.c index 29c50154..e37d79ae 100644 --- a/libcutils/tzstrftime.c +++ b/libcutils/tzstrftime.c @@ -172,10 +172,17 @@ label: pt, ptlim, modifier); continue; case 'B': - pt = _add((t->tm_mon < 0 || - t->tm_mon >= MONSPERYEAR) ? - "?" : Locale->month[t->tm_mon], - pt, ptlim, modifier); + if (modifier == '-') { + pt = _add((t->tm_mon < 0 || + t->tm_mon >= MONSPERYEAR) ? + "?" : Locale->standalone_month[t->tm_mon], + pt, ptlim, modifier); + } else { + pt = _add((t->tm_mon < 0 || + t->tm_mon >= MONSPERYEAR) ? + "?" : Locale->month[t->tm_mon], + pt, ptlim, modifier); + } continue; case 'b': case 'h': |