diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/services/tabs/TabBarSortableList.js | 110 | ||||
-rw-r--r-- | src/i18n/locales/de.json | 3 | ||||
-rw-r--r-- | src/i18n/locales/el-GR.json | 1 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 1 | ||||
-rw-r--r-- | src/i18n/locales/fr.json | 1 | ||||
-rw-r--r-- | src/i18n/locales/ja.json | 1 | ||||
-rw-r--r-- | src/i18n/locales/nl-BE.json | 1 | ||||
-rw-r--r-- | src/i18n/locales/nl.json | 1 | ||||
-rw-r--r-- | src/i18n/locales/pl.json | 1 | ||||
-rw-r--r-- | src/i18n/locales/pt-BR.json | 1 | ||||
-rw-r--r-- | src/i18n/locales/ru.json | 1 | ||||
-rw-r--r-- | src/i18n/locales/ua.json | 1 |
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 @@ | |||
1 | import React from 'react'; | 1 | import React, { Component } from 'react'; |
2 | import { observer } from 'mobx-react'; | 2 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; |
3 | import PropTypes from 'prop-types'; | ||
3 | import { SortableContainer } from 'react-sortable-hoc'; | 4 | import { SortableContainer } from 'react-sortable-hoc'; |
5 | import { defineMessages, intlShape } from 'react-intl'; | ||
4 | 6 | ||
5 | import TabItem from './TabItem'; | 7 | import TabItem from './TabItem'; |
6 | import { ctrlKey } from '../../../environment'; | 8 | import { ctrlKey } from '../../../environment'; |
7 | 9 | ||
8 | export default SortableContainer(observer(({ | 10 | const messages = defineMessages({ |
9 | services, | 11 | addNewService: { |
10 | setActive, | 12 | id: 'sidebar.addNewService', |
11 | reload, | 13 | defaultMessage: '!!!Add new service', |
12 | toggleNotifications, | 14 | }, |
13 | deleteService, | 15 | }); |
14 | disableService, | 16 | |
15 | openSettings, | 17 | @observer |
16 | }) => ( | 18 | class TabBarSortableList extends Component { |
17 | <ul | 19 | static propTypes = { |
18 | className="tabs" | 20 | services: MobxPropTypes.arrayOrObservableArray.isRequired, |
19 | > | 21 | setActive: PropTypes.func.isRequired, |
20 | {services.map((service, index) => ( | 22 | openSettings: PropTypes.func.isRequired, |
21 | <TabItem | 23 | reload: PropTypes.func.isRequired, |
22 | key={service.id} | 24 | toggleNotifications: PropTypes.func.isRequired, |
23 | clickHandler={() => setActive({ serviceId: service.id })} | 25 | deleteService: PropTypes.func.isRequired, |
24 | service={service} | 26 | disableService: PropTypes.func.isRequired, |
25 | index={index} | 27 | } |
26 | shortcutIndex={index + 1} | 28 | |
27 | reload={() => reload({ serviceId: service.id })} | 29 | static contextTypes = { |
28 | toggleNotifications={() => toggleNotifications({ serviceId: service.id })} | 30 | intl: intlShape, |
29 | deleteService={() => deleteService({ serviceId: service.id })} | 31 | }; |
30 | disableService={() => disableService({ serviceId: service.id })} | 32 | |
31 | openSettings={openSettings} | 33 | render() { |
32 | /> | 34 | const { |
33 | ))} | 35 | services, |
34 | <li> | 36 | setActive, |
35 | <button | 37 | reload, |
36 | className="sidebar__add-service" | 38 | toggleNotifications, |
37 | onClick={() => openSettings({ path: 'recipes' })} | 39 | deleteService, |
38 | data-tip={`Add new service (${ctrlKey}+N)`} | 40 | disableService, |
41 | openSettings, | ||
42 | } = this.props; | ||
43 | |||
44 | const { intl } = this.context; | ||
45 | |||
46 | return ( | ||
47 | <ul | ||
48 | className="tabs" | ||
39 | > | 49 | > |
40 | <span className="mdi mdi-plus" /> | 50 | {services.map((service, index) => ( |
41 | </button> | 51 | <TabItem |
42 | </li> | 52 | key={service.id} |
43 | </ul> | 53 | clickHandler={() => setActive({ serviceId: service.id })} |
44 | ))); | 54 | service={service} |
55 | index={index} | ||
56 | shortcutIndex={index + 1} | ||
57 | reload={() => reload({ serviceId: service.id })} | ||
58 | toggleNotifications={() => toggleNotifications({ serviceId: service.id })} | ||
59 | deleteService={() => deleteService({ serviceId: service.id })} | ||
60 | disableService={() => disableService({ serviceId: service.id })} | ||
61 | openSettings={openSettings} | ||
62 | /> | ||
63 | ))} | ||
64 | <li> | ||
65 | <button | ||
66 | className="sidebar__add-service" | ||
67 | onClick={() => openSettings({ path: 'recipes' })} | ||
68 | data-tip={`${intl.formatMessage(messages.addNewService)} (${ctrlKey}+N)`} | ||
69 | > | ||
70 | <span className="mdi mdi-plus" /> | ||
71 | </button> | ||
72 | </li> | ||
73 | </ul> | ||
74 | ); | ||
75 | } | ||
76 | } | ||
77 | |||
78 | 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 @@ | |||
60 | "infobar.buttonInstallUpdate": "Neustarten & Aktualisierung installieren", | 60 | "infobar.buttonInstallUpdate": "Neustarten & Aktualisierung installieren", |
61 | "infobar.requiredRequestsFailed": "Dienste und Benutzerinformationen konnten nicht geladen werden", | 61 | "infobar.requiredRequestsFailed": "Dienste und Benutzerinformationen konnten nicht geladen werden", |
62 | "sidebar.settings": "Einstellungen", | 62 | "sidebar.settings": "Einstellungen", |
63 | "sidebar.addNewService": "!!!Add new service", | ||
63 | "services.welcome": "Willkommen bei Franz", | 64 | "services.welcome": "Willkommen bei Franz", |
64 | "services.getStarted": "Loslegen", | 65 | "services.getStarted": "Loslegen", |
65 | "settings.account.headline": "Konto", | 66 | "settings.account.headline": "Konto", |
@@ -126,7 +127,7 @@ | |||
126 | "settings.app.updateStatusUpToDate": "Du nutzt die aktuellste Version von Franz", | 127 | "settings.app.updateStatusUpToDate": "Du nutzt die aktuellste Version von Franz", |
127 | "settings.app.form.autoLaunchOnStart": "Franz beim Systemstart ausführen", | 128 | "settings.app.form.autoLaunchOnStart": "Franz beim Systemstart ausführen", |
128 | "settings.app.form.autoLaunchInBackground": "Im Hintergrund öffnen", | 129 | "settings.app.form.autoLaunchInBackground": "Im Hintergrund öffnen", |
129 | "settings.app.form.minimizeToSystemTray": "Franz in die Taskleiste minimieren", | 130 | "settings.app.form.minimizeToSystemTray": "Franz in die Systemleiste minimieren", |
130 | "settings.app.form.runInBackground": "Franz im Hintergrund behalten, wenn das Fenster geschlossen wird", | 131 | "settings.app.form.runInBackground": "Franz im Hintergrund behalten, wenn das Fenster geschlossen wird", |
131 | "settings.app.form.language": "Sprache", | 132 | "settings.app.form.language": "Sprache", |
132 | "settings.app.form.beta": "Beta-Versionen einbeziehen", | 133 | "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 @@ | |||
60 | "infobar.buttonInstallUpdate": "Επανεκκίνηση & εγκατάσταση ενημερώσεων", | 60 | "infobar.buttonInstallUpdate": "Επανεκκίνηση & εγκατάσταση ενημερώσεων", |
61 | "infobar.requiredRequestsFailed": "Δεν ήταν δυνατή η φόρτωση υπηρεσιών και πληροφοριών χρηστών", | 61 | "infobar.requiredRequestsFailed": "Δεν ήταν δυνατή η φόρτωση υπηρεσιών και πληροφοριών χρηστών", |
62 | "sidebar.settings": "Ρυθμίσεις", | 62 | "sidebar.settings": "Ρυθμίσεις", |
63 | "sidebar.addNewService": "!!!Add new service", | ||
63 | "services.welcome": "Καλώς ορίσατε στον Franz", | 64 | "services.welcome": "Καλώς ορίσατε στον Franz", |
64 | "services.getStarted": "Ξεκινήστε", | 65 | "services.getStarted": "Ξεκινήστε", |
65 | "settings.account.headline": "Λογαριασμός", | 66 | "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 @@ | |||
60 | "infobar.buttonInstallUpdate": "Restart & install update", | 60 | "infobar.buttonInstallUpdate": "Restart & install update", |
61 | "infobar.requiredRequestsFailed": "Could not load services and user information", | 61 | "infobar.requiredRequestsFailed": "Could not load services and user information", |
62 | "sidebar.settings": "Settings", | 62 | "sidebar.settings": "Settings", |
63 | "sidebar.addNewService": "Add new service", | ||
63 | "services.welcome": "Welcome to Franz", | 64 | "services.welcome": "Welcome to Franz", |
64 | "services.getStarted": "Get started", | 65 | "services.getStarted": "Get started", |
65 | "settings.account.headline": "Account", | 66 | "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 @@ | |||
60 | "infobar.buttonInstallUpdate": "Redémarrer et installer la mise à jour", | 60 | "infobar.buttonInstallUpdate": "Redémarrer et installer la mise à jour", |
61 | "infobar.requiredRequestsFailed": "Impossible de charger les services et les informations de l'utilisateur", | 61 | "infobar.requiredRequestsFailed": "Impossible de charger les services et les informations de l'utilisateur", |
62 | "sidebar.settings": "Paramètres", | 62 | "sidebar.settings": "Paramètres", |
63 | "sidebar.addNewService": "!!!Add new service", | ||
63 | "services.welcome": "Bienvenue sur Franz", | 64 | "services.welcome": "Bienvenue sur Franz", |
64 | "services.getStarted": "Commencer", | 65 | "services.getStarted": "Commencer", |
65 | "settings.account.headline": "Compte", | 66 | "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 @@ | |||
60 | "infobar.buttonInstallUpdate": "再起動して更新をインストールする", | 60 | "infobar.buttonInstallUpdate": "再起動して更新をインストールする", |
61 | "infobar.requiredRequestsFailed": "サービスとユーザー情報が読み込めません", | 61 | "infobar.requiredRequestsFailed": "サービスとユーザー情報が読み込めません", |
62 | "sidebar.settings": "設定", | 62 | "sidebar.settings": "設定", |
63 | "sidebar.addNewService": "!!!Add new service", | ||
63 | "services.welcome": "Franzにようこそ", | 64 | "services.welcome": "Franzにようこそ", |
64 | "services.getStarted": "はじめる", | 65 | "services.getStarted": "はじめる", |
65 | "settings.account.headline": "アカウント", | 66 | "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 @@ | |||
60 | "infobar.buttonInstallUpdate": "Herstarten & update installeren", | 60 | "infobar.buttonInstallUpdate": "Herstarten & update installeren", |
61 | "infobar.requiredRequestsFailed": "Kon services en gebruikersinformatie niet laden", | 61 | "infobar.requiredRequestsFailed": "Kon services en gebruikersinformatie niet laden", |
62 | "sidebar.settings": "Instellingen", | 62 | "sidebar.settings": "Instellingen", |
63 | "sidebar.addNewService": "!!!Add new service", | ||
63 | "services.welcome": "Welkom bij Franz", | 64 | "services.welcome": "Welkom bij Franz", |
64 | "services.getStarted": "Begin", | 65 | "services.getStarted": "Begin", |
65 | "settings.account.headline": "Account", | 66 | "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 @@ | |||
60 | "infobar.buttonInstallUpdate": "Herstart & installeer update", | 60 | "infobar.buttonInstallUpdate": "Herstart & installeer update", |
61 | "infobar.requiredRequestsFailed": "Kon services en gebruikerinformatie niet laden", | 61 | "infobar.requiredRequestsFailed": "Kon services en gebruikerinformatie niet laden", |
62 | "sidebar.settings": "Instellingen", | 62 | "sidebar.settings": "Instellingen", |
63 | "sidebar.addNewService": "Voeg nieuwe service toe", | ||
63 | "services.welcome": "Welkom bij Franz", | 64 | "services.welcome": "Welkom bij Franz", |
64 | "services.getStarted": "Beginnen", | 65 | "services.getStarted": "Beginnen", |
65 | "settings.account.headline": "Account", | 66 | "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 @@ | |||
60 | "infobar.buttonInstallUpdate": "Uruchom ponownie i zainstaluj aktualizacje", | 60 | "infobar.buttonInstallUpdate": "Uruchom ponownie i zainstaluj aktualizacje", |
61 | "infobar.requiredRequestsFailed": "Nie można wczytać usług i informacji o użytkowniku", | 61 | "infobar.requiredRequestsFailed": "Nie można wczytać usług i informacji o użytkowniku", |
62 | "sidebar.settings": "Ustawienia", | 62 | "sidebar.settings": "Ustawienia", |
63 | "sidebar.addNewService": "!!!Add new service", | ||
63 | "services.welcome": "Witaj w aplikcji Franz", | 64 | "services.welcome": "Witaj w aplikcji Franz", |
64 | "services.getStarted": "Zacznij", | 65 | "services.getStarted": "Zacznij", |
65 | "settings.account.headline": "Konto", | 66 | "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 @@ | |||
59 | "infobar.buttonReloadServices": "Recarregar serviços", | 59 | "infobar.buttonReloadServices": "Recarregar serviços", |
60 | "infobar.buttonInstallUpdate": "Reiniciar & instalar atualização", | 60 | "infobar.buttonInstallUpdate": "Reiniciar & instalar atualização", |
61 | "infobar.requiredRequestsFailed": "Não foi possível carregar serviços e informações do usuário", | 61 | "infobar.requiredRequestsFailed": "Não foi possível carregar serviços e informações do usuário", |
62 | "sidebar.addNewService": "!!!Add new service", | ||
62 | "sidebar.settings": "Ajustes", | 63 | "sidebar.settings": "Ajustes", |
63 | "services.welcome": "Bem-vindo ao Franz", | 64 | "services.welcome": "Bem-vindo ao Franz", |
64 | "services.getStarted": "Começar", | 65 | "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 @@ | |||
60 | "infobar.buttonInstallUpdate": "Перезапустить и обновить", | 60 | "infobar.buttonInstallUpdate": "Перезапустить и обновить", |
61 | "infobar.requiredRequestsFailed": "Невозможно загрузить сервисы и информацию пользователя", | 61 | "infobar.requiredRequestsFailed": "Невозможно загрузить сервисы и информацию пользователя", |
62 | "sidebar.settings": "Настройки", | 62 | "sidebar.settings": "Настройки", |
63 | "sidebar.addNewService": "!!!Add new service", | ||
63 | "services.welcome": "Добро пожаловать во Franz", | 64 | "services.welcome": "Добро пожаловать во Franz", |
64 | "services.getStarted": "Начать работу", | 65 | "services.getStarted": "Начать работу", |
65 | "settings.account.headline": "Аккаунт", | 66 | "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 @@ | |||
60 | "infobar.buttonInstallUpdate": "Перезавантажити і встановити оновлення", | 60 | "infobar.buttonInstallUpdate": "Перезавантажити і встановити оновлення", |
61 | "infobar.requiredRequestsFailed": "Не вдалося завантажити сервіси та інформацію користувача", | 61 | "infobar.requiredRequestsFailed": "Не вдалося завантажити сервіси та інформацію користувача", |
62 | "sidebar.settings": "Налаштування", | 62 | "sidebar.settings": "Налаштування", |
63 | "sidebar.addNewService": "!!!Add new service", | ||
63 | "services.welcome": "Ласкаво просимо в Franz", | 64 | "services.welcome": "Ласкаво просимо в Franz", |
64 | "services.getStarted": "Почати", | 65 | "services.getStarted": "Почати", |
65 | "settings.account.headline": "Акаунт", | 66 | "settings.account.headline": "Акаунт", |