summaryrefslogtreecommitdiff
path: root/webpack
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-12-17 04:02:30 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-12-17 04:02:30 +0900
commitda279f9e50839da68746ad6460045d0f358818ae (patch)
treeb8442b8de433a53d9ba0105eaaec2426206b2aaa /webpack
parentMerge pull request #1002 from syuilo/greenkeeper/style-loader-0.19.1 (diff)
downloadmisskey-da279f9e50839da68746ad6460045d0f358818ae.tar.gz
misskey-da279f9e50839da68746ad6460045d0f358818ae.tar.bz2
misskey-da279f9e50839da68746ad6460045d0f358818ae.zip
:v:
Diffstat (limited to 'webpack')
-rw-r--r--webpack/langs.ts23
-rw-r--r--webpack/webpack.config.ts4
2 files changed, 2 insertions, 25 deletions
diff --git a/webpack/langs.ts b/webpack/langs.ts
deleted file mode 100644
index 409b25504a..0000000000
--- a/webpack/langs.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Languages Loader
- */
-
-import * as fs from 'fs';
-import * as yaml from 'js-yaml';
-
-const loadLang = lang => yaml.safeLoad(
- fs.readFileSync(`./locales/${lang}.yml`, 'utf-8'));
-
-const native = loadLang('ja');
-
-const langs = Object.entries({
- 'en': loadLang('en'),
- 'ja': native
-});
-
-langs.map(([, locale]) => {
- // Extend native language (Japanese)
- locale = Object.assign({}, native, locale);
-});
-
-export default langs;
diff --git a/webpack/webpack.config.ts b/webpack/webpack.config.ts
index 753d89fede..124bd975b9 100644
--- a/webpack/webpack.config.ts
+++ b/webpack/webpack.config.ts
@@ -5,10 +5,10 @@
import module_ from './module';
import plugins from './plugins';
-import langs from './langs';
+import langs from '../locales';
import version from '../src/version';
-module.exports = langs.map(([lang, locale]) => {
+module.exports = Object.entries(langs).map(([lang, locale]) => {
// Chunk name
const name = lang;