getDeviceMeasurementSystem

fourhtyoz · Jan 27, 2025 · aa16d70 · aa16d70
1 parent abfe067
commit aa16d70
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/store/store.js b/store/store.js
@@ -1,6 +1,7 @@
 import { makeAutoObservable, runInAction } from "mobx";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import i18n from "@/utils/i18n";
+import { getDeviceLanuguage, getDeviceMeasurementSystem } from "@/utils/i18n";
 
 
 class SettingsStore {
@@ -65,12 +66,12 @@ class SettingsStore {
                         break;
                     case 'language':
                         runInAction(() => {
-                            this.setLanguage(value || 'en')
+                            this.setLanguage(value || getDeviceLanuguage())
                         });
                         break;
                     case 'units':
                         runInAction(() => {
-                            this.units = value || 'kg' ;
+                            this.units = value || getDeviceMeasurementSystem() ;
                         });
                         break;
                     case 'notifications':

diff --git a/utils/i18n.ts b/utils/i18n.ts
@@ -1,6 +1,7 @@
 import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
 import * as Localization from 'expo-localization';
+import { LANGUAGES } from '@/constants/settings';
 
 // translations
 import en from '@/utils/translations/en.json';
@@ -27,16 +28,37 @@ const resources = {
     },
 };
 
-const getDeviceLanuguage = () => {
+export const getDeviceMeasurementSystem= () => {
     try {
+        const locales = Localization.getLocales()
+        const measurementSystem = locales[0].measurementSystem
+        if (measurementSystem === 'metric') {
+            return 'kg'
+        } else {
+            return 'lb'
+        }
+    } catch (e) {
+        console.error(`getDeviceMeasurementSystem error: ${e}`)
+        return 'kg'
+    }
+};
+
+export const getDeviceLanuguage = () => {
+    try {
+        const supportedLanguages = LANGUAGES.map(item => item.code)
+
         const locales = Localization.getLocales()
         const languageCode = locales[0].languageCode
-        return languageCode
+        if (languageCode && supportedLanguages.includes(languageCode?.toLowerCase())) {
+            return languageCode
+        } else {
+            return 'en'
+        }
     } catch (e) {
         console.error(`getDeviceLanuguage error: ${e}`)
         return 'en'
     }
-}
+};
 
 i18n
     .use(initReactI18next)