Merge pull request #2234 from vale981/add_default_locale

Add default locale to getString.
This commit is contained in:
Sacha Greif 2019-03-09 09:23:21 +09:00 committed by GitHub
commit da37823824
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,5 @@
import SimpleSchema from 'simpl-schema';
import { getSetting } from '../modules/settings';
export const Strings = {};
@ -15,7 +16,7 @@ export const addStrings = (language, strings) => {
};
export const getString = ({id, values, defaultMessage, locale}) => {
const messages = Strings[locale] || {};
const messages = Strings[locale] || Strings[defaultLocale] || {};
let message = messages[id] || defaultMessage;
if (message && values) {
Object.keys(values).forEach(key => {
@ -30,6 +31,8 @@ export const registerDomain = (locale, domain) => {
Domains[domain] = locale;
};
export const defaultLocale = getSetting('locale', 'en');
export const Locales = [];
export const registerLocale = locale => {