zhouhao 2 years ago
parent
commit
fa3b4dded9

+ 8 - 2
hsweb-core/src/main/java/org/hswebframework/web/i18n/LocaleUtils.java

@@ -502,8 +502,14 @@ public final class LocaleUtils {
 
         @Override
         public void subscribe(@Nonnull CoreSubscriber<? super T> actual) {
-            source.subscribe(
-                    new LocaleSwitchSubscriber<>(actual)
+            doWith(actual,
+                   actual.currentContext().getOrDefault(Locale.class, DEFAULT_LOCALE),
+                   (a, l) -> {
+                       source.subscribe(
+                               new LocaleSwitchSubscriber<>(a)
+                       );
+                       return null;
+                   }
             );
         }
     }