feat(mosip#656): [Pooja] refactor to get language details from i18n

tw-mosip · Mar 24, 2023 · 3ab5c3f · 3ab5c3f
1 parent 690ce79
commit 3ab5c3f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/components/VcDetails.tsx b/components/VcDetails.tsx
@@ -10,7 +10,7 @@ import { Theme } from './ui/styleUtils';
 import { TextItem } from './ui/TextItem';
 import { VcItemTags } from './VcItemTags';
 import VerifiedIcon from './VerifiedIcon';
-import { getLanguageDetails } from './VcItem';
+import i18n, { getLanguageDetails } from '../i18n';
 
 export const VcDetails: React.FC<VcDetailsProps> = (props) => {
   const { t, i18n } = useTranslation('VcDetails');
@@ -353,7 +353,8 @@ function getLocalizedField(rawField: string | LocalizedField[]) {
   }
   try {
     const locales: LocalizedField[] = JSON.parse(JSON.stringify(rawField));
-    return getLanguageDetails(locales);
+    const currentLanguage = i18n.language;
+    return getLanguageDetails(locales, currentLanguage);
   } catch (e) {
     return '';
   }

diff --git a/components/VcItem.tsx b/components/VcItem.tsx
@@ -26,7 +26,7 @@ import { useTranslation } from 'react-i18next';
 import { LocalizedField } from '../types/vc';
 import { VcItemTags } from './VcItemTags';
 import VerifiedIcon from './VerifiedIcon';
-import i18n, { SUPPORTED_LANGUAGES } from '../i18n';
+import i18n, { getLanguageDetails } from '../i18n';
 
 const getDetails = (arg1, arg2, verifiableCredential) => {
   if (arg1 === 'Status') {
@@ -312,24 +312,9 @@ function getLocalizedField(rawField: string | LocalizedField) {
   }
   try {
     const locales: LocalizedField[] = JSON.parse(JSON.stringify(rawField));
-    return getLanguageDetails(locales);
+    const currentLanguage = i18n.language;
+    return getLanguageDetails(locales, currentLanguage);
   } catch (e) {
     return '';
   }
 }
-
-export function getLanguageDetails(locales) {
-  const supportedLanguages = Object.keys(SUPPORTED_LANGUAGES);
-  const currentLanguage = i18n.language;
-  if (locales.length > 1) {
-    for (const language in supportedLanguages) {
-      if (currentLanguage == language) {
-        const languageDetails = locales.filter(
-          (obj) => obj.language === language
-        );
-        return languageDetails[0].value;
-      }
-    }
-  }
-  return locales[0].value;
-}
diff --git a/i18n.ts b/i18n.ts
@@ -43,3 +43,18 @@ function getLanguageCode(code: string) {
   const [language] = code.split('-');
   return language;
 }
+
+export function getLanguageDetails(locales, currentLanguage) {
+  const supportedLanguages = Object.keys(SUPPORTED_LANGUAGES);
+  if (locales.length > 1) {
+    for (const language in supportedLanguages) {
+      if (currentLanguage == language) {
+        const languageDetails = locales.filter(
+          (obj) => obj.language === language
+        );
+        return languageDetails[0].value;
+      }
+    }
+  }
+  return locales[0].value;
+}