From 2bfeb67a3a8d5c481c3ef7b69adbc15d127f96c0 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Thu, 6 Aug 2020 23:49:35 +0200 Subject: [PATCH] Small changes, add version number --- Logic/Osm/Changes.ts | 2 +- Logic/Osm/OsmConnection.ts | 2 +- State.ts | 2 ++ UI/MoreScreen.ts | 3 ++- UI/SimpleAddUI.ts | 5 +---- UI/i18n/Translations.ts | 5 +++++ 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Logic/Osm/Changes.ts b/Logic/Osm/Changes.ts index ad9ca69..35cde82 100644 --- a/Logic/Osm/Changes.ts +++ b/Logic/Osm/Changes.ts @@ -320,7 +320,7 @@ export class Changes { if (c > 10) { millisTillChangesAreSaved.setData(0); self.uploadAll(() => { - console.log("Uplaoded changes: more then 10 pending changes") + console.log("Uploaded changes: more then 10 pending changes") }); return; } diff --git a/Logic/Osm/OsmConnection.ts b/Logic/Osm/OsmConnection.ts index 314b399..3706ee1 100644 --- a/Logic/Osm/OsmConnection.ts +++ b/Logic/Osm/OsmConnection.ts @@ -336,7 +336,7 @@ export class OsmConnection { return; } const mapping = OsmConnection.parseUploadChangesetResponse(response); - console.log("Uplaoded changeset ", changesetId); + console.log("Uploaded changeset ", changesetId); continuation(changesetId, mapping); }); } diff --git a/State.ts b/State.ts index 8d8de8f..8a8a104 100644 --- a/State.ts +++ b/State.ts @@ -23,6 +23,8 @@ export class State { // The singleton of the global state public static state: State; + + public static vNumber = "0.0.1"; public static runningFromConsole: boolean = false; diff --git a/UI/MoreScreen.ts b/UI/MoreScreen.ts index 1377ede..0c99b05 100644 --- a/UI/MoreScreen.ts +++ b/UI/MoreScreen.ts @@ -62,7 +62,8 @@ export class MoreScreen extends UIElement { tr.intro, tr.requestATheme, new VerticalCombine(els), - tr.streetcomplete + tr.streetcomplete, + new FixedUiElement(State.vNumber) ]).Render(); } diff --git a/UI/SimpleAddUI.ts b/UI/SimpleAddUI.ts index daeb0df..4c36531 100644 --- a/UI/SimpleAddUI.ts +++ b/UI/SimpleAddUI.ts @@ -68,10 +68,7 @@ export class SimpleAddUI extends UIElement { () => { self.confirmButton = new SubtleButton(preset.icon, new Combine([ - "Add a ", - "", - preset.title, - " here
", + Translations.t.general.add.confirmButton.Subs({category: preset.title}), preset.description !== undefined ? preset.description : ""])); self.confirmButton.onClick(self.CreatePoint(preset.tags, layer)); self._confirmPreset.setData({ diff --git a/UI/i18n/Translations.ts b/UI/i18n/Translations.ts index b411ebe..72e8a88 100644 --- a/UI/i18n/Translations.ts +++ b/UI/i18n/Translations.ts @@ -820,6 +820,11 @@ export default class Translations { nl: "

Voeg hier een {title} toe?

Het punt dat je hier toevoegt, is zichtbaar voor iedereen. Veel applicaties gebruiken deze data, voeg dus enkel punten toe die echt bestaan.", fr: "

Ajouter un/une {title} ici?

Le point que vous ajouter sera visible par tout le monde. Merci d'etre sûr que ce point existe réellement. Beaucoup d'autres applications reposent sur ces données.", + }), + confirmButton: new T({ + en: "Add a {category} here", + nl: "Voeg hier een {category} toe", + fr: "Ajouter un/une {category} ici" }) }, pickLanguage: new T({