Merge branch 'develop'

CHANGELOG.md

@@ -1,3 +1,20 @@
+# [5.3.3](https://github.com/meetfranz/franz/compare/v5.3.1...v5.3.3) (2019-09-17)
+
+### Features
+* **Todos:** Highlight Franz Todos icon in sidebar when the Franz Todos panel is opened ([7431ba3](https://github.com/meetfranz/franz/commit/7431ba3))
+
+
+### Bug Fixes
+
+* **Spellchecker:** Fix disabling spellchecker after app start ([4035043](https://github.com/meetfranz/franz/commit/4035043))
+* **Windows:** Fix window menu to get overwritten by Todos menu ([aa33ac7](https://github.com/meetfranz/franz/commit/aa33ac7))
+
+
+### General
+
+* **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)**
+
+
 # [5.3.2](https://github.com/meetfranz/franz/compare/v5.3.1...v5.3.2) (2019-09-12)
 
 

package.json

@@ -2,7 +2,7 @@
   "name": "franz",
   "productName": "Franz",
   "appId": "com.meetfranz.franz",
-  "version": "5.3.2",
+  "version": "5.3.3",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "adlk x franz - Stefan Malzner",
   "main": "index.js",

src/components/layout/Sidebar.js

@@ -112,7 +112,7 @@ export default @observer class Sidebar extends Component {
               this.updateToolTip();
               gaEvent(GA_CATEGORY_TODOS, 'toggleDrawer', 'sidebar');
             }}
-            className="sidebar__button sidebar__button--workspaces"
+            className={`sidebar__button sidebar__button--todos  ${todosStore.isTodosPanelVisible ? 'is-active' : ''}`}
             data-tip={`${intl.formatMessage(todosToggleMessage)} (${ctrlKey}+T)`}
           >
             <i className="mdi mdi-check-all" />

src/features/spellchecker/index.js

@@ -16,7 +16,7 @@ export default function init(stores) {
 
     config.isIncludedInCurrentPlan = isSpellcheckerIncludedInCurrentPlan !== undefined ? isSpellcheckerIncludedInCurrentPlan : DEFAULT_FEATURES_CONFIG.isSpellcheckerIncludedInCurrentPlan;
 
-    if (!stores.user.data.isPremium && config.isIncludedInCurrentPlan && stores.settings.app.enableSpellchecking) {
+    if (!stores.user.data.isPremium && !config.isIncludedInCurrentPlan && stores.settings.app.enableSpellchecking) {
       debug('Override settings.spellcheckerEnabled flag to false');
 
       Object.assign(stores.settings.app, {

src/i18n/locales/pt.json

@@ -1,10 +1,10 @@
 {
    "app.errorHandler.action" : "Recarregar",
    "app.errorHandler.headline" : "Alguma coisa correu mal",
-   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
+   "feature.announcements.changelog.headline" : "Alterações no Franz {version}",
    "feature.delayApp.headline" : "Por favor compre uma licença Franz Supporter para saltar a fila de espera",
    "feature.delayApp.text" : "Franz irá continuar em {seconds} segundos.",
-   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
+   "feature.delayApp.trial.action" : "Sim, Quero a versão experimental do Franz Profissional de 14 dias",
    "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
    "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
    "feature.delayApp.upgrade.action" : "Faz parte do grupo de apoio do Franz",
@@ -13,21 +13,21 @@
    "feature.shareFranz.action.email" : "Enviar por e-mail",
    "feature.shareFranz.action.facebook" : "Compartilahr no Facebook",
    "feature.shareFranz.action.twitter" : "Compartilhar no Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
+   "feature.shareFranz.headline" : "Franz é melhor junto!",
    "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
    "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
    "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
-   "feature.todos.premium.info" : "Franz Todos are available to premium users now!",
-   "feature.todos.premium.rollout" : "Everyone else will have to wait a little longer.",
-   "feature.todos.premium.upgrade" : "Upgrade Account",
+   "feature.todos.premium.info" : "Franz Todos está agora disponível para utilizadores premium!",
+   "feature.todos.premium.rollout" : "Todos os outros vão ter de esperar um pouco mais.",
+   "feature.todos.premium.upgrade" : "Melhorar a conta",
    "global.api.unhealthy" : "Não foi possível estabelecer ligação aos serviços do Franz",
    "global.franzProRequired" : "Franz Professional Required",
    "global.notConnectedToTheInternet" : "Não estás ligado à Internet",
    "global.spellchecker.useDefault" : "Utilizar o Sistema por Omissão ({default})",
    "global.spellchecking.autodetect" : "Detectar a lingua automaticamente",
-   "global.spellchecking.autodetect.short" : "Automatic",
+   "global.spellchecking.autodetect.short" : "Automático",
    "global.spellchecking.language" : "Linguagem para correção ortográfica",
-   "global.upgradeButton.upgradeToPro" : "Upgrade to Franz Professional",
+   "global.upgradeButton.upgradeToPro" : "Actualiza para o Franz Profissional",
    "import.headline" : "Importa os teus serviços do Franz",
    "import.notSupportedHeadline" : "Estes serviços ainda não são suportados pelo Franz 5",
    "import.skip.label" : "Eu quero adicionar serviços manualmente",
@@ -37,7 +37,7 @@
    "infobar.buttonReloadServices" : "Recarregar serviços",
    "infobar.requiredRequestsFailed" : "Não foi possível carregar os serviços e informações do utilizador",
    "infobar.servicesUpdated" : "Os seus serviços foram atualizados.",
-   "infobar.trialActivated" : "Your trial was successfully activated. Happy messaging!",
+   "infobar.trialActivated" : "A tua versão experimental foi activada com êxito. Boas mensagens!",
    "infobar.updateAvailable" : "Está disponível uma nova atualização para o Franz",
    "invite.email.label" : "Endereço de e-mail",
    "invite.headline.friends" : "Convide 3 amigos ou colegas",
@@ -54,8 +54,8 @@
    "login.serverLogout" : "A sua sessão expirou, inicie sessão novamente.",
    "login.submit.label" : "Iniciar sessão",
    "login.tokenExpired" : "A sua sessão expirou, inicie sessão novamente.",
-   "menu.Todoss.closeTodosDrawer" : "Close Todos drawer",
-   "menu.Todoss.openTodosDrawer" : "Open Todos drawer",
+   "menu.Todoss.closeTodosDrawer" : "Fechar a gaveta Todos",
+   "menu.Todoss.openTodosDrawer" : "Abrir a gaveta Todos",
    "menu.app.about" : "Sobre o Franz",
    "menu.app.announcement" : "O que há de novo?",
    "menu.app.checkForUpdates" : "Procurar atualizações",
@@ -81,7 +81,7 @@
    "menu.file" : "Ficheiro",
    "menu.help" : "Ajuda",
    "menu.help.changelog" : "Registo de alterações",
-   "menu.help.debugInfo" : "Copy Debug Information",
+   "menu.help.debugInfo" : "Copiar a informação Debug",
    "menu.help.debugInfoCopiedBody" : "Your Debug Information has been copied to your clipboard.",
    "menu.help.debugInfoCopiedHeadline" : "Franz Debug Information",
    "menu.help.learnMore" : "Saber mais",
@@ -93,7 +93,7 @@
    "menu.services.addNewService" : "Adicionar Novo Serviço...",
    "menu.services.setNextServiceActive" : "Activar o próximo serviço",
    "menu.todos" : "Todos",
-   "menu.todos.enableTodos" : "Enable Todos",
+   "menu.todos.enableTodos" : "Activar Todos",
    "menu.view" : "Ver",
    "menu.view.enterFullScreen" : "Ativar Modo de Ecrã Completo",
    "menu.view.exitFullScreen" : "Sair do Modo de Ecrã Completo",
@@ -121,8 +121,8 @@
    "password.noUser" : "Não existe nenhuma conta associada a esse endereço de e-mail",
    "password.submit.label" : "Submeter",
    "password.successInfo" : "Por favor verifique o seu endereço de e-mail",
-   "premiumFeature.button.upgradeAccount" : "Atualiza a tua conta",
-   "pricing.features.adFree" : "Forever ad-free",
+   "premiumFeature.button.upgradeAccount" : "Atualizar conta",
+   "pricing.features.adFree" : "Sem publicidade para sempre",
    "pricing.features.appDelays" : "No Waiting Screens",
    "pricing.features.customWebsites" : "Add Custom Websites",
    "pricing.features.onPremise" : "On-premise & other Hosted Services",
@@ -160,7 +160,7 @@
    "service.errorHandler.headline" : "Oh não!",
    "service.errorHandler.message" : "Erro",
    "service.errorHandler.text" : "{name} falhou o carregamento",
-   "service.restrictedHandler.action" : "Upgrade Account",
+   "service.restrictedHandler.action" : "Melhorar a conta",
    "service.restrictedHandler.customUrl.headline" : "Franz Professional Plan required",
    "service.restrictedHandler.customUrl.text" : "Please upgrade to the Franz Professional plan to use custom urls & self hosted services.",
    "service.restrictedHandler.serviceLimit.headline" : "You have reached your service limit.",
@@ -192,7 +192,7 @@
    "settings.account.trialUpdateBillingInfo" : "Please update your billing info to continue using {license} after your trial period.",
    "settings.account.tryReloadServices" : "Tentar novamente",
    "settings.account.tryReloadUserInfoRequest" : "Tentar novamente",
-   "settings.account.upgradeToPro.label" : "Upgrade to Franz Professional",
+   "settings.account.upgradeToPro.label" : "Actualiza para o Franz Profissional",
    "settings.account.userInfoRequestFailed" : "Não é possível carregar a informação do utilizador",
    "settings.account.yourLicense" : "Your Franz License",
    "settings.app.buttonClearAllCache" : "Limpar cache",

src/i18n/locales/ru.json

@@ -4,13 +4,13 @@
    "feature.announcements.changelog.headline" : "Изменения в версии Franz {version}",
    "feature.delayApp.headline" : "Пожалуйста приобретите лицензию Franz Supporter чтобы убрать ожидание",
    "feature.delayApp.text" : "Franz продолжит работу через {seconds} секунд.",
-   "feature.delayApp.trial.action" : "Yes, I want the free 14 day trial of Franz Professional",
-   "feature.delayApp.trial.actionShort" : "Activate the free Franz Professional trial",
-   "feature.delayApp.trial.headline" : "Get the free Franz Professional 14 day trial and skip the line",
-   "feature.delayApp.upgrade.action" : "Получите лицензию Franz Supporter",
-   "feature.delayApp.upgrade.actionShort" : "Перейти на платную подписку",
-   "feature.serviceLimit.limitReached" : "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
-   "feature.shareFranz.action.email" : "Отправить email",
+   "feature.delayApp.trial.action" : "Да, я хочу бесплатную 14-дневную триальную версию Franz Professional",
+   "feature.delayApp.trial.actionShort" : "Активировать бесплатную триальную версию Franz Professional",
+   "feature.delayApp.trial.headline" : "Получить бесплатную 14-дневную триальную версию Franz Professional и перейти к следующему полю",
+   "feature.delayApp.upgrade.action" : "Получите лицензию поддержки Franz",
+   "feature.delayApp.upgrade.actionShort" : "Апгрейдить аккаунт",
+   "feature.serviceLimit.limitReached" : "Вы добавили {amount} максимальное {limit} количество сервисов, входящих в ваш план. Пожалуйста, обновите свой план чтобы добавить больше сервисов.",
+   "feature.shareFranz.action.email" : "Отправить по email",
    "feature.shareFranz.action.facebook" : "Поделиться на Facebook",
    "feature.shareFranz.action.twitter" : "Поделиться в Twitter",
    "feature.shareFranz.headline" : "Сделаем Franz лучше вместе!",

src/lib/Menu.js

@@ -547,6 +547,11 @@ const _titleBarTemplateFactory = intl => [
     submenu: [],
     visible: workspaceStore.isFeatureEnabled,
   },
+  {
+    label: intl.formatMessage(menuItems.todos),
+    submenu: [],
+    visible: todosStore.isFeatureEnabled,
+  },
   {
     label: intl.formatMessage(menuItems.window),
     submenu: [
@@ -943,12 +948,12 @@ export default class FranzMenu {
         gaEvent(GA_CATEGORY_TODOS, 'toggleDrawer', 'menu');
       },
       enabled: this.stores.user.isLoggedIn && isFeatureEnabledByUser,
-    }, {
-      type: 'separator',
     });
 
     if (!isFeatureEnabledByUser) {
       menu.push({
+        type: 'separator',
+      }, {
         label: intl.formatMessage(menuItems.enableTodos),
         click: () => {
           todoActions.toggleTodosFeatureVisibility();

src/stores/SettingsStore.js

@@ -1,12 +1,11 @@
 import { ipcRenderer } from 'electron';
 import {
-  action, computed, observable, set,
+  action, computed, observable,
 } from 'mobx';
 import localStorage from 'mobx-localstorage';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
-import CachedRequest from './lib/CachedRequest';
 import { getLocale } from '../helpers/i18n-helpers';
 
 import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES } from '../config';
@@ -15,12 +14,8 @@ import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 const debug = require('debug')('Franz:SettingsStore');
 
 export default class SettingsStore extends Store {
-  @observable appSettingsRequest = new CachedRequest(this.api.local, 'getAppSettings');
-
   @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
 
-  fileSystemSettingsRequests = [];
-
   fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES;
 
   @observable _fileSystemSettingsCache = {
@@ -35,14 +30,10 @@ export default class SettingsStore extends Store {
     this.actions.settings.update.listen(this._update.bind(this));
     this.actions.settings.remove.listen(this._remove.bind(this));
 
-    this.fileSystemSettingsTypes.forEach((type) => {
-      this.fileSystemSettingsRequests[type] = new CachedRequest(this.api.local, 'getAppSettings');
-    });
-
     ipcRenderer.on('appSettings', (event, resp) => {
       debug('Get appSettings resolves', resp.type, resp.data);
 
-      this._fileSystemSettingsCache[resp.type] = resp.data;
+      Object.assign(this._fileSystemSettingsCache[resp.type], resp.data);
     });
 
     this.fileSystemSettingsTypes.forEach((type) => {
@@ -51,8 +42,6 @@ export default class SettingsStore extends Store {
   }
 
   async setup() {
-    // We need to wait until `appSettingsRequest` has been executed once, otherwise we can't patch the result. If we don't wait we'd run into an issue with mobx not reacting to changes of previously not existing keys
-    await this.appSettingsRequest._promise;
     await this._migrate();
   }
 
@@ -61,21 +50,6 @@ export default class SettingsStore extends Store {
   }
 
   @computed get proxy() {
-    // // We need to provide the final data structure as mobx autoruns won't work
-    // const proxySettings = observable({});
-    // this.stores.services.all.forEach((service) => {
-    //   proxySettings[service.id] = {
-    //     isEnabled: false,
-    //     host: null,
-    //     user: null,
-    //     password: null,
-    //   };
-    // });
-
-    // debug('this._fileSystemSettingsCache.proxy', this._fileSystemSettingsCache.proxy, proxySettings);
-
-    // return Object.assign(proxySettings, this._fileSystemSettingsCache.proxy);
-
     return this._fileSystemSettingsCache.proxy || {};
   }
 
@@ -117,7 +91,7 @@ export default class SettingsStore extends Store {
         data,
       });
 
-      set(this._fileSystemSettingsCache[type], data);
+      Object.assign(this._fileSystemSettingsCache[type], data);
     }
   }
 
@@ -197,8 +171,4 @@ export default class SettingsStore extends Store {
       });
     }
   }
-
-  _getFileBasedSettings(type) {
-    ipcRenderer.send('getAppSettings', type);
-  }
 }