Merge pull request #516 from scireum/meg/provideLang

Provides instead of setting languages from the Web/UserContext to the…
scireum · Nov 6, 2018 · 926e02e · 926e02e
2 parents a3ee5b5 + dcf4495
commit 926e02e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <description>Provides a modern and scalable web server as SIRIUS module</description>
 
     <properties>
-        <sirius.kernel>12.0-rc30</sirius.kernel>
+        <sirius.kernel>12.0-rc31</sirius.kernel>
     </properties>
 
     <dependencies>

diff --git a/src/main/java/sirius/web/http/WebServerHandler.java b/src/main/java/sirius/web/http/WebServerHandler.java
@@ -175,7 +175,7 @@ private WebContext setupContext(ChannelHandlerContext ctx, HttpRequest req) {
         // if everything else fails, parse the lang header.
         currentCall.deferredSetLang(callContext -> {
             if (!callContext.get(UserContext.class).bindUserIfPresent(wc).isPresent()) {
-                callContext.setLang(NLS.makeLang(wc.getLang()));
+                callContext.setLangIfEmpty(NLS.makeLang(wc.getLang()));
             }
         });
 

diff --git a/src/main/java/sirius/web/security/UserContext.java b/src/main/java/sirius/web/security/UserContext.java
@@ -197,7 +197,7 @@ private void bindScopeToRequest(WebContext ctx) {
         if (ctx != null && ctx.isValid() && detector != null) {
             ScopeInfo scope = detector.detectScope(ctx);
             setCurrentScope(scope);
-            CallContext.getCurrent().setLang(scope.getLang());
+            CallContext.getCurrent().setLangIfEmpty(scope.getLang());
         } else {
             setCurrentScope(ScopeInfo.DEFAULT_SCOPE);
         }
@@ -274,7 +274,7 @@ public void setCurrentUser(@Nullable UserInfo user) {
         CallContext call = CallContext.getCurrent();
         call.addToMDC(MDC_USER_ID, () -> currentUser.getUserId());
         call.addToMDC(MDC_USER_NAME, () -> currentUser.getUserName());
-        call.setLang(user.getLang());
+        call.setLangIfEmpty(currentUser.getLang());
     }
 
     /**