From c3b2bb6f0286994a097a242bafd4434d059aa2d6 Mon Sep 17 00:00:00 2001 From: FranzBot Date: Mon, 17 Jun 2019 14:26:23 +0000 Subject: Automatic i18n update (i18n.meetfranz.com) --- src/i18n/locales/hu.json | 24 +++++++++++----------- src/i18n/locales/nl.json | 50 ++++++++++++++++++++++----------------------- src/i18n/locales/pt-BR.json | 2 +- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json index 701568b1c..43e0da91a 100644 --- a/src/i18n/locales/hu.json +++ b/src/i18n/locales/hu.json @@ -8,7 +8,7 @@ "feature.shareFranz.action.email" : "Küldés email-ben", "feature.shareFranz.action.facebook" : "Megosztás Facebook-on", "feature.shareFranz.action.twitter" : "Megosztás Twitter-en", - "feature.shareFranz.headline" : "Franz is better together!", + "feature.shareFranz.headline" : "A Franz barátokkal együtt mégjobb!", "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.", @@ -44,7 +44,7 @@ "login.submit.label" : "Bejelentkezés", "login.tokenExpired" : "A munkamenet lejárt, kérlek lépj be újra.", "menu.app.about" : "Névjegy", - "menu.app.announcement" : "What's new?", + "menu.app.announcement" : "Mi újság?", "menu.app.checkForUpdates" : "Frissítések keresése", "menu.app.hide" : "Elrejt", "menu.app.hideOthers" : "Többi elrejtése", @@ -233,17 +233,17 @@ "settings.services.discoverServices" : "Szolgáltatások felfedezése", "settings.services.headline" : "Szolgáltatásaid", "settings.services.noServicesAdded" : "Még nem adtál hozzá egyetlen szolgáltatást sem eddig.", - "settings.services.servicesRequestFailed" : "Could not load your services", + "settings.services.servicesRequestFailed" : "Szolgáltatásaid betöltése sikertelen", "settings.services.tooltip.isDisabled" : "A szolgáltatás le van tiltva", "settings.services.tooltip.isMuted" : "Minden hang lenémítva", "settings.services.tooltip.notificationsDisabled" : "Értesítések letiltva", "settings.services.updatedInfo" : "A módosításokat elmentettük", "settings.team.contentHeadline" : "Franz for Teams", - "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!", + "settings.team.copy" : "A Franz for Teams lehetőséget teremt arra, hogy meghívd munkatársaidat a csapatodba email-en keresztül, és kezelhesd a Franz előfizetéseiket és fiókbeállításaikat. Ne fecséreld az idődet minden egyes csapattag regisztrációjára, felejtsd el a sok-sok egyéni számlát és különböző lejárati időt - egy mindenek felett!", "settings.team.headline" : "Csapat", - "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.", - "settings.team.manageAction" : "Manage your Team on meetfranz.com", - "settings.team.upgradeAction" : "Upgrade your Account", + "settings.team.intro" : "Te és a csapatod Franz-ot használtok? Egy fiókból kezelheted kollégáid, barátaid vagy családtagjaid Prémium előfizetéseit.", + "settings.team.manageAction" : "Csapat kezelése a meetfranz.com-on", + "settings.team.upgradeAction" : "Előfizetés", "settings.user.form.accountType.company" : "Cég", "settings.user.form.accountType.individual" : "Egyén", "settings.user.form.accountType.label" : "Fiók típusa", @@ -293,7 +293,7 @@ "subscription.features.onpremise.mattermost" : "Saját kiszolgálós szolgáltatások hozzáadása, pl.: Mattermost", "subscription.features.proxy" : "Proxy támogatás a szolgáltatásokhoz", "subscription.features.spellchecker" : "Támogatás a Helyesírás-ellenőrzőhöz", - "subscription.features.workspaces" : "Organize your services in workspaces", + "subscription.features.workspaces" : "Rendezd szolgáltatásaidat Munkaterületekbe", "subscription.includedFeatures" : "Az előfizetett Franz Prémium Támogató Fiók tartalmazza", "subscription.paymentSessionError" : "Nem sikerült a fizetési felületet betölteni", "subscription.submit.label" : "Szeretném támogatni a Franz fejlesztését", @@ -313,12 +313,12 @@ "tabs.item.reload" : "Újratöltés", "validation.email" : "{field} nem érvényes", "validation.minLength" : "{field} mezőnek legalább {length} karakter hosszúnak kell lennie", - "validation.oneRequired" : "At least one is required", + "validation.oneRequired" : "Legalább egy kitöltése szükséges", "validation.required" : "{field} kitöltése kötelező", "validation.url" : "{field} nem érvényes URL", "welcome.loginButton" : "Jelentkezz be a fiókodba", "welcome.signupButton" : "Új fiók létrehozása", - "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace", + "workspaceDrawer.addNewWorkspaceLabel" : "Munkaterület hozzáadása", "workspaceDrawer.allServices" : "Összes szolgáltatás", "workspaceDrawer.headline" : "Munkaterületek", "workspaceDrawer.item.contextMenuEdit" : "szerkeszt", @@ -326,7 +326,7 @@ "workspaceDrawer.premiumCtaButtonLabel" : "Készítsd el az első munkaterületedet", "workspaceDrawer.proFeatureBadge" : "Prémium funkció", "workspaceDrawer.reactivatePremiumAccountLabel" : "Prémium fiók reaktiválása", - "workspaceDrawer.workspaceFeatureInfo" : "

Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p>

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>", + "workspaceDrawer.workspaceFeatureInfo" : "

A Franz Munkaterületek lehetővé teszik, hogy összpontosíts a jelenleg fontos dolgokra. Állítsd be a különböző szolgáltatáskészleteket és könnyedén válthatsz közöttük bármikor.<\/p>

Te döntöd el, hogy mely szolgáltatásokra van szükséged, mikor és hol, így segíthetünk abban, hogy a teljesítményed csúcsán maradhass, vagy ha csak akarod, egyszerűen kikapcsold a munkával kapcsolatos dolgokat.<\/p>", "workspaceDrawer.workspacesSettingsTooltip" : "Munkaterület beállítások szerkesztése", - "workspaces.switchingIndicator.switchingTo" : "Switching to" + "workspaces.switchingIndicator.switchingTo" : "Váltás" } diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json index fdb96a7db..c8ebda75f 100644 --- a/src/i18n/locales/nl.json +++ b/src/i18n/locales/nl.json @@ -165,7 +165,7 @@ "settings.app.headlineGeneral" : "Algemeen", "settings.app.headlineLanguage" : "Taal", "settings.app.headlineUpdates" : "Updates", - "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.", + "settings.app.languageDisclaimer" : "Officiële vertalingen zijn in het Engels en Duits. Alle andere talen zijn beheerd door de community.", "settings.app.restartRequired" : "Deze wijziging heeft een herstart nodig", "settings.app.subheadlineCache" : "Cache", "settings.app.translationHelp" : "Help ons om Franz te vertalen naar uw taal.", @@ -178,9 +178,9 @@ "settings.navigation.inviteFriends" : "Nodig vrienden uit", "settings.navigation.logout" : "Uitloggen", "settings.navigation.settings" : "Instellingen", - "settings.navigation.team" : "Manage Team", + "settings.navigation.team" : "Beheer Team", "settings.navigation.yourServices" : "Jouw services", - "settings.navigation.yourWorkspaces" : "Your workspaces", + "settings.navigation.yourWorkspaces" : "Jouw werkruimtes", "settings.recipes.all" : "Alle services", "settings.recipes.dev" : "Ontwikkeling", "settings.recipes.headline" : "Beschikbare services", @@ -233,7 +233,7 @@ "settings.services.discoverServices" : "Ontdek services", "settings.services.headline" : "Jouw services", "settings.services.noServicesAdded" : "Je hebt nog geen services toegevoegd.", - "settings.services.servicesRequestFailed" : "Could not load your services", + "settings.services.servicesRequestFailed" : "Kan jouw diensten niet laden", "settings.services.tooltip.isDisabled" : "Service is uitgeschakeld", "settings.services.tooltip.isMuted" : "Alle geluiden zijn uitgeschakeld", "settings.services.tooltip.notificationsDisabled" : "Meldingen zijn uitgeschakeld", @@ -242,8 +242,8 @@ "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!", "settings.team.headline" : "Team", "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.", - "settings.team.manageAction" : "Manage your Team on meetfranz.com", - "settings.team.upgradeAction" : "Upgrade your Account", + "settings.team.manageAction" : "Beheer je Team op meetfranz.com", + "settings.team.upgradeAction" : "Jouw Account opwaarderen", "settings.user.form.accountType.company" : "Bedrijf", "settings.user.form.accountType.individual" : "Individueel", "settings.user.form.accountType.label" : "Accounttype", @@ -254,24 +254,24 @@ "settings.user.form.lastname" : "Achternaam", "settings.user.form.newPassword" : "Nieuw wachtwoord", "settings.workspace.add.form.name" : "Naam", - "settings.workspace.add.form.submitButton" : "Create workspace", - "settings.workspace.form.buttonDelete" : "Delete workspace", - "settings.workspace.form.buttonSave" : "Save workspace", + "settings.workspace.add.form.submitButton" : "Maak werkruimte aan", + "settings.workspace.form.buttonDelete" : "Verwijder werkruimte", + "settings.workspace.form.buttonSave" : "Sla werkruimte op", "settings.workspace.form.name" : "Naam", - "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace", + "settings.workspace.form.servicesInWorkspaceHeadline" : "Diensten in deze werkruimte", "settings.workspace.form.yourWorkspaces" : "Jouw werkruimtes", "settings.workspaces.deletedInfo" : "Werkruimte is verwijderd", "settings.workspaces.headline" : "Jouw werkplaatsen", - "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.", + "settings.workspaces.noWorkspacesAdded" : "Je hebt nog geen werkruimtes toegevoegd.", "settings.workspaces.tryReloadWorkspaces" : "Probeer opnieuw", "settings.workspaces.updatedInfo" : "Je wijzigingen zijn opgeslagen", - "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces", - "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.", - "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces", + "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Zie hier Franz Werkruimtes", + "settings.workspaces.workspaceFeatureInfo" : "Franz werkruimtes laat je aandacht geven aan wat nu belangrijk is. Maak verschillende sets van diensten aan en schakel gelijk wanneer tussen de verschillende sets.Jij beslist welke diensten je wanneer en waar nodig hebt, enkel zo kunnen wij jou helpen je focus te behouden. Of net makkelijk de switch te maken van werk naar ontspanning.", + "settings.workspaces.workspacesRequestFailed" : "Kan jouw werkruimtes niet laden", "sidebar.addNewService" : "Voeg service toe", - "sidebar.closeWorkspaceDrawer" : "Werkruimtepagina sluiten", + "sidebar.closeWorkspaceDrawer" : "Werkruimte pagina sluiten", "sidebar.muteApp" : "Schakel berichten & geluid uit", - "sidebar.openWorkspaceDrawer" : "Werkruimtepagina openen", + "sidebar.openWorkspaceDrawer" : "Werkruimte pagina openen", "sidebar.settings" : "Instellingen", "sidebar.unmuteApp" : "Berichten & geluid inschakelen", "signup.company.label" : "Bedrijf", @@ -293,7 +293,7 @@ "subscription.features.onpremise.mattermost" : "Voeg op-locatie\/gehoste diensten zoals Mattermost toe", "subscription.features.proxy" : "Proxy understeuning voor diensten", "subscription.features.spellchecker" : "Ondersteuning voor spellingscheck", - "subscription.features.workspaces" : "Organize your services in workspaces", + "subscription.features.workspaces" : "Beheer je diensten in de werkruimtes", "subscription.includedFeatures" : "Betaald Franz Premium Supporter Account bevat", "subscription.paymentSessionError" : "Kan betaalformulier niet initialiseren", "subscription.submit.label" : "Ik wil de ontwikkeling van Franz ondersteunen", @@ -313,20 +313,20 @@ "tabs.item.reload" : "Herladen", "validation.email" : "{field} is niet geldig", "validation.minLength" : "{field} moet minimaal {length} karakters lang zijn", - "validation.oneRequired" : "At least one is required", + "validation.oneRequired" : "Er is op zijn minst één vereist", "validation.required" : "{field} is vereist", "validation.url" : "{field} is niet een geldige URL", "welcome.loginButton" : "Log in op je account", "welcome.signupButton" : "Maak een gratis account", - "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace", - "workspaceDrawer.allServices" : "Alle services", + "workspaceDrawer.addNewWorkspaceLabel" : "Voeg een nieuwe werkruimte toe", + "workspaceDrawer.allServices" : "Alle diensten", "workspaceDrawer.headline" : "Werkruimtes", - "workspaceDrawer.item.contextMenuEdit" : "edit", - "workspaceDrawer.item.noServicesAddedYet" : "No services added yet", + "workspaceDrawer.item.contextMenuEdit" : "bewerken", + "workspaceDrawer.item.noServicesAddedYet" : "Nog geen diensten toegevoegd", "workspaceDrawer.premiumCtaButtonLabel" : "Maak je eerste werkruimte", "workspaceDrawer.proFeatureBadge" : "Premium feature", "workspaceDrawer.reactivatePremiumAccountLabel" : "Heractiveer premium account", - "workspaceDrawer.workspaceFeatureInfo" : "

Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p>

You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>", - "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings", - "workspaces.switchingIndicator.switchingTo" : "Switching to" + "workspaceDrawer.workspaceFeatureInfo" : "

Franz werkruimtes laat je aandacht geven aan wat nu belangrijk is. Maak verschillende sets van diensten aan en schakel gelijk wanneer tussen de verschillende sets.<\/p>

Jij beslist welke diensten je wanneer en waar nodig hebt, enkel zo kunnen wij jou helpen je focus te behouden. Of net makkelijk de switch te maken van werk naar ontspanning.<\/p>", + "workspaceDrawer.workspacesSettingsTooltip" : "Pas werkruimte instellingen aan", + "workspaces.switchingIndicator.switchingTo" : "Overschakelen naar" } diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json index 27fd796a4..505f0418e 100644 --- a/src/i18n/locales/pt-BR.json +++ b/src/i18n/locales/pt-BR.json @@ -144,7 +144,7 @@ "settings.account.userInfoRequestFailed" : "Não foi possível carregar as informações do usuário", "settings.app.buttonClearAllCache" : "Limpar cache", "settings.app.buttonInstallUpdate" : "Reiniciar e instalar atualização", - "settings.app.buttonSearchForUpdate" : "Verificar se há atualizações", + "settings.app.buttonSearchForUpdate" : "Verificar por atualizações", "settings.app.cacheInfo" : "O cache do Franz está usando {size} de espaço em disco atualmente.", "settings.app.currentVersion" : "Versão atual:", "settings.app.form.autoLaunchInBackground" : "Abrir em segundo plano", -- cgit v1.2.3-54-g00ecf From f2fd1b3068a43c057243159f9228c8ef3aaa4428 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 28 Jun 2019 14:52:24 +0200 Subject: Fix settings window dependence --- src/components/layout/AppLayout.js | 126 ++++++++++++++-------------- src/containers/auth/AuthLayoutContainer.js | 8 +- src/containers/layout/AppLayoutContainer.js | 1 - src/containers/settings/SettingsWindow.js | 35 ++++++-- src/index.html | 1 + src/stores/UIStore.js | 28 ++++++- 6 files changed, 117 insertions(+), 82 deletions(-) diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 499bc097a..ebb9849ea 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js @@ -68,7 +68,6 @@ class AppLayout extends Component { areRequiredRequestsSuccessful: PropTypes.bool.isRequired, retryRequiredRequests: PropTypes.func.isRequired, areRequiredRequestsLoading: PropTypes.bool.isRequired, - darkMode: PropTypes.bool.isRequired, isDelayAppScreenVisible: PropTypes.bool.isRequired, }; @@ -101,7 +100,6 @@ class AppLayout extends Component { areRequiredRequestsSuccessful, retryRequiredRequests, areRequiredRequestsLoading, - darkMode, isDelayAppScreenVisible, } = this.props; @@ -109,69 +107,67 @@ class AppLayout extends Component { return ( -

-
- {isWindows && !isFullScreen && } -
- {workspacesDrawer} - {sidebar} -
- - {news.length > 0 && news.map(item => ( - removeNewsItem({ newsId: item.id })} - > - - - ))} - {/* {!isOnline && ( - - - {intl.formatMessage(globalMessages.notConnectedToTheInternet)} - - )} */} - {!areRequiredRequestsSuccessful && showRequiredRequestsError && ( - - - {intl.formatMessage(messages.requiredRequestsFailed)} - - )} - {showServicesUpdatedInfoBar && ( - - - {intl.formatMessage(messages.servicesUpdated)} - - )} - {appUpdateIsDownloaded && ( - - )} - {isDelayAppScreenVisible && ()} - - - {services} - {children} -
+
+ {isWindows && !isFullScreen && } +
+ {workspacesDrawer} + {sidebar} +
+ + {news.length > 0 && news.map(item => ( + removeNewsItem({ newsId: item.id })} + > + + + ))} + {/* {!isOnline && ( + + + {intl.formatMessage(globalMessages.notConnectedToTheInternet)} + + )} */} + {!areRequiredRequestsSuccessful && showRequiredRequestsError && ( + + + {intl.formatMessage(messages.requiredRequestsFailed)} + + )} + {showServicesUpdatedInfoBar && ( + + + {intl.formatMessage(messages.servicesUpdated)} + + )} + {appUpdateIsDownloaded && ( + + )} + {isDelayAppScreenVisible && ()} + + + {services} + {children}
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js index 1f9c1ea61..20b88c500 100644 --- a/src/containers/auth/AuthLayoutContainer.js +++ b/src/containers/auth/AuthLayoutContainer.js @@ -24,24 +24,22 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer stores, actions, children, location, } = this.props; const { - app, features, globalError, settings, + app, features, globalError, } = stores; const isLoadingBaseFeatures = features.defaultFeaturesRequest.isExecuting && !features.defaultFeaturesRequest.wasExecuted; - const themeType = theme(settings.app.darkMode ? 'dark' : 'default'); - if (isLoadingBaseFeatures) { return ( - + ); } return ( - + {React.Children.count(children) > 0 ? children : null} diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js index 663b9e2e4..440d32a46 100644 --- a/src/containers/settings/SettingsWindow.js +++ b/src/containers/settings/SettingsWindow.js @@ -1,4 +1,5 @@ import React, { Component } from 'react'; +import ReactDOM from 'react-dom'; import PropTypes from 'prop-types'; import { observer, inject } from 'mobx-react'; @@ -10,10 +11,23 @@ import ErrorBoundary from '../../components/util/ErrorBoundary'; import { workspaceStore } from '../../features/workspaces'; export default @inject('stores', 'actions') @observer class SettingsContainer extends Component { + portalRoot = document.querySelector('#portalContainer'); + + el = document.createElement('div'); + + componentDidMount() { + this.portalRoot.appendChild(this.el); + } + + componentWillUnmount() { + this.portalRoot.removeChild(this.el); + } + render() { const { children, stores } = this.props; const { closeSettings } = this.props.actions.ui; + const navigation = ( ); - return ( - - - {children} - - + return ReactDOM.createPortal( + ( + + + {children} + + + ), + this.el, ); } } diff --git a/src/index.html b/src/index.html index bf15e2d4e..f29aa2686 100644 --- a/src/index.html +++ b/src/index.html @@ -10,6 +10,7 @@
DEV MODE
+