Merge branch 'develop'

meetfranz · Dec 13, 2018 · 262198a · 262198a
2 parents b5937bd + b6b8c06
commit 262198a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+<a name="5.0.0-beta.22"></a>
+# [5.0.0-beta.22](https://github.com/meetfranz/franz/compare/5.0.0-beta.20...5.0.0-beta.22) (2018-12-13)
+
+
+### Bug Fixes
+
+* **Windows:** Package spellchecker dictionaries
+
+
 <a name="5.0.0-beta.21"></a>
 # [5.0.0-beta.21](https://github.com/meetfranz/franz/compare/5.0.0-beta.20...5.0.0-beta.21) (2018-12-11)
 

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -6,9 +6,10 @@ import server from 'gulp-server-livereload';
 import { exec } from 'child_process';
 import dotenv from 'dotenv';
 import sassVariables from 'gulp-sass-variables';
-import { removeSync } from 'fs-extra';
+import { moveSync, removeSync } from 'fs-extra';
 import kebabCase from 'kebab-case';
 import hexRgb from 'hex-rgb';
+import path from 'path';
 
 import config from './package.json';
 
@@ -45,6 +46,7 @@ const paths = {
 };
 
 function _shell(cmd, cb) {
+  console.log('executing', cmd);
   exec(cmd, {
     cwd: paths.dest,
   }, (error, stdout, stderr) => {
@@ -141,13 +143,16 @@ export function dictionaries(done) {
   let packages = '';
   Object.keys(SPELLCHECKER_LOCALES).forEach((key) => { packages = `${packages} hunspell-dict-${key}`; });
 
-  _shell(`
-    rm -rf ${paths.dictionaries}
-    npm install --prefix ${paths.dictionaries} ${packages}
-    mv ${paths.dictionaries}/node_modules/* ${paths.dictionaries}
-    rm -rf ${paths.dictionaries}/node_modules ${paths.dictionaries}/package-lock.json
-    pwd`,
-  done);
+  _shell(`npm install --prefix ${path.join(__dirname, 'temp')} ${packages}`, () => {
+    moveSync(
+      path.join(__dirname, 'temp', 'node_modules'),
+      path.join(__dirname, 'build', paths.dictionaries),
+    );
+
+    removeSync(path.join(__dirname, 'temp'));
+
+    done();
+  });
 }
 
 export function sign(done) {

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "franz",
   "productName": "Franz",
   "appId": "com.meetfranz.franz",
-  "version": "5.0.0-beta.21",
+  "version": "5.0.0-beta.22",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "adlk x franz - Stefan Malzner",
   "main": "index.js",

diff --git a/src/i18n/languages.js b/src/i18n/languages.js
@@ -34,7 +34,7 @@ export const SPELLCHECKER_LOCALES = {
   'cs-cz': 'Čeština',
   'da-dk': 'Dansk',
   'de-de': 'Deutsch',
-  'el-gr': 'λληνικά (Greek)',
+  'el-gr': 'ελληνικά (Greek)',
   'en-us': 'English',
   'es-es': 'Español',
   'et-ee': 'Estonian',