Compare commits
3 Commits
podman
...
feature/tr
| Author | SHA1 | Date | |
|---|---|---|---|
| fea11ff9dc | |||
| 669853352e | |||
| f4adf2ca3c |
@@ -1,5 +1,5 @@
|
|||||||
FROM alpine:3.22 AS svelte_build
|
FROM alpine:3.22 AS svelte_build
|
||||||
RUN apk add bash git npm
|
RUN apk add npm
|
||||||
RUN adduser -Dh /home/svelte svelte
|
RUN adduser -Dh /home/svelte svelte
|
||||||
ADD . /home/svelte/Umbrella
|
ADD . /home/svelte/Umbrella
|
||||||
RUN chown -R svelte /home/svelte/Umbrella
|
RUN chown -R svelte /home/svelte/Umbrella
|
||||||
@@ -9,7 +9,7 @@ RUN npm install && npm run build
|
|||||||
|
|
||||||
|
|
||||||
FROM alpine AS java_build
|
FROM alpine AS java_build
|
||||||
RUN apk add bash git gradle fontconfig font-opensans openjdk21-jre
|
RUN apk add gradle fontconfig font-opensans openjdk21-jre
|
||||||
ADD . /Umbrella
|
ADD . /Umbrella
|
||||||
WORKDIR /Umbrella
|
WORKDIR /Umbrella
|
||||||
COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web
|
COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ public final class Document implements Mappable {
|
|||||||
case SENDER: if (json.get(key) instanceof JSONObject nested) sender.patch(nested); break;
|
case SENDER: if (json.get(key) instanceof JSONObject nested) sender.patch(nested); break;
|
||||||
case STATE: state = State.of(json.getInt(key)).orElseThrow(() -> new UmbrellaException(HTTP_UNPROCESSABLE,"Invalid state")); break;
|
case STATE: state = State.of(json.getInt(key)).orElseThrow(() -> new UmbrellaException(HTTP_UNPROCESSABLE,"Invalid state")); break;
|
||||||
case POS: if (json.get(key) instanceof JSONObject nested) positions.patch(nested); break;
|
case POS: if (json.get(key) instanceof JSONObject nested) positions.patch(nested); break;
|
||||||
case TEMPLATE_ID: if (json.get(key) instanceof String templateId) template = templateId; break;
|
case TEMPLATE: if (json.get(key) instanceof String templateId) template = templateId; break;
|
||||||
default: key = null;
|
default: key = null;
|
||||||
}
|
}
|
||||||
if (key != null) dirtyFields.add(key);
|
if (key != null) dirtyFields.add(key);
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
package de.srsoftware.umbrella.core.model;
|
||||||
|
|
||||||
|
import de.srsoftware.umbrella.core.ModuleRegistry;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
public class Translatable {
|
||||||
|
private final String message;
|
||||||
|
private Map<String, Object> fills;
|
||||||
|
private final HashMap<String,String> translated = new HashMap<>();
|
||||||
|
|
||||||
|
public Translatable(String message, Map<String,Object> fills){
|
||||||
|
this.fills = fills;
|
||||||
|
this.message = message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String translate(String language){
|
||||||
|
var translation = translated.get(language);
|
||||||
|
if (translation == null){
|
||||||
|
var translatedFills = new HashMap<String,String>();
|
||||||
|
if (fills != null) {
|
||||||
|
for (var entry : fills.entrySet()) {
|
||||||
|
var o = entry.getValue();
|
||||||
|
var val = switch (o) {
|
||||||
|
case Translatable tr -> tr.translate(language);
|
||||||
|
case String s -> s;
|
||||||
|
default -> o.toString();
|
||||||
|
};
|
||||||
|
translatedFills.put(entry.getKey(), val);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
translation = ModuleRegistry.translator().translate(language,message,translatedFills);
|
||||||
|
translated.put(language,translation);
|
||||||
|
}
|
||||||
|
return translation;
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user