diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-02 19:38:54 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-02 19:38:54 +0200 |
| commit | a2e23aa3d9f6e8c156e97244a7694256f41f93c3 (patch) | |
| tree | 1d7f37f638b7a17312164384b5b51216a34d6346 /indra/llcommon/llstring.cpp | |
| parent | eae60da6839906059d904c12cc155f4c2738c893 (diff) | |
| parent | aa84c4afff251d771c7571803ccce56d1f439ae2 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llcommon/llstring.cpp')
| -rw-r--r-- | indra/llcommon/llstring.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index c027aa7bdd..5f3d9d6582 100644 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -985,6 +985,15 @@ bool LLStringUtil::formatDatetime(std::string& replacement, std::string token, return true; } replacement = datetime.toHTTPDateString(code); + + // *HACK: delete leading zero from hour string in case 'hour12' (code = %I) time format + // to show time without leading zero, e.g. 08:16 -> 8:16 (EXT-2738). + // We could have used '%l' format instead, but it's not supported by Windows. + if(code == "%I" && token == "hour12" && replacement.at(0) == '0') + { + replacement = replacement.at(1); + } + return !code.empty(); } |