From 494eeddf59ccb66b259f9ef2d8dcb6292d2f100d Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Fri, 15 Jan 2021 14:23:49 +0100 Subject: [PATCH] improved translations --- .../translations/Application.de.translation | 44 ++++++++----------- .../de/srsoftware/web4rail/Constants.java | 1 + .../java/de/srsoftware/web4rail/Plan.java | 8 ++-- .../java/de/srsoftware/web4rail/Route.java | 4 +- .../srsoftware/web4rail/actions/Action.java | 2 +- .../web4rail/actions/ConditionalAction.java | 2 +- .../web4rail/actions/DelayedAction.java | 2 +- .../de/srsoftware/web4rail/actions/Loop.java | 2 +- .../web4rail/actions/SetDisplayText.java | 2 +- .../srsoftware/web4rail/actions/ShowText.java | 2 +- .../de/srsoftware/web4rail/moving/Car.java | 2 +- .../web4rail/moving/Locomotive.java | 2 +- .../de/srsoftware/web4rail/moving/Train.java | 16 +++---- .../srsoftware/web4rail/tiles/Decoupler.java | 4 +- .../de/srsoftware/web4rail/tiles/Turnout.java | 2 +- .../srsoftware/web4rail/tiles/TurnoutL.java | 4 +- .../srsoftware/web4rail/tiles/TurnoutR.java | 4 +- 17 files changed, 49 insertions(+), 54 deletions(-) diff --git a/resources/translations/Application.de.translation b/resources/translations/Application.de.translation index ea691f5..36ea462 100644 --- a/resources/translations/Application.de.translation +++ b/resources/translations/Application.de.translation @@ -1,9 +1,8 @@ abort : abbrechen Accessory : Zubehör Actions : Aktionen -Actions\: : Aktionen: Actions and contacts : Aktionen und Kontakte -Action type\: : Aktions-Typ +Action type : Aktions-Typ Actions will only fire, if all conditions are fullfilled. : Aktionen werden nur ausgeführt, wenn alle Bedingungen erfüllt sind. ActivateRoute : Route aktivieren add : hinzufügen @@ -11,9 +10,9 @@ add command for {} : Kommando für {} hinzufügen Added {} : {} hinzugefügt add action : Aktion hinzufügen Add action to action list : Aktion zur Liste hinzufügen -add car\: : Waggon hinzufügen: +add car : Waggon hinzufügen Add condition : Bedingung hinzufügen -add locomotive\: : Lok hinzufügen: +add locomotive : Lok hinzufügen add new aspect : neues Signalbild hinzufügen add new car : neuen Waggon anlegen Add new custom field : neues benutzerdefiniertes Feld hinzufügen @@ -23,7 +22,6 @@ Add tag "{}" to train : Markierung "{}" zu Zug hinzufügen Add tile : Kachel hinzufügen AddRemoveTag : Markierung hinzufügen/entfernen Address : Adresse -Address\: : Adresse: analyze : analysieren Analyze : analysieren Analyze may overwrite these routes! : Durch die Analyse können diese Fahrstraßen überschrieben werden! @@ -59,7 +57,7 @@ Brake time table : Bremszeit-Tabelle CarInTrain : Wagen im Zug Car manager : Waggon-Verwaltung CarOrientation : Wagen-Laufrichtung -Cars\: : Waggons: +Cars : Waggons Click here to add conditions : Hier klicken, um Bedingungen hinzuzufügen Click here to select block! : Hier klicken, um Block auszuwählen! Click here to select car! : Hier klicken, um Fahrzeug auszuwählen! @@ -75,7 +73,7 @@ Click on a name to edit the entry. : Klicke auf einen Namen, um einen Eintrag zu Command to send : Kommando, welches gesendet werden soll ConditionalAction : bedingte Aktion Conditions : Bedingungen -Condition type\: : Bedingungs-Typ: +Condition type : Bedingungs-Typ Connected to {}. : Mit {} verbunden. Confirmation required : Bestätigung erforderlich Contact : Kontakt @@ -84,7 +82,6 @@ Control unit : Zentrale copy : kopieren Counterpart : Gegenstück Create action : Aktion erzeugen -Current location\: : Aktueller Ort: Current location : Aufenthaltsort Current location\: {} : Aufenthaltsort: {} Current velocity\: {} {} : Aktuelle Geschwindigkeit: {} {} @@ -94,7 +91,6 @@ DelayedAction : verzögerte Aktion delete : entfernen delete route : Route löschen Destination : Ziel -Destination\: : Ziel: Destination\: {} from {} : Ziel: {} von {} DetermineTrainInBlock : Zug im Block bestimmen Determine, which train is in {} : Bestimmen, welcher Zug sich in {} befindet @@ -125,7 +121,7 @@ Faster (10 {}) : 10 {} schneller Final speed after breaking, before halting : Endgeschwindigkeit nach Bremsvorgang, vor dem Anhalten FinishRoute : Route abschließen Firing {} : starte {} -For each {} do\: : Mit jedem {}: +For each {} do : Mit jedem {} forward : vorwärts Found {} routes. : {} Routen gefunden. FreeStartBlock : Start-Block freigeben @@ -137,7 +133,7 @@ Height : Höhe Help : Hilfe Hold : an lassen (id\: {}, length\: {}) : (Id: {}, Länge: {}) -if ({})\: : falls ({}): +if ({}) : falls ({}) If checked, tiles behind the train are freed according to the length of the train and the tiles. If it is unchecked, tiles will not get free before route is finished. Falls aktiviert, wird die Strecke anhand von Zug- und Kachel-Länge hinter dem Zug freigegeben, Falls deaktiviert wird die Strecke hinter dem Zug erst bei Abschluss der Route freigegeben. internal contacts : interne Kontakte @@ -151,14 +147,14 @@ Label for state {} : Beschriftung für Status {} Last blocks : Letzte Blöcke learn : lernen LEFT : links -Left port\: : Port für links +Left port : Port für links Length : Länge -length\: : Länge: +length : Länge length\: {} : Länge: {} Length unit : Längeneinheit Locked by {} : Durch {} besetzt Locomotive manager : Lok-Verwaltung -Locomotives\: : Lokomotiven: +Locomotives : Lokomotiven Locomotives and cars : Lokomotiven und Waggons Loop : Wiederholung Lower speed limit : Minimale Geschwindigkeit @@ -171,7 +167,7 @@ Maximum train length : maximale Zug-Länge Minimum delay : minimale Verzögerung Minimum and maximum times (in Miliseconds) trains with the respective tag have to wait in this block. : Minamle und maximale Block-Haltezeit (in Millisekunden) für Züge mit der entsprchender Markierung. Move tiles : Kacheln verschieben -name\: : Name: +name : Name new car : neuer Waggon new contact : neuer Kontakt new direction : neue Fahrtrichtung @@ -187,7 +183,7 @@ No tile moved. : keine Kachel verschoben. {} not within last {} blocks of train : {} ist nicht in den letzten {} Blöcken des Zugs {} now heading for {} : {} ist nun unterwegs nach {} {} now in auto-mode : {} ist nun im Automatikmodus -Occupied area\: : Belegte Abschnitte: +Occupied area : Belegte Abschnitte Off : Aus On : An One of : eine von @@ -224,7 +220,7 @@ reverse : wenden reverse train : Zug wenden Reversed {}. : {} umgedreht. RIGHT : rechts -Right port\: : Port für rechts +Right port : Port für rechts RouteEndBlock : Routen-End-Block Route does not end at {}. : Route endet nicht in {}. Route ends at {}. : Route endet in {}. @@ -238,11 +234,11 @@ SavePlan : Plan speichern Seek in last : Durchsuche letzte Select block : Block auswählen Select car : Fahrzeug auswählen -Select contact\: : Kotakt auswählen: +Select contact : Kotakt auswählen Select display : Anzeige auswählen Select from plan : Auf Plan auswählen Select object : Objekt auswählen -Select relay\: : Relais auswählen: +Select relay : Relais auswählen Select state : Status auswählen Select train : Zug auswählen Select turnout : Weiche wählen @@ -286,22 +282,21 @@ Stop autopilot : Autopilot abschalten Stopsettings : Halte-Einstellungen StopTrain : Zug stoppen Stop train immediately : Zug sofort anhalten -Straight port\: : Port für gerade +Straight port : Port für gerade STRAIGHT : gerade SwitchFunction : Funktion schalten Switch power off : Strom ausschalten Switch power on : Strom anschalten SYSTEM : Betriebssystem Tags : Markierungen -Text to display on clients\: : Text, welcher auf den Clients angezeigt werden soll: -Text to show on display\: : Text, welcher in der Anzeige dargestellt werden soll: +Text to display on clients : Text, welcher auf den Clients angezeigt werden soll +Text to show on display : Text, welcher in der Anzeige dargestellt werden soll Tile(s) : Kachel(n) Tile(s) moved. : Kachel(n) verschoben. Toggle : umschalten toggle {} : {} umschalten Toggle power : Stom umschalten Train : Zug -Train\: : Zug: train contains {} : {} ist im Zug train does not contain {} : {} ist nicht im Zug train does not have tag "{}" : Zug hat keine Markierung „{}“ @@ -316,7 +311,6 @@ train is slower than {} {} : Zug ist langsamer als {} {} TrainLength : Zug-Länge Train manager : Zug-Verwaltung Trains : Züge -Trains\: : Züge: TrainSelect : Zug-Auswahl TrainSpeed : Zug-Geschwindigkeit Train speed : Zug-Geschwindigkeit @@ -345,7 +339,7 @@ Unknown action\: {} : Unbekannte Aktion: {} unset : ungesetzt WaitForContact : Auf Kontakt warten Wait for {}, then : auf {} warten, dann -Wait {} ms, then\: : {} ms warten, dann: +Wait {} ms, then : {} ms warten, dann {} waiting {} secs... : {} wartet {} Sekunden... Wait times : Wartezeiten Was not able to assign {} to {}! : Konnte {} nicht an {} zuweisen! diff --git a/src/main/java/de/srsoftware/web4rail/Constants.java b/src/main/java/de/srsoftware/web4rail/Constants.java index 3af6b69..5674174 100644 --- a/src/main/java/de/srsoftware/web4rail/Constants.java +++ b/src/main/java/de/srsoftware/web4rail/Constants.java @@ -51,6 +51,7 @@ public interface Constants { public static final String BLOCK = "block"; + public static final String COL = " "; public static final String CONTACT = "contact"; public static final String CONTEXT = "context"; public static final String DEFAULT_SPEED_UNIT = "km/h"; diff --git a/src/main/java/de/srsoftware/web4rail/Plan.java b/src/main/java/de/srsoftware/web4rail/Plan.java index b80f954..8766de0 100644 --- a/src/main/java/de/srsoftware/web4rail/Plan.java +++ b/src/main/java/de/srsoftware/web4rail/Plan.java @@ -343,9 +343,9 @@ public class Plan extends BaseClass{ Form form = new Form("plan-properties-form"); new Input(REALM,REALM_PLAN).hideIn(form); new Input(ACTION,ACTION_UPDATE).hideIn(form); - new Input(LENGTH_UNIT, lengthUnit).addTo(new Label(t("Length unit")+":"+NBSP)).addTo(form); - new Input(SPEED_UNIT, speedUnit).addTo(new Label(t("Speed unit")+":"+NBSP)).addTo(form); - new Input(FINAL_SPEED, Route.endSpeed).addTo(new Label(t("Lower speed limit")+":"+NBSP)).attr("title", t("Final speed after breaking, before halting")).addTo(form); + new Input(LENGTH_UNIT, lengthUnit).addTo(new Label(t("Length unit")+COL)).addTo(form); + new Input(SPEED_UNIT, speedUnit).addTo(new Label(t("Speed unit")+COL)).addTo(form); + new Input(FINAL_SPEED, Route.endSpeed).addTo(new Label(t("Lower speed limit")+COL)).attr("title", t("Final speed after breaking, before halting")).addTo(form); new Checkbox(FREE_BEHIND_TRAIN, t("Free tiles behind train"), Route.freeBehindTrain).attr("title", t("If checked, tiles behind the train are freed according to the length of the train and the tiles. If it is unchecked, tiles will not get free before route is finished.")).addTo(form); new Button(t("Save"), form).addTo(form); form.addTo(fieldset); @@ -772,7 +772,7 @@ public class Plan extends BaseClass{ Form form = new Form("rename-form"); new Input(REALM, REALM_PLAN).hideIn(form); new Input(ACTION, RENAME).hideIn(form); - new Input(NAME,name).addTo(new Label(t("Enter new name for plan")+":"+NBSP)).addTo(form); + new Input(NAME,name).addTo(new Label(t("Enter new name for plan")+COL)).addTo(form); new Button(t("Save"), form).addTo(form); return form.addTo(win); } diff --git a/src/main/java/de/srsoftware/web4rail/Route.java b/src/main/java/de/srsoftware/web4rail/Route.java index 8eb119a..50a3d2d 100644 --- a/src/main/java/de/srsoftware/web4rail/Route.java +++ b/src/main/java/de/srsoftware/web4rail/Route.java @@ -431,7 +431,7 @@ public class Route extends BaseClass { Fieldset win = new Fieldset(t("Actions and contacts")); Tag list = new Tag("ol"); - Tag setup = new Tag("li").content(t("Setup actions")+NBSP); + Tag setup = new Tag("li").content(t("Setup actions")+COL); ActionList setupActions = triggeredActions.get(ROUTE_SETUP); if (isNull(setupActions)) { setupActions = new ActionList(this); @@ -439,7 +439,7 @@ public class Route extends BaseClass { } setupActions.list().addTo(setup).addTo(list); - Tag start = new Tag("li").content(t("Start actions")+NBSP); + Tag start = new Tag("li").content(t("Start actions")+COL); ActionList startActions = triggeredActions.get(ROUTE_START); if (isNull(startActions)) { startActions = new ActionList(this); diff --git a/src/main/java/de/srsoftware/web4rail/actions/Action.java b/src/main/java/de/srsoftware/web4rail/actions/Action.java index 4d0b63a..2712536 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/Action.java +++ b/src/main/java/de/srsoftware/web4rail/actions/Action.java @@ -154,7 +154,7 @@ public abstract class Action extends BaseClass { } for (Entry entry : names.entrySet()) select.addOption(entry.getValue(), entry.getKey()); - return select.addTo(new Label(t("Action type:")+NBSP)); + return select.addTo(new Label(t("Action type")+COL)); } protected static String t(String tex,Object...fills) { diff --git a/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java b/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java index 3fcf2ac..d490088 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java +++ b/src/main/java/de/srsoftware/web4rail/actions/ConditionalAction.java @@ -85,7 +85,7 @@ public class ConditionalAction extends ActionList { @Override public String toString() { if (conditions.isEmpty()) return "["+t("Click here to add conditions")+"]"; - return t("if ({}):",conditions); + return t("if ({})",conditions)+COL; } @Override diff --git a/src/main/java/de/srsoftware/web4rail/actions/DelayedAction.java b/src/main/java/de/srsoftware/web4rail/actions/DelayedAction.java index 22d9af1..f7aed7d 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/DelayedAction.java +++ b/src/main/java/de/srsoftware/web4rail/actions/DelayedAction.java @@ -80,7 +80,7 @@ public class DelayedAction extends ActionList { @Override public String toString() { - return t("Wait {} ms, then:",min_delay < max_delay ? min_delay+"…"+max_delay : min_delay); + return t("Wait {} ms, then",min_delay < max_delay ? min_delay+"…"+max_delay : min_delay)+COL; } @Override diff --git a/src/main/java/de/srsoftware/web4rail/actions/Loop.java b/src/main/java/de/srsoftware/web4rail/actions/Loop.java index c7b19c0..a2212d3 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/Loop.java +++ b/src/main/java/de/srsoftware/web4rail/actions/Loop.java @@ -79,7 +79,7 @@ public class Loop extends ActionList { } public String toString() { - return t("For each {} do:",object); + return t("For each {} do",object)+COL; }; private Tag typeSelector() { diff --git a/src/main/java/de/srsoftware/web4rail/actions/SetDisplayText.java b/src/main/java/de/srsoftware/web4rail/actions/SetDisplayText.java index a23ac5e..eb75178 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/SetDisplayText.java +++ b/src/main/java/de/srsoftware/web4rail/actions/SetDisplayText.java @@ -34,7 +34,7 @@ public class SetDisplayText extends TextAction{ @Override protected Label label() { - return new Label(t("Text to show on display:")+NBSP); + return new Label(t("Text to show on display")+COL); } @Override diff --git a/src/main/java/de/srsoftware/web4rail/actions/ShowText.java b/src/main/java/de/srsoftware/web4rail/actions/ShowText.java index ff94ba1..c49b083 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/ShowText.java +++ b/src/main/java/de/srsoftware/web4rail/actions/ShowText.java @@ -18,7 +18,7 @@ public class ShowText extends TextAction{ @Override protected Label label() { - return new Label(t("Text to display on clients:")+NBSP); + return new Label(t("Text to display on clients")+COL); } @Override diff --git a/src/main/java/de/srsoftware/web4rail/moving/Car.java b/src/main/java/de/srsoftware/web4rail/moving/Car.java index 1e5a776..09b5c95 100644 --- a/src/main/java/de/srsoftware/web4rail/moving/Car.java +++ b/src/main/java/de/srsoftware/web4rail/moving/Car.java @@ -213,7 +213,7 @@ public class Car extends BaseClass implements Comparable{ new Input(ACTION, ACTION_ADD).hideIn(form); new Input(REALM,REALM_CAR).hideIn(form); Fieldset fieldset = new Fieldset(t("add new car")); - new Input(Locomotive.NAME, t("new car")).addTo(new Label(t("Name:")+NBSP)).addTo(fieldset); + new Input(Locomotive.NAME, t("new car")).addTo(new Label(t("Name")+COL)).addTo(fieldset); new Button(t("Apply"),form).addTo(fieldset); fieldset.addTo(form).addTo(win); return win; diff --git a/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java b/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java index eaab2e6..3e89054 100644 --- a/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java +++ b/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java @@ -241,7 +241,7 @@ public class Locomotive extends Car implements Constants,Device{ new Input(ACTION, ACTION_ADD).hideIn(form); new Input(REALM,REALM_LOCO).hideIn(form); Fieldset fieldset = new Fieldset(t("add new locomotive")); - new Input(Locomotive.NAME, t("new locomotive")).addTo(new Label(t("Name:")+NBSP)).addTo(fieldset); + new Input(Locomotive.NAME, t("new locomotive")).addTo(new Label(t("Name")+COL)).addTo(fieldset); new Button(t("Apply"),form).addTo(fieldset); fieldset.addTo(form).addTo(win); return win; diff --git a/src/main/java/de/srsoftware/web4rail/moving/Train.java b/src/main/java/de/srsoftware/web4rail/moving/Train.java index 943b3ec..08f6807 100644 --- a/src/main/java/de/srsoftware/web4rail/moving/Train.java +++ b/src/main/java/de/srsoftware/web4rail/moving/Train.java @@ -285,7 +285,7 @@ public class Train extends BaseClass implements Comparable { List locos = BaseClass.listElements(Locomotive.class).stream().filter(loco -> isNull(loco.train())).collect(Collectors.toList()); if (!locos.isEmpty()) { Form addLocoForm = new Form("append-loco-form"); - addLocoForm.content(t("add locomotive:")+" "); + addLocoForm.content(t("add locomotive")+COL); new Input(REALM, REALM_TRAIN).hideIn(addLocoForm); new Input(ACTION, ACTION_ADD).hideIn(addLocoForm); new Input(ID,id).hideIn(addLocoForm); @@ -299,7 +299,7 @@ public class Train extends BaseClass implements Comparable { List cars = BaseClass.listElements(Car.class).stream().filter(car -> !(car instanceof Locomotive)).filter(loco -> isNull(loco.train())).collect(Collectors.toList()); if (!cars.isEmpty()) { Form addCarForm = new Form("append-car-form"); - addCarForm.content(t("add car:")+" "); + addCarForm.content(t("add car")+COL); new Input(REALM, REALM_TRAIN).hideIn(addCarForm); new Input(ACTION, ACTION_ADD).hideIn(addCarForm); new Input(ID,id).hideIn(addCarForm); @@ -497,7 +497,7 @@ public class Train extends BaseClass implements Comparable { new Input(ACTION, ACTION_ADD).hideIn(form); new Input(REALM,REALM_TRAIN).hideIn(form); Fieldset fieldset = new Fieldset(t("add new train")); - new Input(Train.NAME, t("new train")).addTo(new Label(t("Name:")+NBSP)).addTo(fieldset); + new Input(Train.NAME, t("new train")).addTo(new Label(t("Name")+COL)).addTo(fieldset); Select select = new Select(LOCO_ID); BaseClass.listElements(Locomotive.class) @@ -505,7 +505,7 @@ public class Train extends BaseClass implements Comparable { .filter(loco -> isNull(loco.train())) .sorted((l1,l2)->l1.name().compareTo(l2.name())) .forEach(loco -> select.addOption(loco.id(),loco.name())); - select.addTo(new Label(t("Locomotive:")+NBSP)).addTo(fieldset); + select.addTo(new Label(t("Locomotive")+COL)).addTo(fieldset); new Button(t("Apply"),form).addTo(fieldset); fieldset.addTo(form).addTo(win); @@ -567,13 +567,13 @@ public class Train extends BaseClass implements Comparable { carList().addTo(propList); - if (isSet(currentBlock)) currentBlock.button(currentBlock.toString()).addTo(new Tag("li").content(t("Current location:")+NBSP)).addTo(propList); + if (isSet(currentBlock)) currentBlock.button(currentBlock.toString()).addTo(new Tag("li").content(t("Current location")+COL)).addTo(propList); Tag directionLi = null; if (isSet(direction)) directionLi = new Tag("li").content(t("Direction: heading {}",direction)+NBSP); if (isNull(directionLi)) directionLi = new Tag("li"); button(t("reverse"), Map.of(ACTION,ACTION_REVERSE)).title(t("Turns the train, as if it went through a loop.")).addTo(directionLi).addTo(propList); - Tag dest = new Tag("li").content(t("Destination:")+NBSP); + Tag dest = new Tag("li").content(t("Destination")+COL); if (isNull(destination)) { new Button(t("Select from plan"),"return selectDest("+id+");").addTo(dest); } else { @@ -584,7 +584,7 @@ public class Train extends BaseClass implements Comparable { dest.addTo(propList); if (isSet(route)) route.link("li", route).addTo(propList); int ms = maxSpeed(); - if (ms < Integer.MAX_VALUE) new Tag("li").content(t("Maximum Speed")+": "+maxSpeed()+NBSP+speedUnit).addTo(propList); + if (ms < Integer.MAX_VALUE) new Tag("li").content(t("Maximum Speed")+COL+maxSpeed()+NBSP+speedUnit).addTo(propList); SortedSet allTags = tags(); if (!allTags.isEmpty()) { @@ -595,7 +595,7 @@ public class Train extends BaseClass implements Comparable { new Tag("li").content(t("length: {}",length())+NBSP+lengthUnit).addTo(propList); if (!trace.isEmpty()) { - Tag li = new Tag("li").content(t("Occupied area:")); + Tag li = new Tag("li").content(t("Occupied area")+COL); Tag ul = new Tag("ul"); for (Tile tile : trace) new Tag("li").content(tile.toString()).addTo(ul); ul.addTo(li).addTo(propList); diff --git a/src/main/java/de/srsoftware/web4rail/tiles/Decoupler.java b/src/main/java/de/srsoftware/web4rail/tiles/Decoupler.java index 5a48623..9cc2208 100644 --- a/src/main/java/de/srsoftware/web4rail/tiles/Decoupler.java +++ b/src/main/java/de/srsoftware/web4rail/tiles/Decoupler.java @@ -117,8 +117,8 @@ public abstract class Decoupler extends Tile implements Device{ new Radio(PROTOCOL, proto.toString(), t(proto.toString()), proto == protocol).addTo(div); } formInputs.add(t("Protocol"),div); - formInputs.add(t("Address:"),new Input(ADDRESS, address).numeric()); - formInputs.add(t("Port:"),new Input(PORT, port).numeric()); + formInputs.add(t("Address"),new Input(ADDRESS, address).numeric()); + formInputs.add(t("Port"),new Input(PORT, port).numeric()); return super.properties(preForm, formInputs, postForm); } diff --git a/src/main/java/de/srsoftware/web4rail/tiles/Turnout.java b/src/main/java/de/srsoftware/web4rail/tiles/Turnout.java index 2d207f1..4d9edcf 100644 --- a/src/main/java/de/srsoftware/web4rail/tiles/Turnout.java +++ b/src/main/java/de/srsoftware/web4rail/tiles/Turnout.java @@ -122,7 +122,7 @@ public abstract class Turnout extends Tile implements Device{ new Radio(PROTOCOL, proto.toString(), t(proto.toString()), proto == protocol).addTo(div); } formInputs.add(t("Protocol"),div); - formInputs.add(t("Address:"),new Input(ADDRESS, address).numeric()); + formInputs.add(t("Address"),new Input(ADDRESS, address).numeric()); return super.properties(preForm, formInputs, postForm); } diff --git a/src/main/java/de/srsoftware/web4rail/tiles/TurnoutL.java b/src/main/java/de/srsoftware/web4rail/tiles/TurnoutL.java index e8b48b3..8c42d99 100644 --- a/src/main/java/de/srsoftware/web4rail/tiles/TurnoutL.java +++ b/src/main/java/de/srsoftware/web4rail/tiles/TurnoutL.java @@ -35,8 +35,8 @@ public abstract class TurnoutL extends Turnout { @Override protected Window properties(List
preForm, FormInput formInputs, List
postForm) { - formInputs.add(t("Straight port:"),new Input(STRAIGHT, portA).numeric()); - formInputs.add(t("Left port:"),new Input(LEFT, portB).numeric()); + formInputs.add(t("Straight port")+COL,new Input(STRAIGHT, portA).numeric()); + formInputs.add(t("Left port")+COL,new Input(LEFT, portB).numeric()); return super.properties(preForm, formInputs, postForm); } diff --git a/src/main/java/de/srsoftware/web4rail/tiles/TurnoutR.java b/src/main/java/de/srsoftware/web4rail/tiles/TurnoutR.java index 863ce30..6e19010 100644 --- a/src/main/java/de/srsoftware/web4rail/tiles/TurnoutR.java +++ b/src/main/java/de/srsoftware/web4rail/tiles/TurnoutR.java @@ -36,8 +36,8 @@ public abstract class TurnoutR extends Turnout { @Override protected Window properties(List
preForm, FormInput formInputs, List
postForm) { - formInputs.add(t("Straight port:"),new Input(STRAIGHT, portA).numeric()); - formInputs.add(t("Right port:"),new Input(RIGHT, portB).numeric()); + formInputs.add(t("Straight port")+COL,new Input(STRAIGHT, portA).numeric()); + formInputs.add(t("Right port")+COL,new Input(RIGHT, portB).numeric()); return super.properties(preForm, formInputs, postForm); }