diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-01 16:08:39 +0100 |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-01 16:11:35 +0100 |
| commit | 010471faf918cfab75032a569aab8e510e47a72a (patch) | |
| tree | 82eb2b6466af14899694943a6557bf442ed786f5 /src/corelib | |
| parent | 803c374749fb0ab37512be0ad625d9823d93067b (diff) | |
| download | qt4-tools-010471faf918cfab75032a569aab8e510e47a72a.tar.gz | |
Use the localized represantion of AM/PM string when converting time.
Reviewed-by: Liang Qi
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 2e5836160b..0a67daf286 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -2103,7 +2103,7 @@ QString QLocalePrivate::dateTimeToString(const QString &format, const QDate *dat } else { repeat = 1; } - result.append(am_pm == AM ? QLatin1String("am") : QLatin1String("pm")); + result.append(am_pm == AM ? q->amText().toLower() : q->pmText().toLower()); break; case 'A': @@ -2113,7 +2113,7 @@ QString QLocalePrivate::dateTimeToString(const QString &format, const QDate *dat } else { repeat = 1; } - result.append(am_pm == AM ? QLatin1String("AM") : QLatin1String("PM")); + result.append(am_pm == AM ? q->amText().toUpper() : q->pmText().toUpper()); break; case 'z': |