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

extended german translations

Browse Source
This commit is contained in:
Stephan Richter
2020-11-02 00:04:23 +01:00
parent f738df1e5c
commit 1749abace9
5 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,7 +256,7 @@ public class Route implements Constants{
Tag list = new Tag("ul");
for (Entry<Turnout, State> entry : turnouts.entrySet()) {
Turnout turnout = entry.getKey();
Plan.addLink(turnout, turnout+": "+entry.getValue(), list);
Plan.addLink(turnout, turnout+": "+t(entry.getValue().toString()), list);
}
list.addTo(win);
}

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

@@ -110,7 +110,7 @@ public abstract class Action implements Constants {
@Override
public String toString() {
return getClass().getSimpleName();
return t(getClass().getSimpleName());
}
protected Object update(HashMap<String, String> params) {

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

@@ -290,8 +290,8 @@ public class Train implements Comparable<Train>,Constants {
private Train load(JSONObject json) {
pushPull = json.getBoolean(PUSH_PULL);
if (json.has(NAME)) name = json.getString(NAME);
for (Object id : json.getJSONArray(CARS)) add(Car.get((String)id));
for (Object id : json.getJSONArray(LOCOS)) add((Locomotive) Car.get((String)id));
for (Object id : json.getJSONArray(CARS)) add(Car.get(id));
for (Object id : json.getJSONArray(LOCOS)) add((Locomotive) Car.get(id));
if (json.has(TAGS)) json.getJSONArray(TAGS).forEach(elem -> { tags.add(elem.toString()); });
if (json.has(DIRECTION)) direction = Direction.valueOf(json.getString(DIRECTION));
return this;
@@ -401,7 +401,7 @@ public class Train implements Comparable<Train>,Constants {
if (block != null) {
new Tag("li").content(t("Current location: {}",block)).addTo(propList);
Tag actions = new Tag("li").clazz().content(t("Actions: "));
Tag actions = new Tag("li").clazz().content(t("Actions:")+NBSP);
new Button(t("start"),"train("+id+",'"+ACTION_START+"')").addTo(actions);
if (autopilot == null) {
new Button(t("auto"),"train("+id+",'"+ACTION_AUTO+"')").addTo(actions);