[Fix] use Locale.toLanguageTag() instead of toString()
This commit is contained in:
parent
d8b4df4ca0
commit
8c3caab640
|
@ -19,7 +19,7 @@ public class PrivilegeElementToJsonVisitor implements PrivilegeElementVisitor<Js
|
||||||
jsonObject.addProperty("firstname", userRep.getFirstname());
|
jsonObject.addProperty("firstname", userRep.getFirstname());
|
||||||
jsonObject.addProperty("lastname", userRep.getLastname());
|
jsonObject.addProperty("lastname", userRep.getLastname());
|
||||||
jsonObject.addProperty("userState", userRep.getUserState().name());
|
jsonObject.addProperty("userState", userRep.getUserState().name());
|
||||||
jsonObject.addProperty("locale", userRep.getLocale().toString());
|
jsonObject.addProperty("locale", userRep.getLocale().toLanguageTag());
|
||||||
|
|
||||||
JsonArray rolesArr = new JsonArray();
|
JsonArray rolesArr = new JsonArray();
|
||||||
jsonObject.add("roles", rolesArr);
|
jsonObject.add("roles", rolesArr);
|
||||||
|
|
|
@ -293,7 +293,7 @@ public class AuthenticationService {
|
||||||
loginResult.addProperty("username", certificate.getUsername());
|
loginResult.addProperty("username", certificate.getUsername());
|
||||||
loginResult.addProperty("firstname", certificate.getFirstname());
|
loginResult.addProperty("firstname", certificate.getFirstname());
|
||||||
loginResult.addProperty("lastname", certificate.getLastname());
|
loginResult.addProperty("lastname", certificate.getLastname());
|
||||||
loginResult.addProperty("locale", certificate.getLocale().toString());
|
loginResult.addProperty("locale", certificate.getLocale().toLanguageTag());
|
||||||
|
|
||||||
if (!certificate.getPropertyMap().isEmpty()) {
|
if (!certificate.getPropertyMap().isEmpty()) {
|
||||||
JsonObject propObj = new JsonObject();
|
JsonObject propObj = new JsonObject();
|
||||||
|
|
|
@ -101,8 +101,8 @@ public class ReportResource {
|
||||||
if (localesF.exists()) {
|
if (localesF.exists()) {
|
||||||
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
|
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
|
||||||
.getAsJsonObject();
|
.getAsJsonObject();
|
||||||
if (localesJ.has(cert.getLocale().toString()))
|
if (localesJ.has(cert.getLocale().toLanguageTag()))
|
||||||
localeJ = localesJ.get(cert.getLocale().toString()).getAsJsonObject();
|
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
|
||||||
}
|
}
|
||||||
|
|
||||||
JsonArray result = new JsonArray();
|
JsonArray result = new JsonArray();
|
||||||
|
@ -156,8 +156,8 @@ public class ReportResource {
|
||||||
if (localesF.exists()) {
|
if (localesF.exists()) {
|
||||||
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
|
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
|
||||||
.getAsJsonObject();
|
.getAsJsonObject();
|
||||||
if (localesJ.has(cert.getLocale().toString()))
|
if (localesJ.has(cert.getLocale().toLanguageTag()))
|
||||||
localeJ = localesJ.get(cert.getLocale().toString()).getAsJsonObject();
|
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
|
||||||
}
|
}
|
||||||
|
|
||||||
try (StrolchTransaction tx = RestfulStrolchComponent.getInstance().openTx(cert, realm, getContext());
|
try (StrolchTransaction tx = RestfulStrolchComponent.getInstance().openTx(cert, realm, getContext());
|
||||||
|
@ -255,8 +255,8 @@ public class ReportResource {
|
||||||
if (localesF.exists()) {
|
if (localesF.exists()) {
|
||||||
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
|
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
|
||||||
.getAsJsonObject();
|
.getAsJsonObject();
|
||||||
if (localesJ.has(cert.getLocale().toString()))
|
if (localesJ.has(cert.getLocale().toLanguageTag()))
|
||||||
localeJ = localesJ.get(cert.getLocale().toString()).getAsJsonObject();
|
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
|
||||||
}
|
}
|
||||||
|
|
||||||
long start = System.nanoTime();
|
long start = System.nanoTime();
|
||||||
|
@ -375,8 +375,8 @@ public class ReportResource {
|
||||||
if (localesF.exists()) {
|
if (localesF.exists()) {
|
||||||
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
|
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
|
||||||
.getAsJsonObject();
|
.getAsJsonObject();
|
||||||
if (localesJ.has(cert.getLocale().toString()))
|
if (localesJ.has(cert.getLocale().toLanguageTag()))
|
||||||
localeJ = localesJ.get(cert.getLocale().toString()).getAsJsonObject();
|
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
|
||||||
}
|
}
|
||||||
|
|
||||||
// create CSV printer with header
|
// create CSV printer with header
|
||||||
|
|
Loading…
Reference in New Issue