StephanRichter/Web4Rail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improved texts

Browse Source
This commit is contained in:
Stephan Richter
2020-10-30 11:03:36 +01:00
parent 38ee7b5e12
commit 05784f94ce
9 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/translations/Application.de.translation
View File

@@ -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:

2
src/main/java/de/srsoftware/web4rail/ControlUnit.java
View File

@@ -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);

2
src/main/java/de/srsoftware/web4rail/Route.java
View File

@@ -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);
}

2
src/main/java/de/srsoftware/web4rail/actions/SetSpeed.java
View File

@@ -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;
}

2
src/main/java/de/srsoftware/web4rail/conditions/TrainSelect.java
View File

@@ -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;
}

2
src/main/java/de/srsoftware/web4rail/moving/Car.java
View File

@@ -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()));

2
src/main/java/de/srsoftware/web4rail/moving/Locomotive.java
View File

@@ -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;
}

4
src/main/java/de/srsoftware/web4rail/moving/Train.java
View File

@@ -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);

2
src/main/java/de/srsoftware/web4rail/tiles/Tile.java
View File

@@ -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()));