From cc22857d1e2e447111d2161e4d17934a8449774f Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Fri, 3 Sep 2021 11:17:25 +0200 Subject: QAndroidSystemLocale: add missing day and month format handling This patch adds support for previously missing Narrow format, as well as standalone day name handling for QAndroidSystemLocale Task-number: QTBUG-84877 Pick-to: 6.2 Change-Id: Ib74fb8f0e12f03ab96022abaf26ac9039ffaa60b Reviewed-by: Edward Welbourne Reviewed-by: Assam Boudjelthia --- src/plugins/platforms/android/qandroidsystemlocale.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/plugins/platforms/android') diff --git a/src/plugins/platforms/android/qandroidsystemlocale.cpp b/src/plugins/platforms/android/qandroidsystemlocale.cpp index 351274a560..74a549454d 100644 --- a/src/plugins/platforms/android/qandroidsystemlocale.cpp +++ b/src/plugins/platforms/android/qandroidsystemlocale.cpp @@ -105,14 +105,26 @@ QVariant QAndroidSystemLocale::query(QueryType type, QVariant in) const return m_locale.dayName(in.toInt(), QLocale::LongFormat); case DayNameShort: return m_locale.dayName(in.toInt(), QLocale::ShortFormat); + case DayNameNarrow: + return m_locale.dayName(in.toInt(), QLocale::NarrowFormat); + case StandaloneDayNameLong: + return m_locale.standaloneDayName(in.toInt(), QLocale::LongFormat); + case StandaloneDayNameShort: + return m_locale.standaloneDayName(in.toInt(), QLocale::ShortFormat); + case StandaloneDayNameNarrow: + return m_locale.standaloneDayName(in.toInt(), QLocale::NarrowFormat); case MonthNameLong: return m_locale.monthName(in.toInt(), QLocale::LongFormat); case MonthNameShort: return m_locale.monthName(in.toInt(), QLocale::ShortFormat); + case MonthNameNarrow: + return m_locale.monthName(in.toInt(), QLocale::NarrowFormat); case StandaloneMonthNameLong: return m_locale.standaloneMonthName(in.toInt(), QLocale::LongFormat); case StandaloneMonthNameShort: return m_locale.standaloneMonthName(in.toInt(), QLocale::ShortFormat); + case StandaloneMonthNameNarrow: + return m_locale.standaloneMonthName(in.toInt(), QLocale::NarrowFormat); case DateToStringLong: return m_locale.toString(in.toDate(), QLocale::LongFormat); case DateToStringShort: -- cgit v1.2.3