From 05784f94ce2706e1a427a86242e2f502447bdac9 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Fri, 30 Oct 2020 11:03:36 +0100 Subject: [PATCH] improved texts --- resources/translations/Application.de.translation | 1 + src/main/java/de/srsoftware/web4rail/ControlUnit.java | 2 +- src/main/java/de/srsoftware/web4rail/Route.java | 2 +- src/main/java/de/srsoftware/web4rail/actions/SetSpeed.java | 2 +- .../java/de/srsoftware/web4rail/conditions/TrainSelect.java | 2 +- src/main/java/de/srsoftware/web4rail/moving/Car.java | 2 +- src/main/java/de/srsoftware/web4rail/moving/Locomotive.java | 2 +- src/main/java/de/srsoftware/web4rail/moving/Train.java | 4 ++-- src/main/java/de/srsoftware/web4rail/tiles/Tile.java | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/resources/translations/Application.de.translation b/resources/translations/Application.de.translation index 21f1d9b..9f53c17 100644 --- a/resources/translations/Application.de.translation +++ b/resources/translations/Application.de.translation @@ -2,6 +2,7 @@ Actions : Aktionen Added {} : {} hinzugefügt Add tile : Kachel hinzufügen Analyze plan : Plan analysieren +Apply : Übernehmen Contacts and actions : Kontakte und Aktionen Destination\: {} from {} : Ziel: {} von {} length\: : Länge: diff --git a/src/main/java/de/srsoftware/web4rail/ControlUnit.java b/src/main/java/de/srsoftware/web4rail/ControlUnit.java index a984a76..3abbd01 100644 --- a/src/main/java/de/srsoftware/web4rail/ControlUnit.java +++ b/src/main/java/de/srsoftware/web4rail/ControlUnit.java @@ -185,7 +185,7 @@ public class ControlUnit extends Thread implements Constants{ new Input(HOST,host).addTo(new Label(t("Hostname"))).addTo(fieldset); new Input(PORT,port).numeric().addTo(new Label(t("Port"))).addTo(fieldset); new Input(BUS,bus).numeric().addTo(new Label(t("Bus"))).addTo(fieldset); - new Button(t("Save")).addTo(fieldset).addTo(form).addTo(win); + new Button(t("Apply")).addTo(fieldset).addTo(form).addTo(win); fieldset = new Fieldset("Actions"); new Button(t("Connect"),"connectCu();").addTo(fieldset).addTo(win); diff --git a/src/main/java/de/srsoftware/web4rail/Route.java b/src/main/java/de/srsoftware/web4rail/Route.java index 5a2b668..d809c49 100644 --- a/src/main/java/de/srsoftware/web4rail/Route.java +++ b/src/main/java/de/srsoftware/web4rail/Route.java @@ -178,7 +178,7 @@ public class Route implements Constants{ new Tag("input").attr("type", "text").attr(NAME,"name").attr("value", name()).style("width: 80%").addTo(label); label.addTo(form); - new Tag("button").attr("type", "submit").content(t("save")).addTo(form); + new Tag("button").attr("type", "submit").content(t("Apply")).addTo(form); form.addTo(win); } diff --git a/src/main/java/de/srsoftware/web4rail/actions/SetSpeed.java b/src/main/java/de/srsoftware/web4rail/actions/SetSpeed.java index 500c828..433227d 100644 --- a/src/main/java/de/srsoftware/web4rail/actions/SetSpeed.java +++ b/src/main/java/de/srsoftware/web4rail/actions/SetSpeed.java @@ -49,7 +49,7 @@ public class SetSpeed extends Action{ Label label = new Label(t("Set speed to")+NBSP); new Input(MAX_SPEED, maxSpeed).addTo(label).content(NBSP+t("km/h")); label.addTo(form); - new Button(t("Save"),"return submitForm('"+formId+"');").addTo(form).addTo(win); + new Button(t("Apply"),"return submitForm('"+formId+"');").addTo(form).addTo(win); return win; } diff --git a/src/main/java/de/srsoftware/web4rail/conditions/TrainSelect.java b/src/main/java/de/srsoftware/web4rail/conditions/TrainSelect.java index 8a018cf..654921c 100644 --- a/src/main/java/de/srsoftware/web4rail/conditions/TrainSelect.java +++ b/src/main/java/de/srsoftware/web4rail/conditions/TrainSelect.java @@ -37,7 +37,7 @@ public class TrainSelect extends Condition { new Input(ID,id).hideIn(form); new Input(CONTEXT,params.get(CONTEXT)).hideIn(form); Train.selector(train, null).addTo(new Label(t("Select train:")+NBSP)).addTo(form); - new Button(t("Save"),"return submitForm('"+formId+"');").addTo(form).addTo(win); + new Button(t("Apply"),"return submitForm('"+formId+"');").addTo(form).addTo(win); return win; } diff --git a/src/main/java/de/srsoftware/web4rail/moving/Car.java b/src/main/java/de/srsoftware/web4rail/moving/Car.java index 739fdac..73c8f00 100644 --- a/src/main/java/de/srsoftware/web4rail/moving/Car.java +++ b/src/main/java/de/srsoftware/web4rail/moving/Car.java @@ -154,7 +154,7 @@ public class Car implements Constants { Tag form = propertyForm(); if (form!=null && form.children().size()>2) { - new Button(t("save")).addTo(form); + new Button(t("Apply")).addTo(form); form.addTo(win); } else { win.content(t("This tile ({}) has no editable properties",getClass().getSimpleName())); diff --git a/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java b/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java index 0f7c716..3d35fce 100644 --- a/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java +++ b/src/main/java/de/srsoftware/web4rail/moving/Locomotive.java @@ -214,7 +214,7 @@ public class Locomotive extends Car implements Constants,Device{ 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:")+" ")).addTo(fieldset); - new Button(t("save")).addTo(fieldset); + new Button(t("Apply")).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 299fa52..c197c61 100644 --- a/src/main/java/de/srsoftware/web4rail/moving/Train.java +++ b/src/main/java/de/srsoftware/web4rail/moving/Train.java @@ -299,7 +299,7 @@ public class Train implements Constants { for (Locomotive loco : Locomotive.list()) select.addOption(loco.id(),loco.name()); select.addTo(new Label(t("Locomotive:")+" ")).addTo(fieldset); - new Button(t("save")).addTo(fieldset); + new Button(t("Apply")).addTo(fieldset); fieldset.addTo(form).addTo(win); @@ -335,7 +335,7 @@ public class Train implements Constants { new Input(ID,id).hideIn(form); new Input(NAME,name).addTo(form); new Checkbox(PUSH_PULL, t("Push-pull train"), pushPull).addTo(form); - new Button(t("save")).addTo(form).addTo(fieldset); + new Button(t("Apply")).addTo(form).addTo(fieldset); new Button(t("Turn"), "train("+id+",'"+ACTION_TURN+"')").addTo(fieldset).addTo(window); diff --git a/src/main/java/de/srsoftware/web4rail/tiles/Tile.java b/src/main/java/de/srsoftware/web4rail/tiles/Tile.java index 9613b9d..aee8332 100644 --- a/src/main/java/de/srsoftware/web4rail/tiles/Tile.java +++ b/src/main/java/de/srsoftware/web4rail/tiles/Tile.java @@ -202,7 +202,7 @@ public abstract class Tile implements Constants{ String formId = "tile-properties-"+id(); Tag form = propForm(formId); if (form!=null && form.children().size()>3) { - new Button(t("save"),"submitForm('"+formId+"')").addTo(form); + new Button(t("Apply"),"submitForm('"+formId+"')").addTo(form); form.addTo(window); } else { window.content(t("This tile ({}) has no editable properties",getClass().getSimpleName()));