changed the language switch functions to i18next standard in activity.js so that renderLanguageSelectIcon() works correctly

Author: ac-mmi

js/activity.js

@@ -305,17 +305,20 @@ class Activity {
         }
 
         try {
-            // let lang = "en";
-            // if (this.storage.languagePreference !== undefined) {
-            //     lang = this.storage.languagePreference;
-            //     document.webL10n.setLanguage(lang);
-            // } else {
-            //     lang = navigator.language;
-            //     if (lang.includes("-")) {
-            //         lang = lang.slice(0, lang.indexOf("-"));
-            //         document.webL10n.setLanguage(lang);
-            //     }
-            // }
+            let lang = "en";
+            if (this.storage.languagePreference !== undefined) {
+                lang = this.storage.languagePreference;
+                console.log("lang");
+                console.log(lang);
+                i18next.changeLanguage(lang);
+            } else {
+                lang = navigator.language;
+                if (lang.includes("-")) {
+                    lang = lang.slice(0, lang.indexOf("-"));
+                }
+                i18next.changeLanguage(lang);
+            }
+
         } catch (e) {
             // eslint-disable-next-line no-console
             console.error(e);

js/loader.js

@@ -52,7 +52,7 @@ requirejs(['i18next', 'i18nextHttpBackend'], function(i18next, i18nextHttpBacken
             i18next
                 .use(i18nextHttpBackend)
                 .init({
-                    lng: 'hi',
+                    lng: 'en',
                     fallbackLng: 'en',
                     keySeparator: false,
                     nsSeparator: false,
@@ -107,15 +107,22 @@ requirejs(['i18next', 'i18nextHttpBackend'], function(i18next, i18nextHttpBacken
         }
     }
 
-    main();
+    main().then(() => {
+    requirejs(["utils/utils", "activity/activity"]);
+    });
+
+    i18next.changeLanguage(lang, (err, t) => {
+        if (err) {
+            console.error('Error changing language:', err);
+            return;
+        }
+        console.log('Language changed to:', lang);
+        updateContent();
+    });
 
     i18next.on('languageChanged', function() {
         updateContent();
     });
 });
 
-
-
-
-
-requirejs(["utils/utils", "activity/activity"]);
+// requirejs(["utils/utils", "activity/activity"]);