[Client] Fix bug

This commit is contained in:
syuilo 2017-10-25 20:29:14 +09:00
parent e581ce3014
commit 4cac6316f7

View file

@ -4,34 +4,46 @@
const StringReplacePlugin = require('string-replace-webpack-plugin'); const StringReplacePlugin = require('string-replace-webpack-plugin');
export default (lang, locale) => ({ export default (lang, locale) => {
enforce: 'pre', function get(key: string) {
test: /\.(tag|js)$/, let text = locale;
exclude: /node_modules/,
loader: StringReplacePlugin.replace({ // Check the key existance
replacements: [ const error = key.split('.').some(k => {
{ if (text.hasOwnProperty(k)) {
pattern: /%i18n:(.+?)%/g, replacement: (_, key) => { text = text[k];
let text = locale; return false;
} else {
// Check the key existance return true;
const error = key.split('.').some(k => {
if (text.hasOwnProperty(k)) {
text = text[k];
return false;
} else {
return true;
}
});
if (error) {
console.warn(`key '${key}' not found in '${lang}'`);
return key; // Fallback
} else {
return text.replace(/'/g, '\\\'').replace(/"/g, '\\"');
}
}
} }
] });
})
}); if (error) {
console.warn(`key '${key}' not found in '${lang}'`);
return key; // Fallback
} else {
return text;
}
}
return {
enforce: 'pre',
test: /\.(tag|js)$/,
exclude: /node_modules/,
loader: StringReplacePlugin.replace({
replacements: [{
pattern: /"%i18n:(.+?)%"/g, replacement: (_, key) => {
return '"' + get(key).replace(/"/g, '\\"') + '"';
}
}, {
pattern: /'%i18n:(.+?)%'/g, replacement: (_, key) => {
return '\'' + get(key).replace(/'/g, '\\\'') + '\'';
}
}, {
pattern: /%i18n:(.+?)%/g, replacement: (_, key) => {
return get(key);
}
}]
})
};
};