From 7cb257e969a18b43313b7dd54b3afffc74d3f193 Mon Sep 17 00:00:00 2001 From: Valentin Boettcher Date: Thu, 7 Mar 2019 13:28:10 +0100 Subject: [PATCH] add default locale to getString. --- packages/vulcan-lib/lib/modules/intl.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/vulcan-lib/lib/modules/intl.js b/packages/vulcan-lib/lib/modules/intl.js index caf5ee114..361404313 100644 --- a/packages/vulcan-lib/lib/modules/intl.js +++ b/packages/vulcan-lib/lib/modules/intl.js @@ -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 => {