diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-12-02 12:52:13 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-12-02 12:52:13 -0800 |
| commit | 7bb862c8c1aa56fea6e533d5a257b3d39b428cac (patch) | |
| tree | 6a66c190788be7c2b9797e682c5c09037a95729a /indra/llcommon | |
| parent | 6d3ca60f310e50b217a189086b652dca2e3e3854 (diff) | |
| parent | d550339958c14f0d7fd222a8531df639eac49e63 (diff) | |
Merge
Diffstat (limited to 'indra/llcommon')
| -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(); } |