Game api additions, Refactoring, Translation api edits
This commit is contained in:
@@ -7,13 +7,17 @@ import java.io.File;
|
||||
import java.nio.file.Files;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
public class Languages {
|
||||
private static Languages instance;
|
||||
private boolean blockAccess = false;
|
||||
private static final Logger logger = Logger.getLogger("translation");
|
||||
|
||||
|
||||
private Map<String, Lang> languages = new HashMap<>();
|
||||
|
||||
public static final String defaultLanguage = "de_de";
|
||||
public static Languages getInstance() {
|
||||
if(instance == null) instance = new Languages();
|
||||
return instance;
|
||||
@@ -27,7 +31,7 @@ public class Languages {
|
||||
return getLanguage(p.getSettings().getLocale());
|
||||
}
|
||||
public Lang getLanguage(String mapId) {
|
||||
return languages.computeIfAbsent(mapId, unused -> languages.computeIfAbsent("en_us", (key) -> new DummyLang()));
|
||||
return languages.computeIfAbsent(mapId, unused -> languages.computeIfAbsent(defaultLanguage, (key) -> new DummyLang()));
|
||||
}
|
||||
|
||||
private void readAll() {
|
||||
@@ -35,13 +39,13 @@ public class Languages {
|
||||
File[] files = locales.listFiles(File::canRead);
|
||||
|
||||
if(files.length == 0) {
|
||||
System.err.println("Failed to find any Language-files!");
|
||||
logger.warning("Failed to find any Language-files!");
|
||||
return;
|
||||
}
|
||||
|
||||
for(File locale : files) {
|
||||
try {
|
||||
System.out.print("reading translation " + locale.getName() + " ... ");
|
||||
logger.info("reading translation " + locale.getName());
|
||||
|
||||
Map<Integer, Lang> langColumn = new HashMap<>();
|
||||
String namespace = "";
|
||||
@@ -93,9 +97,8 @@ public class Languages {
|
||||
}
|
||||
}
|
||||
|
||||
System.out.println("ok");
|
||||
} catch (Exception e) {
|
||||
System.out.println("fail: " + e.getMessage());
|
||||
logger.warning("Exception while parsing lang-files: " + e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user