Skip to content

feat: allow external i18n intialization #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomrndom wants to merge 3 commits into
base: main
Choose a base branch
from
+24 −35
Open

feat: allow external i18n intialization #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94d859e
Add default error messages for authErrorHandler
tomrndom Sep 2, 2024
a26123d
Export init18n function, merge app and uicore dictionaries
tomrndom Sep 4, 2024
90b6476
Remove i18n from actions file
tomrndom Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions src/components/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';
import T from 'i18n-react';
import { getCurrentUserLanguage } from '../utils/methods';
import { initI18n } from '../i18n/i18n.js';

export {default as AjaxLoader} from './ajaxloader';
export {default as RawHTML} from './raw-html';
Expand Down Expand Up @@ -60,19 +59,5 @@ export {default as ScheduleBuilderView} from './schedule-builder-view'
// export {default as ExtraQuestionsForm } from './extra-questions/index.js';
// export {default as GMap} from './google-map';

let language = getCurrentUserLanguage();

// language would be something like es-ES or es_ES
// However we store our files with format es.json or en.json
// therefore retrieve only the first 2 digits

if (language.length > 2) {
language = language.split("-")[0];
language = language.split("_")[0];
}

try {
T.setTexts(require(`../i18n/${language}.json`));
} catch (e) {
T.setTexts(require(`../i18n/en.json`));
}
// initialize i18n
initI18n();
37 changes: 20 additions & 17 deletions src/i18n/i18n.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,31 @@
import {getCurrentUserLanguage} from "../utils/methods";
import { getCurrentUserLanguage } from "../utils/methods";
import T from "i18n-react";
import en from './en.json';
import zh from './zh.json';
import es from './es.json';

const resources = {
'en' : en,
'zh' : zh,
'es' : es,
'en': en,
'zh': zh,
'es': es,
}

let language = getCurrentUserLanguage();
export const initI18n = (dictionary) => {
let language = getCurrentUserLanguage();

// language would be something like es-ES or es_ES
// However we store our files with format es.json or en.json
// therefore retrieve only the first 2 digits
// language would be something like es-ES or es_ES
// However we store our files with format es.json or en.json
// therefore retrieve only the first 2 digits

if (language.length > 2) {
language = language.split("-")[0];
language = language.split("_")[0];
}
if (language.length > 2) {
language = language.split("-")[0];
language = language.split("_")[0];
}

try {
T.setTexts(resources[language]);
} catch (e) {
T.setTexts(resources['en']);
}
const isDictionaryValid = dictionary && typeof dictionary === 'object' && !Array.isArray(dictionary);
try {
T.setTexts(isDictionaryValid ? { ...resources[language], ...dictionary } : resources[language]);
} catch (e) {
T.setTexts(isDictionaryValid ? { ...resources['en'], ...dictionary } : resources['en']);
}
};
1 change: 1 addition & 0 deletions src/utils/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ export const authErrorHandler = (
let payload, callback;

dispatch(stopLoading());


switch (code) {
case 401:
Expand Down