i18n date: abbreviazioni giorni localizzate (context Tide) in calendario, eventi e tooltip
This commit is contained in:
+3
-3
@@ -169,8 +169,8 @@ function fmtHM(t) {
|
||||
}
|
||||
|
||||
// Formato data breve
|
||||
function fmtDate(t) {
|
||||
function fmtDate(t, dn) {
|
||||
var d = new Date(t);
|
||||
var giorni = ["Dom", "Lun", "Mar", "Mer", "Gio", "Ven", "Sab"];
|
||||
return giorni[d.getDay()] + " " + (d.getDate() < 10 ? "0" : "") + d.getDate() + "/" + ((d.getMonth() + 1) < 10 ? "0" : "") + (d.getMonth() + 1);
|
||||
var days = dn || ["Dom", "Lun", "Mar", "Mer", "Gio", "Ven", "Sab"];
|
||||
return days[d.getDay()] + " " + (d.getDate() < 10 ? "0" : "") + d.getDate() + "/" + ((d.getMonth() + 1) < 10 ? "0" : "") + (d.getMonth() + 1);
|
||||
}
|
||||
|
||||
@@ -8,6 +8,14 @@ Page {
|
||||
|
||||
property var port
|
||||
|
||||
// abbreviazioni giorni localizzate (context unico "Tide")
|
||||
property var dayNames: [
|
||||
qsTranslate("Tide", "Sun"), qsTranslate("Tide", "Mon"),
|
||||
qsTranslate("Tide", "Tue"), qsTranslate("Tide", "Wed"),
|
||||
qsTranslate("Tide", "Thu"), qsTranslate("Tide", "Fri"),
|
||||
qsTranslate("Tide", "Sat")
|
||||
]
|
||||
|
||||
SilicaListView {
|
||||
id: list
|
||||
anchors.fill: parent
|
||||
@@ -82,7 +90,7 @@ Page {
|
||||
for (var g = 0; g < 30; g++) {
|
||||
var d = new Date(now.getFullYear(), now.getMonth(), now.getDate() + g)
|
||||
var ex = Tides.extrema(port, d, 1)
|
||||
dayModel.append({ isDay: true, day: Tides.fmtDate(d.getTime()),
|
||||
dayModel.append({ isDay: true, day: Tides.fmtDate(d.getTime(), page.dayNames),
|
||||
time: "", kind: "", height: "" })
|
||||
for (var i = 0; i < ex.length; i++) {
|
||||
dayModel.append({ isDay: false, day: "",
|
||||
|
||||
@@ -69,7 +69,7 @@ Page {
|
||||
for (var i = 0; i < n; i++) {
|
||||
eventsModel.append({
|
||||
kind: ex[i].kind,
|
||||
date: Tides.fmtDate(ex[i].t),
|
||||
date: Tides.fmtDate(ex[i].t, page.dayNames),
|
||||
time: Tides.fmtHM(ex[i].t),
|
||||
height: Tides.fmtH(ex[i].h, unit)
|
||||
})
|
||||
@@ -101,6 +101,14 @@ Page {
|
||||
qsTr("Full moon"), qsTr("Waning gibbous"), qsTr("Last quarter"), qsTr("Waning crescent")
|
||||
]
|
||||
|
||||
// abbreviazioni giorni localizzate (context unico "Tide")
|
||||
property var dayNames: [
|
||||
qsTranslate("Tide", "Sun"), qsTranslate("Tide", "Mon"),
|
||||
qsTranslate("Tide", "Tue"), qsTranslate("Tide", "Wed"),
|
||||
qsTranslate("Tide", "Thu"), qsTranslate("Tide", "Fri"),
|
||||
qsTranslate("Tide", "Sat")
|
||||
]
|
||||
|
||||
SilicaFlickable {
|
||||
id: flick
|
||||
anchors.fill: parent
|
||||
@@ -203,7 +211,7 @@ Page {
|
||||
onClicked: {
|
||||
var t = page.port ? Tides.tide(page.port, new Date(nowBase + (mouse.x / width) * (page.days * 86400000))) : 0
|
||||
var d = new Date(nowBase + (mouse.x / width) * (page.days * 86400000))
|
||||
tip.text = Tides.fmtDate(d.getTime()) + " " + Tides.fmtHM(d.getTime()) + " → " + Tides.fmtH(t, page.unit)
|
||||
tip.text = Tides.fmtDate(d.getTime(), page.dayNames) + " " + Tides.fmtHM(d.getTime()) + " → " + Tides.fmtH(t, page.unit)
|
||||
tip.visible = true
|
||||
tipTimer.restart()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user