From 6240b9e7d560ba56f02d0b1452a648c18c2f6f39 Mon Sep 17 00:00:00 2001 From: Martin Klapetek Date: Tue, 17 Jun 2014 17:55:01 +0200 Subject: [PATCH] [calendar import]Fix months capitalization Should be done by the view/label rather than hardocding it --- src/declarativeimports/calendar/calendar.cpp | 8 +------- src/declarativeimports/calendar/qml/MonthView.qml | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/declarativeimports/calendar/calendar.cpp b/src/declarativeimports/calendar/calendar.cpp index db1d801ed..03d145452 100644 --- a/src/declarativeimports/calendar/calendar.cpp +++ b/src/declarativeimports/calendar/calendar.cpp @@ -172,13 +172,7 @@ QString Calendar::dayName(int weekday) const QString Calendar::monthName() const { - // Some CLDR (locale) data used by Qt have standalone months names - // starting with lower-case letters. So if we want to provide consistent - // look across locales, we need to capitalize it ourselves - // - // see https://bugreports.qt-project.org/browse/QTBUG-35100 - QString tmp = QDate::longMonthName(m_displayedDate.month(), QDate::StandaloneFormat); - return tmp.left(1).toUpper() + tmp.mid(1); + return QDate::longMonthName(m_displayedDate.month(), QDate::StandaloneFormat); } int Calendar::year() const diff --git a/src/declarativeimports/calendar/qml/MonthView.qml b/src/declarativeimports/calendar/qml/MonthView.qml index 2e0d02c3a..b18269a43 100644 --- a/src/declarativeimports/calendar/qml/MonthView.qml +++ b/src/declarativeimports/calendar/qml/MonthView.qml @@ -41,7 +41,6 @@ Item { property int mHeight: theme.mSize(theme.defaultFont).height property int borderWidth: 1 - property int columns: monthCalendar.days property int rows: monthCalendar.weeks @@ -106,6 +105,7 @@ Item { level: 1 text: monthCalendar.displayedDate.getFullYear() == new Date().getFullYear() ? root.selectedMonth : root.selectedMonth + ", " + root.selectedYear elide: Text.ElideRight + font.capitalization: Font.Capitalize Loader { id: menuLoader