diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2017-12-10 15:41:22 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-10 15:41:22 -0500 |
commit | 26c9b9fa276fd629789fd06f65a5d698b182f67a (patch) | |
tree | 8480daa3428db3a2443ba45949a4182481e5ec16 /config/webpack/configuration.js | |
parent | 282f48ddd1868fcd8fa2887bbaf13036c949c22d (diff) | |
parent | 64b839b76907e87c57d71762a81a9a8660f1df83 (diff) |
Merge pull request #246 from glitch-soc/theme-intl8n
Internationalization for flavours and skins
Diffstat (limited to 'config/webpack/configuration.js')
-rw-r--r-- | config/webpack/configuration.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js index 9cdd6f934..852185eb9 100644 --- a/config/webpack/configuration.js +++ b/config/webpack/configuration.js @@ -30,6 +30,9 @@ for (let i = 0; i < flavourFiles.length; i++) { if (!data.pack_directory) { data.pack_directory = dirname(flavourFile); } + if (data.locales) { + data.locales = join(dirname(flavourFile), data.locales); + } if (data.pack && typeof data.pack === 'object') { flavours[data.name] = data; } @@ -45,7 +48,7 @@ for (let i = 0; i < skinFiles.length; i++) { const data = flavours[name].skin; if (lstatSync(skinFile).isDirectory()) { data[skin] = {}; - const skinPacks = glob.sync(resolve(skinFile, '*.{css,scss}')); + const skinPacks = glob.sync(join(skinFile, '*.{css,scss}')); for (let j = 0; j < skinPacks.length; j++) { const pack = skinPacks[i]; data[skin][basename(pack, extname(pack))] = pack; |