Commit ea01a0cc authored by Philipp's avatar Philipp

Added skin.conf to i18n, removed dupes from locales, updated English and German locales.

parent 2016457d
......@@ -9,6 +9,8 @@ For an even more complete changelog check the commits at
https://gitlab.ambhost.net/stimpy/template_rabenwetter/commits/master
February 2019
+ Added skin.conf to i18n. Everything should be translatable now.
! Removed dupes from locales
! Updated install- and updatescript for weewx 3.9
+ Added (optional) support for second cam timelapses
+ Added support for automatically switching summer and winter themed colors
......
......@@ -213,6 +213,7 @@ module.exports = function (grunt) {
{src: 'src/assets/js/complete.en.min.js', dest: 'dist/assets/js/complete.min.js'},
{src: 'src/assets/js/incomplete.en.min.js', dest: 'dist/assets/js/incomplete.min.js'},
{src: 'src/i18n/en/archive/current.json.tmpl', dest: 'dist/archive/current.json.tmpl'},
{src: 'src/i18n/en/skin.conf', dest: 'dist/skin.conf'},
{src: 'src/index.en.min.html.tmpl', dest: 'dist/i18n/en/index.html.tmpl'},
{src: 'src/archive.en.min.html.tmpl', dest: 'dist/i18n/en/archive.html.tmpl'},
......@@ -223,6 +224,7 @@ module.exports = function (grunt) {
{src: 'src/assets/js/complete.en.min.js', dest: 'dist/i18n/en/assets/js/complete.min.js'},
{src: 'src/assets/js/incomplete.en.min.js', dest: 'dist/i18n/en/assets/js/incomplete.min.js'},
{src: 'src/i18n/en/archive/current.json.tmpl', dest: 'dist/i18n/en/archive/current.json.tmpl'},
{src: 'src/i18n/en/skin.conf', dest: 'dist/i18n/en/skin.conf'},
{src: 'src/index.de.min.html.tmpl', dest: 'dist/i18n/de/index.html.tmpl'},
{src: 'src/archive.de.min.html.tmpl', dest: 'dist/i18n/de/archive.html.tmpl'},
......@@ -233,6 +235,7 @@ module.exports = function (grunt) {
{src: 'src/assets/js/complete.de.min.js', dest: 'dist/i18n/de/assets/js/complete.min.js'},
{src: 'src/assets/js/incomplete.de.min.js', dest: 'dist/i18n/de/assets/js/incomplete.min.js'},
{src: 'src/i18n/de/archive/current.json.tmpl', dest: 'dist/i18n/de/archive/current.json.tmpl'},
{src: 'src/i18n/de/skin.conf', dest: 'dist/i18n/de/skin.conf'},
{src: 'src/index.no.min.html.tmpl', dest: 'dist/i18n/no/index.html.tmpl'},
{src: 'src/archive.no.min.html.tmpl', dest: 'dist/i18n/no/archive.html.tmpl'},
......@@ -243,6 +246,7 @@ module.exports = function (grunt) {
{src: 'src/assets/js/complete.no.min.js', dest: 'dist/i18n/no/assets/js/complete.min.js'},
{src: 'src/assets/js/incomplete.no.min.js', dest: 'dist/i18n/no/assets/js/incomplete.min.js'},
{src: 'src/i18n/no/archive/current.json.tmpl', dest: 'dist/i18n/no/archive/current.json.tmpl'},
{src: 'src/i18n/no/skin.conf', dest: 'dist/i18n/no/skin.conf'},
{src: 'src/index.fr.min.html.tmpl', dest: 'dist/i18n/fr/index.html.tmpl'},
{src: 'src/archive.fr.min.html.tmpl', dest: 'dist/i18n/fr/archive.html.tmpl'},
......@@ -253,6 +257,7 @@ module.exports = function (grunt) {
{src: 'src/assets/js/complete.fr.min.js', dest: 'dist/i18n/fr/assets/js/complete.min.js'},
{src: 'src/assets/js/incomplete.fr.min.js', dest: 'dist/i18n/fr/assets/js/incomplete.min.js'},
{src: 'src/i18n/fr/archive/current.json.tmpl', dest: 'dist/i18n/fr/archive/current.json.tmpl'},
{src: 'src/i18n/fr/skin.conf', dest: 'dist/i18n/fr/skin.conf'},
{src: 'src/index.nl.min.html.tmpl', dest: 'dist/i18n/nl/index.html.tmpl'},
{src: 'src/archive.nl.min.html.tmpl', dest: 'dist/i18n/nl/archive.html.tmpl'},
......@@ -263,6 +268,7 @@ module.exports = function (grunt) {
{src: 'src/assets/js/complete.nl.min.js', dest: 'dist/i18n/nl/assets/js/complete.min.js'},
{src: 'src/assets/js/incomplete.nl.min.js', dest: 'dist/i18n/nl/assets/js/incomplete.min.js'},
{src: 'src/i18n/nl/archive/current.json.tmpl', dest: 'dist/i18n/nl/archive/current.json.tmpl'},
{src: 'src/i18n/nl/skin.conf', dest: 'dist/i18n/nl/skin.conf'},
{src: 'src/skin.conf', dest: 'dist/skin.conf'},
{src: 'src/assets/js/iecompat.min.js', dest: 'dist/assets/js/iecompat.min.js'},
......@@ -316,7 +322,8 @@ module.exports = function (grunt) {
regex: {
html: /\btr\(['"](.+?)['"]\)/g,
javascript: /\btr\((['"].+?['"])\)/g,
assets: /\btr\((['"].+?['"])\)/g
assets: /\btr\((['"].+?['"])\)/g,
conf: /\btr\(['"](.+?)['"]\)/g
}
},
files: {
......@@ -328,9 +335,11 @@ module.exports = function (grunt) {
],
assets: [
'src/archive/current.json.tmpl'
],
conf: [
'src/skin.conf'
]
}
}
},
clean: ["src/*.tmpl", "src/i18n", "src/fullscreen*.min.html", "src/assets/js/complete*.min.js", "src/assets/js/incomplete*.min.js", "src/assets/js/iecompat.min.js", "src/assets/css/complete.min.css", "src/assets/css/incomplete.min.css", "src/i18n/de", "src/i18n/no", "src/i18n/fr" ]
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -15,7 +15,7 @@
#if $varExists('Extras.news')
<div class="whitebg container-news"><h3>News</h3>$Extras.news</div>
#end if
<div class="whitebg jshide"><p class="alert alert-danger"><strong>CurrentYou need javascript to see the live instruments. (e.g. disable NoScript addon.)</strong></p></div><div class="whitebg container-gauges jshidden"><h3>Weather</h3><div class="container-fluid">
<div class="whitebg jshide"><p class="alert alert-danger"><strong>You need javascript to see the live instruments. (e.g. disable NoScript addon.)</strong></p></div><div class="whitebg container-gauges jshidden"><h3>Weather</h3><div class="container-fluid">
#if $current.forecastRule.has_data
<div class="col-md-12"><div class="gauge_container"><h4>Forecast</h4><p id="we_forecast">&nbsp;</p></div></div>
#end if
......
This diff is collapsed.
......@@ -81,7 +81,7 @@
#else if $current.forecastRule.raw == 14:
"Principalement clair avec peu de changement de temperature."
#else if $current.forecastRule.raw == 15:
"Plus de nuages avec peu de changement de temperature. Pluie possible dans 24 heures."
"Plus de nuages avec peu de changement de temperature. Pluie possible dans les 24 heures."
#else if $current.forecastRule.raw == 16:
"Principalement clair avec peu de changement de temperature."
#else if $current.forecastRule.raw == 17:
......@@ -219,7 +219,7 @@
#else if $current.forecastRule.raw == 83:
"Principalement clair avec peu de changement de temperature."
#else if $current.forecastRule.raw == 84:
"Plus de nuages avec peu de changement de temperature. Pluie possible dans 24 heures."
"Plus de nuages avec peu de changement de temperature. Pluie possible dans les 24 heures."
#else if $current.forecastRule.raw == 85:
"Principalement nuageux et plus froid. Pluie se poursuivant."
#else if $current.forecastRule.raw == 86:
......@@ -347,7 +347,7 @@
#else if $current.forecastRule.raw == 147:
"Principalement nuageux et plus froid. Venteux."
#else if $current.forecastRule.raw == 148:
"Principalement nuageux et plus froid. Pluie se poursuivant pouvant etre forte par moment. Venteux."
"Mostly cloudy and cooler. Precipitation continuing possibly heavy at times. Windy."
#else if $current.forecastRule.raw == 149:
"Partiellement nuageux avec peu de changement de temperature."
#else if $current.forecastRule.raw == 150:
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -15,7 +15,7 @@
#if $varExists('Extras.news')
<div class="whitebg container-news"><h3>News</h3>$Extras.news</div>
#end if
<div class="whitebg jshide"><p class="alert alert-danger"><strong>CurrentYou need javascript to see the live instruments. (e.g. disable NoScript addon.)</strong></p></div><div class="whitebg container-gauges jshidden"><h3>Weather</h3><div class="container-fluid">
<div class="whitebg jshide"><p class="alert alert-danger"><strong>You need javascript to see the live instruments. (e.g. disable NoScript addon.)</strong></p></div><div class="whitebg container-gauges jshidden"><h3>Weather</h3><div class="container-fluid">
#if $current.forecastRule.has_data
<div class="col-md-12"><div class="gauge_container"><h4>Forecast</h4><p id="we_forecast">&nbsp;</p></div></div>
#end if
......
......@@ -240,7 +240,7 @@
[[Ordinates]]
# The ordinal directions. The last one should be for no wind direction
directions = N, NNO, NO, ONO, O, OSO, SO, SSO, S, SSW, SW, WSW, W, WNW, NW, NNW, N/A
directions = tr("N"), tr("NNE"), tr("NE"), tr("ENE"), tr("E"), tr("ESE"), tr("SE"), tr("SSE"), tr("S"), tr("SSW"), tr("SW"), tr("WSW"), tr("W"), tr("WNW"), tr("NW"), tr("NNW"), tr("N/A")
[[DegreeDays]]
# This section sets the base temperatures used for the calculation
......@@ -268,36 +268,36 @@
[[Generic]]
# Generic labels, keyed by an observation type.
barometer = Barometer
dewpoint = Taupunkt
heatindex = Hitzeindex
inHumidity = Luftfeuchtigkeit innen
inTemp = Temperatur innen
outHumidity = Luftfeuchtigkeit außen
outTemp = Temperatur außen
radiation = Strahlung
rain = Regen
rainRate = Regenrate
rxCheckPercent = ISS Signal Qualität
uv_index = UV Index
windDir = Windrichtung
windGust = Böen Geschwindigkeit
windGustDir = Böen Richtung
windSpeed = Windgeschwindigkeit
windchill = Gefühlte Temperatur
windgustvec = Böen Vektor
windvec = Wind Vektor
PM10 = Feinstaub 10µm
PM25 = Feinstaub 2.5µm
barometer = tr("Barometer")
dewpoint = tr("Dew point")
heatindex = tr("Heat index")
inHumidity = tr("Humidity") tr("Inside")
inTemp = tr("Temperature") tr("Inside")
outHumidity = tr("Humidity") tr("Outside")
outTemp = tr("Temperature") tr("Outside")
radiation = tr("Radiation")
rain = tr("Precipitation")
rainRate = tr("Rain rate")
rxCheckPercent = tr("ISS qignal quality")
uv_index = tr("UV Index")
windDir = tr("Wind direction")
windGust = tr("Wind gust speed")
windGustDir = tr("Wind gust direction")
windSpeed = tr("Wind speed")
windchill = tr("Windchill")
windgustvec = tr("Wind gust vector")
windvec = tr("Wind vector")
PM10 = tr("Fine dust 10µm")
PM25 = tr("Fine dust 2.5µm")
# This one is probably specific to my station!
extraTemp1 = See Temperatur
extraTemp1 = tr("Pond temperature")
###############################################################################
[Almanac]
# The labels to be used for the phases of the moon:
moon_phases = Neumond, Zunehmend (Sichel), Zunehmend (Viertel), Zunehmend (Halb), Voll, Abnehmend (Halb), Abnehmend (Viertel), Abnehmend (Sichel)
moon_phases = tr("New"), tr("Waxing crescent"), tr("First quarter"), tr("Waxing gibbous"), tr("Full"), tr("Waning gibbous"), tr("Last quarter"), tr("Last quarter")
###############################################################################
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment