Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] use Locale.toLanguageTag() instead of toString()

This commit is contained in:
Robert von Burg 2019-05-30 16:15:13 +02:00
parent d8b4df4ca0
commit 8c3caab640
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
li.strolch.model/src/main/java/li/strolch/model/json/PrivilegeElementToJsonVisitor.java
View File

@ -19,7 +19,7 @@ public class PrivilegeElementToJsonVisitor implements PrivilegeElementVisitor<Js
jsonObject.addProperty("firstname", userRep.getFirstname());
jsonObject.addProperty("lastname", userRep.getLastname());
jsonObject.addProperty("userState", userRep.getUserState().name());
jsonObject.addProperty("locale", userRep.getLocale().toString());
jsonObject.addProperty("locale", userRep.getLocale().toLanguageTag());
JsonArray rolesArr = new JsonArray();
jsonObject.add("roles", rolesArr);

2
li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuthenticationService.java
View File

@ -293,7 +293,7 @@ public class AuthenticationService {
loginResult.addProperty("username", certificate.getUsername());
loginResult.addProperty("firstname", certificate.getFirstname());
loginResult.addProperty("lastname", certificate.getLastname());
loginResult.addProperty("locale", certificate.getLocale().toString());
loginResult.addProperty("locale", certificate.getLocale().toLanguageTag());
if (!certificate.getPropertyMap().isEmpty()) {
JsonObject propObj = new JsonObject();

16
li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ReportResource.java
View File

@ -101,8 +101,8 @@ public class ReportResource {
if (localesF.exists()) {
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
.getAsJsonObject();
if (localesJ.has(cert.getLocale().toString()))
localeJ = localesJ.get(cert.getLocale().toString()).getAsJsonObject();
if (localesJ.has(cert.getLocale().toLanguageTag()))
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
}
JsonArray result = new JsonArray();
@ -156,8 +156,8 @@ public class ReportResource {
if (localesF.exists()) {
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
.getAsJsonObject();
if (localesJ.has(cert.getLocale().toString()))
localeJ = localesJ.get(cert.getLocale().toString()).getAsJsonObject();
if (localesJ.has(cert.getLocale().toLanguageTag()))
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
}
try (StrolchTransaction tx = RestfulStrolchComponent.getInstance().openTx(cert, realm, getContext());
@ -255,8 +255,8 @@ public class ReportResource {
if (localesF.exists()) {
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
.getAsJsonObject();
if (localesJ.has(cert.getLocale().toString()))
localeJ = localesJ.get(cert.getLocale().toString()).getAsJsonObject();
if (localesJ.has(cert.getLocale().toLanguageTag()))
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
}
long start = System.nanoTime();
@ -375,8 +375,8 @@ public class ReportResource {
if (localesF.exists()) {
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
.getAsJsonObject();
if (localesJ.has(cert.getLocale().toString()))
localeJ = localesJ.get(cert.getLocale().toString()).getAsJsonObject();
if (localesJ.has(cert.getLocale().toLanguageTag()))
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
}
// create CSV printer with header