github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix issue #1061: auto-detect locale country code

pull/1096/head
XIAO XI LIU 2016-04-07 14:39:19 +08:00 committed by Justin Richer
parent 805b6d1a7a
commit b8cc0a82b3
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openid-connect-server/src/main/java/org/mitre/openid/connect/config/JsonMessageSource.java
View File

@ -163,10 +163,18 @@ public class JsonMessageSource extends AbstractMessageSource {
try { try {
List<JsonObject> set = new ArrayList<>(); List<JsonObject> set = new ArrayList<>();
for (String namespace : config.getLanguageNamespaces()) { for (String namespace : config.getLanguageNamespaces()) {
String filename = locale.getLanguage() + File.separator + namespace + ".json"; // full locale string, e.g. "en_US"
String filename = locale.toString() + File.separator + namespace + ".json";
Resource r = getBaseDirectory().createRelative(filename); Resource r = getBaseDirectory().createRelative(filename);
if (!r.exists()) {
// fallback to language only
logger.debug("Fallback locale to language only.");
filename = locale.getLanguage() + File.separator + namespace + ".json";
r = getBaseDirectory().createRelative(filename);
}
logger.info("No locale loaded, trying to load from " + r); logger.info("No locale loaded, trying to load from " + r);
JsonParser parser = new JsonParser(); JsonParser parser = new JsonParser();