hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-05 17:41:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2234 from vale981/add_default_locale

Browse source 
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
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/vulcan-lib/lib/modules/intl.js
View file

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