Language switching possiple in every tab
app.js - german as fallback language public/javascripts/global.js and map.js - language select possible in every tab views/index.pug - changed order of de / en localse/dev/translation.json - is a copy of de package.json "version": "3.0.3", "date": "2023-04-21 14:00 UTC",
This commit is contained in:
@@ -25,9 +25,9 @@ i18next
|
||||
backend: {
|
||||
loadPath: __dirname + '/locales/{{lng}}/{{ns}}.json'
|
||||
},
|
||||
fallbackLng: 'en',
|
||||
fallbackLng: 'de',
|
||||
debug: true,
|
||||
preload: ['en', 'de']
|
||||
preload: ['de', 'en']
|
||||
});
|
||||
|
||||
app.use(i18nextMiddleware.handle(i18next));
|
||||
|
||||
@@ -1 +1,43 @@
|
||||
{"Noise Measurement": "Lärmus messus" }
|
||||
{
|
||||
"NoiseMeasurement": "Lärm-Messung",
|
||||
"Settings": "Einstellungen",
|
||||
"Info": "Info",
|
||||
"StartDate": "Start Datum",
|
||||
"NumberOfDays": "Anzahl Tage",
|
||||
"Only_for_live_chart": "Nur bei 'live' Grafik",
|
||||
"Count_peaks_over": "Zähle Spitzen über",
|
||||
"Close": "Schließen",
|
||||
"Save_changes": "Änderungen speichern",
|
||||
"Language": "Sprache",
|
||||
"Map": "Karte",
|
||||
"Live": "Live",
|
||||
"Hour_AVG": "Stundenmittel",
|
||||
"Day_AVG": "Tagesmittel",
|
||||
"Day_Night": "Tag/Nacht-Werte",
|
||||
"ActualValues": "Aktuelle Werte",
|
||||
"NoiseLevelsLast24Hours": "Schallpegel der letzten 24 Stunden",
|
||||
"ValuesFrom": "Werte vom",
|
||||
"ActiveSensors": "Aktive Sensoren:",
|
||||
"registered": "registriert:",
|
||||
"ShowChart": "Grafik anzeigen",
|
||||
"Sensor": "Sensor",
|
||||
"offline": "offline",
|
||||
"LastSeen": "Letzter Kontakt",
|
||||
"datetime": "Datum/Zeit",
|
||||
"25minlogAverageValues": "2.5min log. Mittelwerte",
|
||||
"HourlyMeanValues": "Stündliche Mittelwerte",
|
||||
"PeaksOver": "Spitzen über",
|
||||
"HourlyMeanValuesOfLAeqForEachFullHour": "Stunden-Mittelwerte von LAeq jeweils für eine volle Stunde",
|
||||
"NumberOfPeaksPerHour": "Anzahl der Spitzen pro Stunde",
|
||||
"DailyMeanValues": "Tages-Mittelwerte",
|
||||
"DailyMeanValuesOfLAeqForEachFullDay": "Tages-Mittelwerte von LAeq jeweils für einen vollen Tag",
|
||||
"NumberOfPeaksPerDay": "Anzahl der Spitzen pro Tag",
|
||||
"AverageValuesDuringTheDayAndNightHours": "Mittelwerte während der Tag- und Nachtstunden",
|
||||
"DailyMeanValuesOfLAeqFrom6h00To22h00": "Tages-Mittelwerte des LAeq jeweils von 6:00 bis 22:00 Uhr",
|
||||
"NightlyMeanValuesOfLAeqFrom22h00To6h00": "Nacht-Mittelwerte des LAeq jeweils von 22:00 bis 6:00 Uhr",
|
||||
"LDEN-Index": "L<sub>DEN</sub>-Index",
|
||||
"DailyMeanValuesOfLDEN-Index": "Tages-Mittelwerte des L<sub>DEN</sub>-Index",
|
||||
"Date": "Datum",
|
||||
"Version": "Version",
|
||||
"from": "vom"
|
||||
}
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "laerm-web-sensorapi",
|
||||
"version": "3.0.2",
|
||||
"date": "2023-04-19 11:00 UTC",
|
||||
"version": "3.0.3",
|
||||
"date": "2023-04-21 14:00 UTC",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"start": "node bin/www.js >>log/laerm_web.log 2>&1"
|
||||
|
||||
@@ -104,7 +104,7 @@ import { DateTime } from './luxon.min.js'
|
||||
currentTab = event.currentTarget.id
|
||||
if (currentTab === 'maptab') {
|
||||
map.showMap(params, sysparams)
|
||||
document.querySelector('#sellan').style.display = 'inline'
|
||||
// document.querySelector('#sellan').style.display = 'inline'
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
@@ -64,8 +64,6 @@ export async function showMap(params, sysparams) {
|
||||
await loadAll(params)
|
||||
}
|
||||
params.center = [clickedcoords.lat, clickedcoords.lng]
|
||||
// map.setView([clickedcoords.lat, clickedcoords.lng]);
|
||||
document.querySelector('#sellan').style.display = 'none'
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
+5
-5
@@ -91,15 +91,15 @@ block content
|
||||
.column#sellan
|
||||
label.thelabels
|
||||
| #{t("Language")}:
|
||||
.form-check.form-check-inline
|
||||
input#en.form-check-input(type="radio" name="lanbut", checked)
|
||||
label.form-check-label(for="en") English
|
||||
.form-check.form-check-inline
|
||||
input#de.form-check-input(type="radio" name="lanbut")
|
||||
label.form-check-label(for='de') Deutsch
|
||||
.form-check.form-check-inline
|
||||
input#en.form-check-input(type="radio" name="lanbut", checked)
|
||||
label.form-check-label(for="en") English
|
||||
.modal-footer
|
||||
button.btn.btn-secondary(type="button" data-bs-dismiss="modal") #{t("Close")}
|
||||
button#btnSave.btn.btn-primary(type="button" data-bs-dismiss="modal") #{t("Save_changes")}
|
||||
button.btn.btn-secondary(type="button" data-bs-dismiss="modal") #{t("Close")}
|
||||
button#btnSave.btn.btn-primary(type="button" data-bs-dismiss="modal") #{t("Save_changes")}
|
||||
|
||||
|
||||
// Error-Dialog
|
||||
|
||||
Reference in New Issue
Block a user