More translations

This commit is contained in:
Pieter Vander Vennet 2020-07-20 17:30:02 +02:00
parent a528159bb7
commit 81a80ef95c
10 changed files with 42 additions and 42 deletions

View file

@ -23,7 +23,7 @@ export default class BikeParkings extends LayerDefinition {
this.title = new FixedText("Fietsparking"); this.title = new FixedText("Fietsparking");
this.elementsToShow = [ this.elementsToShow = [
new ImageCarouselWithUploadConstructor(), new ImageCarouselWithUploadConstructor(),
new OperatorTag(), // new OperatorTag(),
new ParkingType() new ParkingType()
]; ];

View file

@ -55,8 +55,16 @@ export class BikeShop extends LayerDefinition {
new TagRenderingOptions({ new TagRenderingOptions({
question: "Does this shop repair bicycles?", question: "Does this shop repair bicycles?",
mappings: [ mappings: [
{k: this.sellsBikes, txt: "Bikes can be repaired here"}, {k: new Tag("service:bicycle:repair", "yes"), txt: "Bikes are repaired here, by the shop owner (for a fee)"},
{k: new Tag("service:bicycle:retail", "no"), txt: "No bikes can be bought here"}, {k: new Tag("service:bicycle:repair", "no"), txt: "Bikes are not repaired here"},
]
}),
new TagRenderingOptions({
question: "Are there tools here so that one can repair their own bike?",
mappings: [
{k: new Tag("service:bicycle:diy", "yes"), txt: "Tools for DIY are available here"},
{k: new Tag("service:bicycle:diy", "no"), txt: "No tools for DIY are available here"},
] ]
}), }),
] ]

View file

@ -73,7 +73,11 @@ export default class BikeStations extends LayerDefinition {
} }
} }
} else { } else {
iconName = "repair_station.svg" if (!self.pump.matchesProperties(properties)) {
iconName = "repair_station.svg"
} else {
iconName = "repair_station.svg"
}
} }
const iconUrl = `./assets/bike/${iconName}` const iconUrl = `./assets/bike/${iconName}`
return { return {

View file

@ -18,7 +18,7 @@ export default class BikeStationOperator extends TagRenderingOptions {
{k: new Tag("operator", "Stad Halle"), txt: "Stad Halle"}, {k: new Tag("operator", "Stad Halle"), txt: "Stad Halle"},
{k: new Tag("operator", "Saint Gilles - Sint Gillis"), txt: "Saint Gilles - Sint Gillis"}, {k: new Tag("operator", "Saint Gilles - Sint Gillis"), txt: "Saint Gilles - Sint Gillis"},
{k: new Tag("operator", "Jette"), txt: "Jette"}, {k: new Tag("operator", "Jette"), txt: "Jette"},
{k: new Tag("operator", "private"), txt: "Beheer door een privépersoon"} {k: new Tag("operator", "private"), txt: "Operated by a private individual"}
] ]
}); });
} }

View file

@ -325,9 +325,9 @@ class TagRendering extends UIElement implements TagDependantUIElement {
const cancelContents = this._editMode.map((isEditing) => { const cancelContents = this._editMode.map((isEditing) => {
if (isEditing) { if (isEditing) {
return "<span class='skip-button'>Annuleren</span>"; return "<span class='skip-button'>Cancel</span>";
} else { } else {
return "<span class='skip-button'>Overslaan (Ik weet het niet zeker...)</span>"; return "<span class='skip-button'>Skip this question</span>";
} }
}); });
// And at last, set up the skip button // And at last, set up the skip button

View file

@ -23,8 +23,8 @@ export class ImageCarouselConstructor implements TagDependantUIElementConstructo
return 0; return 0;
} }
construct(tags: UIEventSource<any>, changes: Changes): TagDependantUIElement { construct(dependencies: { tags: UIEventSource<any>, changes: Changes }): TagDependantUIElement {
return new ImageCarousel(tags, changes); return new ImageCarousel(dependencies.tags, dependencies.changes);
} }
} }

View file

@ -9,7 +9,6 @@ import {VariableUiElement} from "./Base/VariableUIElement";
export class ImageUploadFlow extends UIElement { export class ImageUploadFlow extends UIElement {
private _licensePicker: UIElement; private _licensePicker: UIElement;
private _selectedLicence: UIEventSource<string>; private _selectedLicence: UIEventSource<string>;
private _licenseExplanation: UIElement;
private _isUploading: UIEventSource<number> = new UIEventSource<number>(0) private _isUploading: UIEventSource<number> = new UIEventSource<number>(0)
private _uploadOptions: (license: string) => { title: string; description: string; handleURL: (url: string) => void; allDone: (() => void) }; private _uploadOptions: (license: string) => { title: string; description: string; handleURL: (url: string) => void; allDone: (() => void) };
private _userdetails: UIEventSource<UserDetails>; private _userdetails: UIEventSource<UserDetails>;
@ -31,12 +30,12 @@ export class ImageUploadFlow extends UIElement {
this._uploadOptions = uploadOptions; this._uploadOptions = uploadOptions;
this.ListenTo(this._isUploading); this.ListenTo(this._isUploading);
const licensePicker = new DropDownUI("Jouw foto wordt gepubliceerd ", const licensePicker = new DropDownUI("The picture is published ",
[ [
{value: "CC0", shown: "in het publiek domein"}, {value: "CC0", shown: "in the public domain"},
{value: "CC-BY-SA 4.0", shown: "onder een CC-BY-SA-licentie"}, {value: "CC-BY-SA 4.0", shown: "with a CC-BY-SA license"},
{value: "CC-BY 4.0", shown: "onder een CC-BY-licentie"} {value: "CC-BY 4.0", shown: "with a CC-BY license"}
], ],
preferedLicense preferedLicense
); );
@ -44,34 +43,21 @@ export class ImageUploadFlow extends UIElement {
this._selectedLicence = licensePicker.selectedElement; this._selectedLicence = licensePicker.selectedElement;
const licenseExplanations = {
"CC-BY-SA 4.0":
"<b>Creative Commonse met naamsvermelding en gelijk delen</b><br/>" +
"Je foto mag door iedereen gratis gebruikt worden, als ze je naam vermelden én ze afgeleide werken met deze licentie en attributie delen.",
"CC-BY 4.0":
"<b>Creative Commonse met naamsvermelding</b> <br/>" +
"Je foto mag door iedereen gratis gebruikt worden, als ze je naam vermelden",
"CC0":
"<b>Geen copyright</b><br/> Je foto mag door iedereen voor alles gebruikt worden"
}
this._licenseExplanation = new VariableUiElement(
this._selectedLicence.map((license) => {
return licenseExplanations[license]
})
);
} }
protected InnerRender(): string { protected InnerRender(): string {
if (!this._userdetails.data.loggedIn) { if (!this._userdetails.data.loggedIn) {
return "<div class='activate-osm-authentication'>Gelieve je aan te melden om een foto toe te voegen of vragen te beantwoorden</div>"; return "<div class='activate-osm-authentication'>Please log in to add a picture</div>";
} }
let uploadingMessage = "";
if (this._isUploading.data == 1) { if (this._isUploading.data == 1) {
return "<b>Bezig met een foto te uploaden...</b>" uploadingMessage = "<b>Uploading a picture...</b>"
} }
if (this._isUploading.data > 0) { if (this._isUploading.data > 0) {
return "<b>Bezig met uploaden, nog " + this._isUploading.data + " foto's te gaan...</b>" uploadingMessage = "<b>Uploading multiple pictures, " + this._isUploading.data + " left...</b>"
} }
return "" + return "" +
@ -81,10 +67,12 @@ export class ImageUploadFlow extends UIElement {
"<div class='imageflow-file-input-wrapper'>" + "<div class='imageflow-file-input-wrapper'>" +
"<img src='./assets/camera-plus.svg' alt='upload image'/> " + "<img src='./assets/camera-plus.svg' alt='upload image'/> " +
"<span class='imageflow-add-picture'>Voeg foto toe</span>" + "<span class='imageflow-add-picture'>Add a picture</span>" +
"<div class='break'></div>"+ "<div class='break'></div>" +
"</div>" + "</div>" +
this._licensePicker.Render() +
this._licensePicker.Render() + "<br/>" +
uploadingMessage +
"</label>" + "</label>" +

View file

@ -22,7 +22,7 @@ export class MessageBoxHandler {
} }
} }
new VariableUiElement(new UIEventSource<string>("<h2>Naar de kaart</h2>"), new VariableUiElement(new UIEventSource<string>("<h2>Return to the map</h2>"),
() => { () => {
document.getElementById("to-the-map").onclick = function () { document.getElementById("to-the-map").onclick = function () {
uielement.setData(undefined); uielement.setData(undefined);

View file

@ -19,7 +19,7 @@ export class SaveButton extends UIElement {
) { ) {
return "<span class='save-non-active'>Opslaan</span>" return "<span class='save-non-active'>Opslaan</span>"
} }
return "<span class='save'>Opslaan</span>"; return "<span class='save'>Save</span>";
} }
} }

View file

@ -60,7 +60,7 @@ export class UserBadge extends UIElement {
protected InnerRender(): string { protected InnerRender(): string {
const user = this._userDetails.data; const user = this._userDetails.data;
if (!user.loggedIn) { if (!user.loggedIn) {
return "<div class='activate-osm-authentication'>Klik hier om aan te melden bij OSM</div>"; return "<div class='activate-osm-authentication'>Login with OpenStreetMap</div>";
} }