katja's git: oeffisearch

langauges: use camelcase, add some missing translations, cleanup

diff --git a/src/departuresView.js b/src/departuresView.js
@@ -93,7 +93,7 @@ class DeparturesView extends BaseView {
 					` : nothing}
 					<h3>Departures from ${this.viewState !== null ? this.viewState.name : '...'}</h3>
 				</div>
-				<a class="icon-reload ${!this.isUpdating ? '' : 'spinning'} ${!this.isOffline ? '' : 'invisible'}" title="${t("reload")}" @click=${this.updateViewState}></a>
+				<a class="icon-reload ${!this.isUpdating ? '' : 'spinning'} ${!this.isOffline ? '' : 'invisible'}" title="${t("refresh")}" @click=${this.updateViewState}></a>
 			</header>
 		</div>
 		`,

@@ -113,7 +113,7 @@ class DeparturesView extends BaseView {
 					<span class="direction ${departure.cancelled ? 'cancelled' : ''}">${departure.line.name}</span>
 					<span class="direction ${departure.cancelled ? 'cancelled' : ''}">${departure.direction ? html` → ${departure.direction}` : nothing}</span>
 					${departure.cancelled ? html`
-					<span class="cancelled-text">${t('cancelled-ride')}</span>
+					<span class="cancelled-text">${t('cancelled')}</span>
 					` : html`
 					<span>${platformTemplate(departure)}</span>
 					`}

diff --git a/src/journeyView.js b/src/journeyView.js
@@ -65,7 +65,7 @@ class JourneyView extends BaseView {
 				<header>
 					<a id="back" class="icon-back ${history.length !== 1 ? '': 'invisible'}" title="${t('back')}" @click=${() => history.back()}></a>
 					<div class="container">
-						<a class="icon-reload ${this.isUpdating ? 'spinning' : ''} ${!this.isOffline ? '' : 'invisible'}" title="${t("reload")}" @click=${this.refreshJourney}></a>
+						<a class="icon-reload ${this.isUpdating ? 'spinning' : ''} ${!this.isOffline ? '' : 'invisible'}" title="${t("refresh")}" @click=${this.refreshJourney}></a>
 						${this.viewState !== null ? html`
 							<h3>
 								<span>${formatPoint(this.viewState.legs[0].origin)}</span>

@@ -106,7 +106,7 @@ class JourneyView extends BaseView {
 
 	legTemplate = leg => {
 		if (leg.walking) {
-			return html`<p class="walk">${t(leg.distance === null ? 'walkinfo' : 'walkinfo_meters', formatPoint(leg.destination), leg.distance)}</p>`;
+			return html`<p class="walk">${t(leg.distance === null ? 'walkinfo' : 'walkinfoMeters', formatPoint(leg.destination), leg.distance)}</p>`;
 		} else if (leg.transfer) {
 			return html`<p class="transfer">${t('transferinfo', formatPoint(leg.destination))}</p>`;
 		} else if (leg.change) {

@@ -116,7 +116,7 @@ class JourneyView extends BaseView {
 				<div class="card">
 					<div class="head flex-center nowrap train-info">
 						<a href="#/t/${this.profile}/${leg.tripId}">${formatLineDisplayName(leg.line)}${!leg.direction ? nothing : html` → ${leg.direction}`}</a>
-						${!leg.cancelled ? nothing : html`<b class="cancelled-text">${t('cancelled-ride')}</b>`}
+						${!leg.cancelled ? nothing : html`<b class="cancelled-text">${t('cancelled')}</b>`}
 						${leg.remarks.length === 0 ? nothing : html`
 							<a class="${leg.remarksIcon}" @click=${() => remarksModal(this, leg.remarks)}></a>
 						`}

diff --git a/src/journeysView.js b/src/journeysView.js
@@ -98,11 +98,11 @@ export class JourneysView extends JourneysCanvas {
 					<div class="mode-changers flex-row">
 						<a href="#/${this.slug}/table" class="${this.settingsState.journeysViewMode === 'table' ? 'active' : ''}">
 							<div class="icon-table"></div>
-							<span>${t('table-view')}</span>
+							<span>${t('tableView')}</span>
 						</a>
 						<a href="#/${this.slug}/canvas" class="${this.settingsState.journeysViewMode === 'canvas' ? 'active' : ''}">
 							<div class="icon-canvas"></div>
-							<span>${t('canvas-view')}</span>
+							<span>${t('canvasView')}</span>
 						</a>
 					</div>
 				</div>

@@ -116,7 +116,7 @@ export class JourneysView extends JourneysCanvas {
 			this.settingsState.journeysViewMode === 'table' ? html`
 			<div class="container">
 				${!this.viewState.earlierRef ? nothing : html`
-				<a class="arrowButton icon-arrow flipped flex-center" title="${t('label_earlier')}" @click=${() => this.moreJourneys('earlier')}></a>
+				<a class="arrowButton icon-arrow flipped flex-center" title="${t('earlier')}" @click=${() => this.moreJourneys('earlier')}></a>
 				`}
 
 				<div class="table" style="grid-template-columns: repeat(${this.settingsState.showPrices && this.viewState.profile === 'db' ? '6' : '5'}, 1fr) .3fr">

@@ -135,7 +135,7 @@ export class JourneysView extends JourneysCanvas {
 				</div>
 
 				${!this.viewState.laterRef ? nothing : html`
-				<a class="arrowButton icon-arrow flex-center" title="${t('label_later')}" @click=${() => this.moreJourneys('later')}></a>
+				<a class="arrowButton icon-arrow flex-center" title="${t('later')}" @click=${() => this.moreJourneys('later')}></a>
 				`}
 			</div>
 			<footer-component></footer-component>

@@ -151,7 +151,7 @@ export class JourneysView extends JourneysCanvas {
 			<a class="row" href="#/j/${this.viewState.profile}/${journey.refreshToken}">
 				<span class="${!journey.cancelled ? nothing : 'cancelled'}">${timeTemplate(firstLeg, 'departure')}</span>
 				${journey.cancelled ? html`
-				<span class="cancelled-text">${t('cancelled-ride')}</span>
+				<span class="cancelled-text">${t('cancelled')}</span>
 				` : html`
 				<span>${timeTemplate(lastLeg, 'arrival')}</span>
 				`}

diff --git a/src/languages.js b/src/languages.js
@@ -1,12 +1,13 @@
 export const languages = {
 	'de': {
+		'backendLang':           'de',
 		'accessibility':         'Barrierefreiheit',
 		'accessibilityNone':     'Keine Einschränkungen',
 		'accessibilityPartial':  'Bedingt barrierefrei',
 		'accessibilityComplete': 'Barrierefrei',
 		'arrival':            'Ankunft',
 		'bus':                'Bus',
-		'cancelled-ride':     'Fahrt entfällt!',
+		'cancelled':          'Fahrt entfällt!',
 		'changeinfo':         '{} Umstiegsdauer',
 		'changes':            'Umstiege',
 		'clearstorage':       'Lokale Daten löschen',

@@ -20,13 +21,11 @@ export const languages = {
 		'en':                 'Englisch',
 		'ferry':              'Fähre',
 		'from':               'Von',
-		'graphical':          'Grafische Darstellung in der Verbindungsübersicht',
 		'iceonly':            'ICE',
 		'iconly':             'IC',
 		'journeyoverview':    'Verbindungsübersicht aufrufen',
-		'label_earlier':      'Frühere Verbindungen',
-		'label_later':        'Spätere Verbindungen',
-		'lang_short':         'de',
+		'earlier':            'Frühere Verbindungen',
+		'later':              'Spätere Verbindungen',
 		'language':           'Sprache',
 		'lastjourney':        'Letzte gewählte Verbindung aufrufen',
 		'longdistancetrain':  'Fernverkehr',

@@ -41,8 +40,7 @@ export const languages = {
 		'search':             'Suchen',
 		'setfromto':          'Als Von/Nach setzen',
 		'settings':           'Einstellungen',
-		'showdebug':          'Debugnachrichten ins Log schreiben',
-		'showds100':          'RIL100-Kürzel anzeigen (wenn verfügbar)',
+		'showDS100':          'RIL100-Kürzel anzeigen (wenn verfügbar)',
 		'station':            'Station',
 		'suburbantrain':      'S-Bahn',
 		'subway':             'U-Bahn',

@@ -55,13 +53,14 @@ export const languages = {
 		'update':             'Anwendung updaten',
 		'via':                'Über',
 		'walkinfo':           'Laufe nach {}',
-		'walkinfo_meters':    'Laufe nach {} (ca. {} Meter)',
+		'walkinfoMeters':     'Laufe nach {} (ca. {} Meter)',
 		'load-low-to-medium': 'Niedrige bis mittlere Auslastung',
 		'load-high':          'Hohe Auslastung',
 		'load-very-high':     'Sehr hohe Auslastung',
 		'load-exceptionally-high': 'Extrem hohe Auslastung',
-		'table-view':         'Tabelle',
-		'show-prices':        'Preise anzeigen',
+		'tableView':          'Tabelle',
+		'canvasView':         'Graphisch'
+		'showPrices':         'Preise anzeigen',
 		'combineDateTime':    'Kombinierte Zeit & Datumseingabe verwenden',
 		'titleSetDateTimeNow': 'Setze Uhrzeit & Datum auf jetzt',
 		'titleBikeFriendly':   'Fahrradmitnahme möglich',

@@ -85,17 +84,22 @@ export const languages = {
 		'now':                 'Jetzt',
 		'minTransferTime':     'Umstiegszeit (Minuten)',
 		'trainType':           'Zugtyp',
-		'close':               'Schließen'
+		'close':               'Schließen',
+		'products':            'Produkte',
+		'price':               'Preis',
+		'refresh':             'Aktualisieren',
+		'back':                'Zurück',
 	},
 
 	'nl': {
+		'backendLang':           'nl',
 		'accessibility':         'Toegankelijkheid',
 		'accessibilityNone':     'Geen beperkingen',
 		'accessibilityPartial':  'Beperkt toegankelijk',
 		'accessibilityComplete': 'Toegankelijk',
 		'arrival':            'Aankomst',
 		'bus':                'Bus',
-		'cancelled-ride':     'Rit geannuleerd',
+		'cancelled':          'Rit geannuleerd',
 		'changeinfo':         '{} overstaptijd',
 		'changes':            'Overstappen',
 		'clearstorage':       'Lokale gegevens wissen',

@@ -109,13 +113,11 @@ export const languages = {
 		'en':                 'Engels',
 		'ferry':              'Veerboot',
 		'from':               'Van',
-		'graphical':          'Grafische presentatie in het verbindingsoverzicht',
 		'iceonly':            'ICE',
 		'iconly':             'IC',
 		'journeyoverview':    'Toon verbindingsoverzicht',
-		'label_earlier':      'Vroegere verbindingen',
-		'label_later':        'Latere verbindingen',
-		'lang_short':         'nl',
+		'earlier':            'Vroegere verbindingen',
+		'later':              'Latere verbindingen',
 		'language':           'Taal',
 		'lastjourney':        'Laatste gekozen verbinding tonen',
 		'longdistancetrain':  'Lange-afstandverkeer',

@@ -130,8 +132,7 @@ export const languages = {
 		'search':             'Zoeken',
 		'setfromto':          'Als Van/Naar zetten',
 		'settings':           'Instellingen',
-		'showdebug':          'Debugberichten in logboek schrijven',
-		'showds100':          'RIL100-afkortingen tonen (indien aanwezig)',
+		'showDS100':          'RIL100-afkortingen tonen (indien aanwezig)',
 		'station':            'Station',
 		'suburbantrain':      'S-trein',
 		'subway':             'Metro',

@@ -144,23 +145,24 @@ export const languages = {
 		'update':             'Applicatie updaten',
 		'via':                'Over',
 		'walkinfo':           'Ga naar {}',
-		'walkinfo_meters':    'Ga naar {} (ong. {} meter)',
+		'walkinfoMeters':     'Ga naar {} (ong. {} meter)',
 		'load-low-to-medium': 'Niet druk',
 		'load-high':          'Druk',
 		'load-very-high':     'Zéér druk',
 		'load-exceptionally-high': 'Extreem druk',
-		'table-view':         'Tabel',
-		'show-prices':        'Prijzen tonen',
+		'tableView':          'Tabel',
+		'showPrices':         'Prijzen tonen',
 	},
 
 	'en': {
+		'backendLang':           'en',
 		'accessibility':         'Accessibillity',
 		'accessibilityNone':     'none',
 		'accessibilityPartial':  'partial',
 		'accessibilityComplete': 'full',
 		'arrival':           'Arrival',
 		'bus':               'Bus',
-		'cancelled-ride':    'Cancelled!',
+		'cancelled':         'Cancelled!',
 		'changeinfo':        '{} change duration',
 		'changes':           'Changes',
 		'clearstorage':      'Remove local data',

@@ -174,13 +176,11 @@ export const languages = {
 		'en':                'English',
 		'ferry':             'Ferry',
 		'from':              'From',
-		'graphical':         'Graphical overview for journeys',
 		'iceonly':           'ICE',
 		'iconly':            'IC',
 		'journeyoverview':   'Go to journeysoverview',
-		'label_earlier':     'Earlier connections',
-		'label_later':       'Later connections',
-		'lang_short':        'en',
+		'earlier':           'Earlier connections',
+		'later':             'Later connections',
 		'language':          'Language',
 		'lastjourney':       'Go to last selected journey',
 		'longdistancetrain': 'Long distance trains',

@@ -195,8 +195,7 @@ export const languages = {
 		'search':            'Search',
 		'setfromto':         'Set as from/to',
 		'settings':          'Settings',
-		'showdebug':         'Write debug messages to log',
-		'showds100':         'Show DS100 (if available)',
+		'showDS100':         'Show DS100 (if available)',
 		'station':           'Station',
 		'suburbantrain':     'Suburban Trains',
 		'subway':            'Subway',

@@ -209,17 +208,17 @@ export const languages = {
 		'update':            'Update application',
 		'via':               'Via',
 		'walkinfo':          'Walk to {}',
-		'walkinfo_meters':   'Walk to {} (apprx. {} meters)',
+		'walkinfoMeters':    'Walk to {} (apprx. {} meters)',
 		'load-low-to-medium': 'Low to medium load',
 		'load-high':         'High load',
 		'load-very-high':    'Very high load',
 		'load-exceptionally-high': 'Exceptionally high load',
-		'table-view':        'Table',
-		'canvas-view':       'Canvas',
-		'show-prices':       'Show prices',
+		'tableView':         'Table',
+		'canvasView':        'Graphical',
+		'showPrices ':       'Show prices',
 		'price':             'Price',
 		'back':              'Back',
-		'reload':            'Refresh data',
+		'refresh':           'Refresh data',
 		'combineDateTime':   'Use combined DateTime-input',
 		'titleSetDateTimeNow': 'Set Date & Time to now',
 		'titleBikeFriendly':   'Bicycle transport possible',

diff --git a/src/settingsView.js b/src/settingsView.js
@@ -107,10 +107,10 @@ class SettingsView extends BaseView {
 
 			<div class="flex-column">
 				<span>${t('options')}:</span><br>
-				<label><input type="checkbox" id="showDS100"       @change=${this.changeHandler} ?checked=${this.viewState.showDS100}> ${t('showds100')}<br></label>
+				<label><input type="checkbox" id="showDS100"       @change=${this.changeHandler} ?checked=${this.viewState.showDS100}> ${t('showDS100')}<br></label>
 				<label><input type="checkbox" id="combineDateTime" @change=${this.changeHandler} ?checked=${this.viewState.combineDateTime}> ${t('combineDateTime')}<br></label>
 				<label class="${this.viewState.profile !== 'db' ? 'hidden' : nothing}">
-					<input type="checkbox" id="showPrices" @change=${this.changeHandler} ?checked=${this.viewState.showPrices}> ${t('show-prices')}
+					<input type="checkbox" id="showPrices" @change=${this.changeHandler} ?checked=${this.viewState.showPrices}> ${t('showPrices')}
 				</label>
 			</div>
 

diff --git a/src/tripView.js b/src/tripView.js
@@ -108,7 +108,7 @@ class TripView extends BaseView {
 							<h3>Trip of ...</h3>
 						`}
 					</div>
-					<a class="icon-reload ${this.isUpdating ? 'spinning' : ''} ${!this.isOffline ? '' : 'invisible'}" title="${t("reload")}" @click=${this.updateViewState}></a>
+					<a class="icon-reload ${this.isUpdating ? 'spinning' : ''} ${!this.isOffline ? '' : 'invisible'}" title="${t("refresh")}" @click=${this.updateViewState}></a>
 				</header>
 			</div>
 		`,

@@ -121,7 +121,7 @@ class TripView extends BaseView {
 					${formatLineDisplayName(this.viewState.trip.line)}${this.viewState.trip.direction ? html` → ${this.viewState.trip.direction}` : ''}
 					${!this.viewState.trip.bahnExpertUrl ? nothing : html`</a>`}
 
-					${!this.viewState.trip.cancelled ? nothing : html`<b class="cancelled-text">${t('cancelled-ride')}</b>`}
+					${!this.viewState.trip.cancelled ? nothing : html`<b class="cancelled-text">${t('cancelled')}</b>`}
 
 					${this.viewState.trip.remarks.length === 0 ? nothing : html`
 					<a class="${this.viewState.trip.remarksIcon}" @click=${() => remarksModal(this, this.viewState.trip.remarks)}></a>