alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Calendar: Use correct language for month and day names

Browse Source 
Apply fix for bug 353715 also on QML side.

Differential Revision: https://phabricator.kde.org/D5345
This commit is contained in:
David Rosca 2017-04-08 10:40:27 +02:00
parent 328cd681a7
commit a01e4fb69e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/declarativeimports/calendar/qml/DaysCalendar.qml
View File

@ -312,7 +312,7 @@ Item {
Components.Label { Components.Label {
width: daysCalendar.cellWidth width: daysCalendar.cellWidth
height: daysCalendar.cellHeight height: daysCalendar.cellHeight
text: Qt.locale().dayName(calendarBackend.firstDayOfWeek + index, Locale.ShortFormat) text: Qt.locale(Qt.locale().uiLanguages[0]).dayName(calendarBackend.firstDayOfWeek + index, Locale.ShortFormat)
font.pixelSize: Math.max(theme.smallestFont.pixelSize, daysCalendar.cellHeight / 3) font.pixelSize: Math.max(theme.smallestFont.pixelSize, daysCalendar.cellHeight / 3)
opacity: 0.4 opacity: 0.4
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter

2
src/declarativeimports/calendar/qml/MonthMenu.qml
View File

@ -28,7 +28,7 @@ PlasmaComponents.Menu {
property Instantiator items: Instantiator { property Instantiator items: Instantiator {
model: 12 model: 12
PlasmaComponents.MenuItem { PlasmaComponents.MenuItem {
text: capitalizeFirstLetter(Qt.locale().standaloneMonthName(index)) text: capitalizeFirstLetter(Qt.locale(Qt.locale().uiLanguages[0]).standaloneMonthName(index))
onClicked: calendarBackend.displayedDate = new Date(year, index, 1) onClicked: calendarBackend.displayedDate = new Date(year, index, 1)
} }
onObjectAdded: testMenu.addMenuItem(object) onObjectAdded: testMenu.addMenuItem(object)

2
src/declarativeimports/calendar/qml/MonthView.qml
View File

@ -143,7 +143,7 @@ PinchArea {
Component.onCompleted: { Component.onCompleted: {
for (var i = 0; i < 12; ++i) { for (var i = 0; i < 12; ++i) {
append({ append({
label: Qt.locale().standaloneMonthName(i, Locale.LongFormat), label: Qt.locale(Qt.locale().uiLanguages[0]).standaloneMonthName(i, Locale.LongFormat),
monthNumber: i + 1, monthNumber: i + 1,
isCurrent: true isCurrent: true
}) })