Merge pull request #71 from Y-Note-SAS/feature-31838-release-csu

Align startup language with system locale in claims app

Author: mngoe

claimManagement/src/main/java/org/openimis/imisclaims/ImisActivity.java

@@ -21,6 +21,7 @@
 import org.openimis.imisclaims.usecase.Login;
 
 import java.util.ArrayList;
+import java.util.Locale;
 
 public abstract class ImisActivity extends AppCompatActivity {
 
@@ -48,7 +49,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         global = (Global) getApplicationContext();
-        global.setLanguage(this, global.getSavedLanguage());
+        String systemLanguage = resolveStartupLanguage();
+        global.setSavedLanguage(systemLanguage);
+        global.setLanguage(this, systemLanguage);
 
         actionBar = getSupportActionBar();
         if (actionBar != null) {
@@ -65,6 +68,15 @@ public void onReceive(Context context, Intent intent) {
         sqlHandler = new SQLHandler(this);
     }
 
+    private String resolveStartupLanguage() {
+        Locale systemLocale = getResources().getConfiguration().locale;
+        String language = systemLocale != null ? systemLocale.getLanguage() : "";
+        if ("fr".equalsIgnoreCase(language)) {
+            return "fr";
+        }
+        return "en";
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();