aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md9
-rw-r--r--gulpfile.babel.js21
-rw-r--r--package.json2
-rw-r--r--src/i18n/languages.js2
4 files changed, 24 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ea5cbed4..2d20230fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
1<a name="5.0.0-beta.22"></a>
2# [5.0.0-beta.22](https://github.com/meetfranz/franz/compare/5.0.0-beta.20...5.0.0-beta.22) (2018-12-13)
3
4
5### Bug Fixes
6
7* **Windows:** Package spellchecker dictionaries
8
9
1<a name="5.0.0-beta.21"></a> 10<a name="5.0.0-beta.21"></a>
2# [5.0.0-beta.21](https://github.com/meetfranz/franz/compare/5.0.0-beta.20...5.0.0-beta.21) (2018-12-11) 11# [5.0.0-beta.21](https://github.com/meetfranz/franz/compare/5.0.0-beta.20...5.0.0-beta.21) (2018-12-11)
3 12
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index fc2820fed..ae7002eb2 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -6,9 +6,10 @@ import server from 'gulp-server-livereload';
6import { exec } from 'child_process'; 6import { exec } from 'child_process';
7import dotenv from 'dotenv'; 7import dotenv from 'dotenv';
8import sassVariables from 'gulp-sass-variables'; 8import sassVariables from 'gulp-sass-variables';
9import { removeSync } from 'fs-extra'; 9import { moveSync, removeSync } from 'fs-extra';
10import kebabCase from 'kebab-case'; 10import kebabCase from 'kebab-case';
11import hexRgb from 'hex-rgb'; 11import hexRgb from 'hex-rgb';
12import path from 'path';
12 13
13import config from './package.json'; 14import config from './package.json';
14 15
@@ -45,6 +46,7 @@ const paths = {
45}; 46};
46 47
47function _shell(cmd, cb) { 48function _shell(cmd, cb) {
49 console.log('executing', cmd);
48 exec(cmd, { 50 exec(cmd, {
49 cwd: paths.dest, 51 cwd: paths.dest,
50 }, (error, stdout, stderr) => { 52 }, (error, stdout, stderr) => {
@@ -141,13 +143,16 @@ export function dictionaries(done) {
141 let packages = ''; 143 let packages = '';
142 Object.keys(SPELLCHECKER_LOCALES).forEach((key) => { packages = `${packages} hunspell-dict-${key}`; }); 144 Object.keys(SPELLCHECKER_LOCALES).forEach((key) => { packages = `${packages} hunspell-dict-${key}`; });
143 145
144 _shell(` 146 _shell(`npm install --prefix ${path.join(__dirname, 'temp')} ${packages}`, () => {
145 rm -rf ${paths.dictionaries} 147 moveSync(
146 npm install --prefix ${paths.dictionaries} ${packages} 148 path.join(__dirname, 'temp', 'node_modules'),
147 mv ${paths.dictionaries}/node_modules/* ${paths.dictionaries} 149 path.join(__dirname, 'build', paths.dictionaries),
148 rm -rf ${paths.dictionaries}/node_modules ${paths.dictionaries}/package-lock.json 150 );
149 pwd`, 151
150 done); 152 removeSync(path.join(__dirname, 'temp'));
153
154 done();
155 });
151} 156}
152 157
153export function sign(done) { 158export function sign(done) {
diff --git a/package.json b/package.json
index 551727ca9..05921d1a1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
2 "name": "franz", 2 "name": "franz",
3 "productName": "Franz", 3 "productName": "Franz",
4 "appId": "com.meetfranz.franz", 4 "appId": "com.meetfranz.franz",
5 "version": "5.0.0-beta.21", 5 "version": "5.0.0-beta.22",
6 "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", 6 "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
7 "copyright": "adlk x franz - Stefan Malzner", 7 "copyright": "adlk x franz - Stefan Malzner",
8 "main": "index.js", 8 "main": "index.js",
diff --git a/src/i18n/languages.js b/src/i18n/languages.js
index b262df01e..aa3f2316a 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.js
@@ -34,7 +34,7 @@ export const SPELLCHECKER_LOCALES = {
34 'cs-cz': 'Čeština', 34 'cs-cz': 'Čeština',
35 'da-dk': 'Dansk', 35 'da-dk': 'Dansk',
36 'de-de': 'Deutsch', 36 'de-de': 'Deutsch',
37 'el-gr': 'λληνικά (Greek)', 37 'el-gr': 'ελληνικά (Greek)',
38 'en-us': 'English', 38 'en-us': 'English',
39 'es-es': 'Español', 39 'es-es': 'Español',
40 'et-ee': 'Estonian', 40 'et-ee': 'Estonian',