Merge remote-tracking branch 'refs/remotes/origin/master' into fa5

This commit is contained in:
syuilo 2017-12-08 02:49:24 +09:00
commit b68a9f7ea4
1 changed files with 6 additions and 9 deletions

View File

@ -32,17 +32,14 @@ export default (lang, locale) => {
exclude: /node_modules/, exclude: /node_modules/,
loader: StringReplacePlugin.replace({ loader: StringReplacePlugin.replace({
replacements: [{ replacements: [{
pattern: /"%i18n:(.+?)%"/g, replacement: (_, key) => { pattern: /"%i18n:(.+?)%"/g, replacement: (_, key) =>
return '"' + get(key).replace(/"/g, '\\"') + '"'; '"' + get(key).replace(/"/g, '\\"') + '"'
}
}, { }, {
pattern: /'%i18n:(.+?)%'/g, replacement: (_, key) => { pattern: /'%i18n:(.+?)%'/g, replacement: (_, key) =>
return '\'' + get(key).replace(/'/g, '\\\'') + '\''; '\'' + get(key).replace(/'/g, '\\\'') + '\''
}
}, { }, {
pattern: /%i18n:(.+?)%/g, replacement: (_, key) => { pattern: /%i18n:(.+?)%/g, replacement: (_, key) =>
return get(key); get(key)
}
}] }]
}) })
}; };