add i18n fallback

This commit is contained in:
SachaG 2017-06-03 09:24:43 +09:00
parent 90e850abbb
commit d1759734f7
2 changed files with 4 additions and 4 deletions

View file

@ -2,9 +2,9 @@ import React, { Component } from 'react';
import { getSetting, Strings } from 'meteor/vulcan:lib';
const FormattedMessage = ({ id, values }) => {
const FormattedMessage = ({ id, values, defaultMessage }) => {
const messages = Strings[getSetting('locale', 'en')] || {};
let message = messages[id];
let message = messages[id] || defaultMessage;
if (values) {
_.forEach(values, (value, key) => {
message = message.replace(`{${key}}`, value);

View file

@ -11,9 +11,9 @@ export default class IntlProvider extends Component{
this.formatMessage = this.formatMessage.bind(this);
}
formatMessage({ id }, values) {
formatMessage({ id, defaultMessage }, values) {
const messages = Strings[getSetting('locale', 'en')] || {};
let message = messages[id];
let message = messages[id] || defaultMessage;
if (values) {
_.forEach(values, (value, key) => {
message = message.replace(`{${key}}`, value);