Merge pull request #141 from DBozhinovski/master

Fixes addNewService, same issue as #111

12 files changed, 84 insertions, 39 deletions

diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js
index c0a68d1a5..e5ae36419 100644
--- a/src/components/services/tabs/TabBarSortableList.js
+++ b/src/components/services/tabs/TabBarSortableList.js
@@ -1,44 +1,78 @@
-import React from 'react';
-import { observer } from 'mobx-react';
+import React, { Component } from 'react';
+import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
+import PropTypes from 'prop-types';
 import { SortableContainer } from 'react-sortable-hoc';
+import { defineMessages, intlShape } from 'react-intl';
 
 import TabItem from './TabItem';
 import { ctrlKey } from '../../../environment';
 
-export default SortableContainer(observer(({
-  services,
-  setActive,
-  reload,
-  toggleNotifications,
-  deleteService,
-  disableService,
-  openSettings,
-}) => (
-  <ul
-    className="tabs"
-  >
-    {services.map((service, index) => (
-      <TabItem
-        key={service.id}
-        clickHandler={() => setActive({ serviceId: service.id })}
-        service={service}
-        index={index}
-        shortcutIndex={index + 1}
-        reload={() => reload({ serviceId: service.id })}
-        toggleNotifications={() => toggleNotifications({ serviceId: service.id })}
-        deleteService={() => deleteService({ serviceId: service.id })}
-        disableService={() => disableService({ serviceId: service.id })}
-        openSettings={openSettings}
-      />
-    ))}
-    <li>
-      <button
-        className="sidebar__add-service"
-        onClick={() => openSettings({ path: 'recipes' })}
-        data-tip={`Add new service (${ctrlKey}+N)`}
+const messages = defineMessages({
+  addNewService: {
+    id: 'sidebar.addNewService',
+    defaultMessage: '!!!Add new service',
+  },
+});
+
+@observer
+class TabBarSortableList extends Component {
+  static propTypes = {
+    services: MobxPropTypes.arrayOrObservableArray.isRequired,
+    setActive: PropTypes.func.isRequired,
+    openSettings: PropTypes.func.isRequired,
+    reload: PropTypes.func.isRequired,
+    toggleNotifications: PropTypes.func.isRequired,
+    deleteService: PropTypes.func.isRequired,
+    disableService: PropTypes.func.isRequired,
+  }
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const {
+      services,
+      setActive,
+      reload,
+      toggleNotifications,
+      deleteService,
+      disableService,
+      openSettings,
+    } = this.props;
+
+    const { intl } = this.context;
+
+    return (
+      <ul
+        className="tabs"
       >
-        <span className="mdi mdi-plus" />
-      </button>
-    </li>
-  </ul>
-)));
+        {services.map((service, index) => (
+          <TabItem
+            key={service.id}
+            clickHandler={() => setActive({ serviceId: service.id })}
+            service={service}
+            index={index}
+            shortcutIndex={index + 1}
+            reload={() => reload({ serviceId: service.id })}
+            toggleNotifications={() => toggleNotifications({ serviceId: service.id })}
+            deleteService={() => deleteService({ serviceId: service.id })}
+            disableService={() => disableService({ serviceId: service.id })}
+            openSettings={openSettings}
+          />
+        ))}
+        <li>
+          <button
+            className="sidebar__add-service"
+            onClick={() => openSettings({ path: 'recipes' })}
+            data-tip={`${intl.formatMessage(messages.addNewService)} (${ctrlKey}+N)`}
+          >
+            <span className="mdi mdi-plus" />
+          </button>
+        </li>
+      </ul>
+    );
+  }
+}
+
+export default SortableContainer(TabBarSortableList);
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 78de9903e..80b66db08 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Neustarten & Aktualisierung installieren",
   "infobar.requiredRequestsFailed": "Dienste und Benutzerinformationen konnten nicht geladen werden",
   "sidebar.settings": "Einstellungen",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Willkommen bei Franz",
   "services.getStarted": "Loslegen",
   "settings.account.headline": "Konto",
@@ -126,7 +127,7 @@
   "settings.app.updateStatusUpToDate": "Du nutzt die aktuellste Version von Franz",
   "settings.app.form.autoLaunchOnStart": "Franz beim Systemstart ausführen",
   "settings.app.form.autoLaunchInBackground": "Im Hintergrund öffnen",
-  "settings.app.form.minimizeToSystemTray": "Franz in die Taskleiste minimieren",
+  "settings.app.form.minimizeToSystemTray": "Franz in die Systemleiste minimieren",
   "settings.app.form.runInBackground": "Franz im Hintergrund behalten, wenn das Fenster geschlossen wird",
   "settings.app.form.language": "Sprache",
   "settings.app.form.beta": "Beta-Versionen einbeziehen",
diff --git a/src/i18n/locales/el-GR.json b/src/i18n/locales/el-GR.json
index dfada77a2..3710bc9a2 100644
--- a/src/i18n/locales/el-GR.json
+++ b/src/i18n/locales/el-GR.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Επανεκκίνηση & εγκατάσταση ενημερώσεων",
   "infobar.requiredRequestsFailed": "Δεν ήταν δυνατή η φόρτωση υπηρεσιών και πληροφοριών χρηστών",
   "sidebar.settings": "Ρυθμίσεις",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Καλώς ορίσατε στον Franz",
   "services.getStarted": "Ξεκινήστε",
   "settings.account.headline": "Λογαριασμός",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index b9ed51b83..b1d260f0a 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Restart & install update",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
   "sidebar.settings": "Settings",
+  "sidebar.addNewService": "Add new service",
   "services.welcome": "Welcome to Franz",
   "services.getStarted": "Get started",
   "settings.account.headline": "Account",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 84cf54492..2863f47e4 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Redémarrer et installer la mise à jour",
   "infobar.requiredRequestsFailed": "Impossible de charger les services et les informations de l'utilisateur",
   "sidebar.settings": "Paramètres",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Bienvenue sur Franz",
   "services.getStarted": "Commencer",
   "settings.account.headline": "Compte",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 62fd5a5b9..98b7cbb19 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "再起動して更新をインストールする",
   "infobar.requiredRequestsFailed": "サービスとユーザー情報が読み込めません",
   "sidebar.settings": "設定",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Franzにようこそ",
   "services.getStarted": "はじめる",
   "settings.account.headline": "アカウント",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 39c2c1cc8..a19d51b2b 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Herstarten & update installeren",
   "infobar.requiredRequestsFailed": "Kon services en gebruikersinformatie niet laden",
   "sidebar.settings": "Instellingen",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Welkom bij Franz",
   "services.getStarted": "Begin",
   "settings.account.headline": "Account",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 56088a727..aee1a52c8 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Herstart & installeer update",
   "infobar.requiredRequestsFailed": "Kon services en gebruikerinformatie niet laden",
   "sidebar.settings": "Instellingen",
+  "sidebar.addNewService": "Voeg nieuwe service toe",
   "services.welcome": "Welkom bij Franz",
   "services.getStarted": "Beginnen",
   "settings.account.headline": "Account",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index 1a8e9ad54..a884ef319 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Uruchom ponownie i zainstaluj aktualizacje",
   "infobar.requiredRequestsFailed": "Nie można wczytać usług i informacji o użytkowniku",
   "sidebar.settings": "Ustawienia",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Witaj w aplikcji Franz",
   "services.getStarted": "Zacznij",
   "settings.account.headline": "Konto",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 0fd6288e5..8a139a4f5 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -59,6 +59,7 @@
   "infobar.buttonReloadServices": "Recarregar serviços",
   "infobar.buttonInstallUpdate": "Reiniciar & instalar atualização",
   "infobar.requiredRequestsFailed": "Não foi possível carregar serviços e informações do usuário",
+  "sidebar.addNewService": "!!!Add new service",
   "sidebar.settings": "Ajustes",
   "services.welcome": "Bem-vindo ao Franz",
   "services.getStarted": "Começar",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 44ced9e43..97b746097 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Перезапустить и обновить",
   "infobar.requiredRequestsFailed": "Невозможно загрузить сервисы и информацию пользователя",
   "sidebar.settings": "Настройки",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Добро пожаловать во Franz",
   "services.getStarted": "Начать работу",
   "settings.account.headline": "Аккаунт",
diff --git a/src/i18n/locales/ua.json b/src/i18n/locales/ua.json
index 63135e52c..fcb99c4e4 100644
--- a/src/i18n/locales/ua.json
+++ b/src/i18n/locales/ua.json
@@ -60,6 +60,7 @@
   "infobar.buttonInstallUpdate": "Перезавантажити і встановити оновлення",
   "infobar.requiredRequestsFailed": "Не вдалося завантажити сервіси та інформацію користувача",
   "sidebar.settings": "Налаштування",
+  "sidebar.addNewService": "!!!Add new service",
   "services.welcome": "Ласкаво просимо в Franz",
   "services.getStarted": "Почати",
   "settings.account.headline": "Акаунт",