1 files changed, 17 insertions, 0 deletions
diff --git a/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java b/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
index 92bfb61f..b8e3d646 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
@@ -10,12 +10,14 @@ import android.app.Application;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Color;
 import android.os.Build;
 
 import android.os.StrictMode;
 import android.os.strictmode.Violation;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 
 import java.util.concurrent.Executors;
@@ -35,7 +37,9 @@ public class ICSOpenVPNApplication extends Application {
         if("robolectric".equals(Build.FINGERPRINT))
             return;
 
+        LocaleHelper.setDesiredLocale(this);
         super.onCreate();
+
         PRNGFixes.apply();
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
@@ -48,6 +52,13 @@ public class ICSOpenVPNApplication extends Application {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             AppRestrictions.getInstance(this).checkRestrictions(this);
         }
+
+
+    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.updateResources(base));
     }
 
     private void enableStrictModes() {
@@ -74,6 +85,12 @@ public class ICSOpenVPNApplication extends Application {
 
     }
 
+    @Override
+    public void onConfigurationChanged(@NonNull Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        LocaleHelper.onConfigurationChange(this);
+    }
+
     @RequiresApi(api = Build.VERSION_CODES.P)
     public void logViolation(Violation v) {
         String name = Application.getProcessName();