From aa6689e6158efde28b68948cd8b67d55080158d2 Mon Sep 17 00:00:00 2001 From: Vijay Raghavan Aravamudhan Date: Sat, 5 Jun 2021 16:28:45 +0530 Subject: Removed hardcoded strings and reused constants defined in config.js (#1499) --- src/components/auth/AuthLayout.js | 3 +- src/components/auth/ChangeServer.js | 5 +- src/components/auth/Login.js | 7 +- src/components/auth/Signup.js | 8 +- .../services/content/ConnectionLostBanner.js | 4 +- .../settings/account/AccountDashboard.js | 4 +- .../settings/navigation/SettingsNavigation.js | 6 +- .../settings/settings/EditSettingsForm.js | 5 +- src/components/settings/team/TeamDashboard.js | 3 +- src/config.js | 17 +- src/containers/settings/AccountScreen.js | 3 +- src/containers/settings/TeamScreen.js | 3 +- src/environment.js | 25 +- .../planSelection/components/PlanSelection.js | 4 +- src/i18n/locales/defaultMessages.json | 532 ++++++++++----------- .../messages/src/components/auth/ChangeServer.json | 24 +- src/i18n/messages/src/components/auth/Login.json | 52 +- .../settings/settings/EditSettingsForm.json | 128 ++--- .../components/settings/team/TeamDashboard.json | 32 +- src/i18n/messages/src/lib/Menu.json | 296 ++++++------ src/lib/Menu.js | 17 +- 21 files changed, 594 insertions(+), 584 deletions(-) (limited to 'src') diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index 4783fc6a0..6fa3adf92 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js @@ -12,6 +12,7 @@ import globalMessages from '../../i18n/globalMessages'; import { isWindows } from '../../environment'; import AppUpdateInfoBar from '../AppUpdateInfoBar'; +import { GITHUB_FERDI_URL } from '../../config'; export default @observer class AuthLayout extends Component { static propTypes = { @@ -94,7 +95,7 @@ export default @observer class AuthLayout extends Component { })} {/* */} - + diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js index 68c2303a4..0dedd825a 100644 --- a/src/components/auth/ChangeServer.js +++ b/src/components/auth/ChangeServer.js @@ -8,6 +8,7 @@ import Select from '../ui/Select'; import Button from '../ui/Button'; import Infobox from '../ui/Infobox'; import { url, required } from '../../helpers/validation-helpers'; +import { LIVE_FERDI_API, LIVE_FRANZ_API } from '../../config'; const messages = defineMessages({ headline: { @@ -47,9 +48,9 @@ export default @observer class ChangeServer extends Component { intl: intlShape, }; - ferdiServer='https://api.getferdi.com'; + ferdiServer=LIVE_FERDI_API; - franzServer='https://api.franzinfra.com'; + franzServer=LIVE_FRANZ_API; defaultServers=[this.franzServer, this.ferdiServer]; diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 23fdfcac7..52b09eab6 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js @@ -4,7 +4,8 @@ import PropTypes from 'prop-types'; import { observer, inject } from 'mobx-react'; import { defineMessages, intlShape } from 'react-intl'; -import { isDevMode, useLiveAPI } from '../../environment'; +import { LIVE_FRANZ_API } from '../../config'; +import { API_VERSION, isDevMode, useLiveAPI } from '../../environment'; import Form from '../../lib/Form'; import { required, email } from '../../helpers/validation-helpers'; import serverlessLogin from '../../helpers/serverless-helpers'; @@ -164,12 +165,12 @@ export default @inject('actions') @observer class Login extends Component { {error.code === 'invalid-credentials' && ( <>

{intl.formatMessage(messages.invalidCredentials)}

- { window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' && ( + { window.ferdi.stores.settings.all.app.server !== LIVE_FRANZ_API && (

{intl.formatMessage(messages.customServerQuestion)} {' '} diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 6a7db5cde..140867ea1 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'; import { observer, inject } from 'mobx-react'; import { defineMessages, intlShape } from 'react-intl'; -import { isDevMode, useLiveAPI } from '../../environment'; +import { isDevMode, termsBase, useLiveAPI } from '../../environment'; import Form from '../../lib/Form'; import { required, email, minLength } from '../../helpers/validation-helpers'; import serverlessLogin from '../../helpers/serverless-helpers'; @@ -135,8 +135,6 @@ export default @inject('actions') @observer class Signup extends Component { isSubmitting, loginRoute, error, changeServerRoute, } = this.props; - const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com'; - return (

@@ -183,7 +181,7 @@ export default @inject('actions') @observer class Signup extends Component { {intl.formatMessage(messages.legalInfo)}
@@ -191,7 +189,7 @@ export default @inject('actions') @observer class Signup extends Component {  &  diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js index 36ab2b351..e54a88faa 100644 --- a/src/components/services/content/ConnectionLostBanner.js +++ b/src/components/services/content/ConnectionLostBanner.js @@ -8,7 +8,7 @@ import { intlShape, defineMessages } from 'react-intl'; import { mdiAlert, } from '@mdi/js'; -import { LIVE_API_WEBSITE } from '../../../config'; +import { LIVE_API_FERDI_WEBSITE } from '../../../config'; // import { Button } from '@meetfranz/forms'; const messages = defineMessages({ @@ -98,7 +98,7 @@ class ConnectionLostBanner extends Component { {intl.formatMessage(messages.text, { name })}
{intl.formatMessage(messages.moreInformation)} diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 809bfda6e..68d88e218 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js @@ -11,7 +11,7 @@ import Button from '../../ui/Button'; import Infobox from '../../ui/Infobox'; import SubscriptionForm from '../../../containers/subscription/SubscriptionFormScreen'; import { i18nPlanName } from '../../../helpers/plan-helpers'; -import { LOCAL_SERVER } from '../../../config'; +import { LOCAL_SERVER, LIVE_FRANZ_API } from '../../../config'; const messages = defineMessages({ headline: { @@ -154,7 +154,7 @@ class AccountDashboard extends Component { } const isUsingWithoutAccount = server === LOCAL_SERVER; - const isUsingFranzServer = server === 'https://api.franzinfra.com'; + const isUsingFranzServer = server === LIVE_FRANZ_API; return (
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js index f7786f4e8..616c8c587 100644 --- a/src/components/settings/navigation/SettingsNavigation.js +++ b/src/components/settings/navigation/SettingsNavigation.js @@ -5,7 +5,7 @@ import { inject, observer } from 'mobx-react'; import { ProBadge } from '@meetfranz/ui'; import { RouterStore } from 'mobx-react-router'; -import { LOCAL_SERVER, LIVE_API } from '../../../config'; +import { LOCAL_SERVER, LIVE_FERDI_API, LIVE_FRANZ_API } from '../../../config'; import Link from '../../ui/Link'; import { workspaceStore } from '../../../features/workspaces'; import UIStore from '../../../stores/UIStore'; @@ -82,7 +82,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e this.props.actions.settings.update({ type: 'app', data: { - server: LIVE_API, + server: LIVE_FERDI_API, }, }); } @@ -105,7 +105,7 @@ export default @inject('stores', 'actions') @observer class SettingsNavigation e const { intl } = this.context; const isLoggedIn = Boolean(localStorage.getItem('authToken')); const isUsingWithoutAccount = stores.settings.app.server === LOCAL_SERVER; - const isUsingFranzServer = stores.settings.app.server === 'https://api.franzinfra.com'; + const isUsingFranzServer = stores.settings.app.server === LIVE_FRANZ_API; return (
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 0c0366335..08e5efa2a 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -16,6 +16,7 @@ import Input from '../../ui/Input'; import { DEFAULT_APP_SETTINGS, FRANZ_TRANSLATION, + GITHUB_FRANZ_URL, } from '../../../config'; import { isMac, isWindows } from '../../../environment'; @@ -677,13 +678,13 @@ export default @observer class EditSettingsForm extends Component { Ferdi is based on {' '} - Franz + Franz , a project published under the {' '} - Apache-2.0 License + Apache-2.0 License
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js index 72358d485..f26f4cc0c 100644 --- a/src/components/settings/team/TeamDashboard.js +++ b/src/components/settings/team/TeamDashboard.js @@ -12,6 +12,7 @@ import Button from '../../ui/Button'; import Infobox from '../../ui/Infobox'; import globalMessages from '../../../i18n/globalMessages'; import UpgradeButton from '../../ui/UpgradeButton'; +import { LIVE_FRANZ_API } from '../../../config'; const messages = defineMessages({ headline: { @@ -125,7 +126,7 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon } = this.props; const { intl } = this.context; - if (server === 'https://api.franzinfra.com') { + if (server === LIVE_FRANZ_API) { return (
diff --git a/src/config.js b/src/config.js index 189959a4d..d3749b438 100644 --- a/src/config.js +++ b/src/config.js @@ -8,8 +8,10 @@ const { app, nativeTheme } = process.type === 'renderer' ? require('@electron/re export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks export const LOCAL_API = 'http://localhost:3000'; -export const DEV_API = 'https://dev.franzinfra.com'; -export const LIVE_API = 'https://api.getferdi.com'; +export const DEV_FRANZ_API = 'https://dev.franzinfra.com'; + +export const LIVE_FERDI_API = 'https://api.getferdi.com'; +export const LIVE_FRANZ_API = 'https://api.franzinfra.com'; // URL used to submit debugger information, see https://github.com/getferdi/debugger export const DEBUG_API = 'https://debug.getferdi.com'; @@ -19,9 +21,8 @@ export const DEV_WS_API = 'wss://dev.franzinfra.com'; export const LIVE_WS_API = 'wss://api.franzinfra.com'; export const LOCAL_API_WEBSITE = 'http://localhost:3333'; -// export const DEV_API_WEBSITE = 'https://meetfranz.com';t -export const DEV_API_WEBSITE = 'http://hash-58883791519ef6288c952316bdce7fb462283893.franzstaging.com/'; // TODO: revert me -export const LIVE_API_WEBSITE = 'https://getferdi.com'; +export const DEV_API_FRANZ_WEBSITE = 'https://meetfranz.com'; +export const LIVE_API_FERDI_WEBSITE = 'https://getferdi.com'; export const STATS_API = 'https://stats.franzinfra.com'; @@ -120,7 +121,7 @@ export const DEFAULT_APP_SETTINGS = { serviceLimit: 5, // Ferdi specific options - server: LIVE_API, + server: LIVE_FERDI_API, predefinedTodoServer: 'https://app.franztodos.com', autohideMenuBar: false, lockingFeatureEnabled: false, @@ -171,7 +172,9 @@ export const DEFAULT_WINDOW_OPTIONS = { y: 0, }; -export const FRANZ_SERVICE_REQUEST = 'https://github.com/getferdi/recipes/issues'; +export const GITHUB_FRANZ_URL = 'https://github.com/meetfranz'; +export const GITHUB_FERDI_URL = 'https://github.com/getferdi'; +export const FRANZ_SERVICE_REQUEST = `${GITHUB_FERDI_URL}/recipes/issues`; export const FRANZ_TRANSLATION = 'https://crowdin.com/project/getferdi'; export const FRANZ_DEV_DOCS = 'http://bit.ly/franz-dev-hub'; diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js index 12c912bac..98e212192 100644 --- a/src/containers/settings/AccountScreen.js +++ b/src/containers/settings/AccountScreen.js @@ -10,6 +10,7 @@ import SettingsStore from '../../stores/SettingsStore'; import AccountDashboard from '../../components/settings/account/AccountDashboard'; import ErrorBoundary from '../../components/util/ErrorBoundary'; +import { LIVE_FRANZ_API } from '../../config'; import { WEBSITE } from '../../environment'; export default @@ -35,7 +36,7 @@ class AccountScreen extends Component { const api = stores.settings.all.app.server; let url; - if (api === 'https://api.franzinfra.com') { + if (api === LIVE_FRANZ_API) { url = stores.user.getAuthURL( `${WEBSITE}${route}?utm_source=app&utm_medium=account_dashboard`, ); diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js index 3e21ca2d9..c1360a666 100644 --- a/src/containers/settings/TeamScreen.js +++ b/src/containers/settings/TeamScreen.js @@ -8,12 +8,13 @@ import SettingsStore from '../../stores/SettingsStore'; import TeamDashboard from '../../components/settings/team/TeamDashboard'; import ErrorBoundary from '../../components/util/ErrorBoundary'; +import { DEV_API_FRANZ_WEBSITE } from '../../config'; export default @inject('stores', 'actions') @observer class TeamScreen extends Component { handleWebsiteLink(route) { const { actions, stores } = this.props; - const url = `https://meetfranz.com/${route}?authToken=${stores.user.authToken}&utm_source=app&utm_medium=account_dashboard`; + const url = `${DEV_API_FRANZ_WEBSITE}/${route}?authToken=${stores.user.authToken}&utm_source=app&utm_medium=account_dashboard`; actions.app.openExternalUrl({ url }); } diff --git a/src/environment.js b/src/environment.js index fb7c9d133..18d686232 100644 --- a/src/environment.js +++ b/src/environment.js @@ -1,16 +1,17 @@ import { isDevMode as isDev, - LIVE_API, - DEV_API, + LIVE_FERDI_API, + DEV_FRANZ_API, LOCAL_API, LOCAL_API_WEBSITE, - DEV_API_WEBSITE, - LIVE_API_WEBSITE, + DEV_API_FRANZ_WEBSITE, + LIVE_API_FERDI_WEBSITE, LIVE_WS_API, LOCAL_WS_API, DEV_WS_API, LOCAL_TODOS_FRONTEND_URL, PRODUCTION_TODOS_FRONTEND_URL, + LIVE_FRANZ_API, } from './config'; // eslint-disable-next-line global-require @@ -39,11 +40,11 @@ let wsApi; let web; let todos; if (!isDevMode || (isDevMode && useLiveAPI)) { - api = LIVE_API; - // api = DEV_API; + api = LIVE_FERDI_API; + // api = DEV_FRANZ_API; wsApi = LIVE_WS_API; - web = LIVE_API_WEBSITE; - // web = DEV_API_WEBSITE; + web = LIVE_API_FERDI_WEBSITE; + // web = DEV_API_FRANZ_WEBSITE; todos = PRODUCTION_TODOS_FRONTEND_URL; } else if (isDevMode && useLocalAPI) { api = LOCAL_API; @@ -51,9 +52,9 @@ if (!isDevMode || (isDevMode && useLiveAPI)) { web = LOCAL_API_WEBSITE; todos = LOCAL_TODOS_FRONTEND_URL; } else { - api = DEV_API; + api = DEV_FRANZ_API; wsApi = DEV_WS_API; - web = DEV_API_WEBSITE; + web = DEV_API_FRANZ_WEBSITE; todos = PRODUCTION_TODOS_FRONTEND_URL; } @@ -62,3 +63,7 @@ export const API_VERSION = 'v1'; export const WS_API = wsApi; export const WEBSITE = web; export const TODOS_FRONTEND = todos; + +export function termsBase() { + return window.ferdi.stores.settings.all.app.server !== LIVE_FRANZ_API ? window.ferdi.stores.settings.all.app.server : DEV_API_FRANZ_WEBSITE; +} diff --git a/src/features/planSelection/components/PlanSelection.js b/src/features/planSelection/components/PlanSelection.js index 6f0dd30ad..819a9df5b 100644 --- a/src/features/planSelection/components/PlanSelection.js +++ b/src/features/planSelection/components/PlanSelection.js @@ -9,7 +9,7 @@ import color from 'color'; import { mdiArrowRight } from '@mdi/js'; import PlanItem from './PlanItem'; import { i18nPlanName } from '../../../helpers/plan-helpers'; -import { PLANS } from '../../../config'; +import { DEV_API_FRANZ_WEBSITE, PLANS } from '../../../config'; import { FeatureList } from '../../../components/ui/FeatureList'; import Appear from '../../../components/ui/effects/Appear'; @@ -248,7 +248,7 @@ class PlanSelection extends Component {
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index c44357396..a72d5c89e 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -49,78 +49,78 @@ "defaultMessage": "!!!Change server", "end": { "column": 3, - "line": 16 + "line": 17 }, "file": "src/components/auth/ChangeServer.js", "id": "changeserver.headline", "start": { "column": 12, - "line": 13 + "line": 14 } }, { "defaultMessage": "!!!Server", "end": { "column": 3, - "line": 20 + "line": 21 }, "file": "src/components/auth/ChangeServer.js", "id": "changeserver.label", "start": { "column": 9, - "line": 17 + "line": 18 } }, { "defaultMessage": "!!!Extra settings offered by Ferdi will not be saved", "end": { "column": 3, - "line": 24 + "line": 25 }, "file": "src/components/auth/ChangeServer.js", "id": "changeserver.warning", "start": { "column": 11, - "line": 21 + "line": 22 } }, { "defaultMessage": "!!!Custom server", "end": { "column": 3, - "line": 28 + "line": 29 }, "file": "src/components/auth/ChangeServer.js", "id": "changeserver.customServerLabel", "start": { "column": 21, - "line": 25 + "line": 26 } }, { "defaultMessage": "!!!Enter a valid URL", "end": { "column": 3, - "line": 32 + "line": 33 }, "file": "src/components/auth/ChangeServer.js", "id": "changeserver.urlError", "start": { "column": 12, - "line": 29 + "line": 30 } }, { "defaultMessage": "!!!Submit", "end": { "column": 3, - "line": 36 + "line": 37 }, "file": "src/components/auth/ChangeServer.js", "id": "changeserver.submit", "start": { "column": 10, - "line": 33 + "line": 34 } } ], @@ -394,169 +394,169 @@ "defaultMessage": "!!!Sign in", "end": { "column": 3, - "line": 22 + "line": 23 }, "file": "src/components/auth/Login.js", "id": "login.headline", "start": { "column": 12, - "line": 19 + "line": 20 } }, { "defaultMessage": "!!!Email address", "end": { "column": 3, - "line": 26 + "line": 27 }, "file": "src/components/auth/Login.js", "id": "login.email.label", "start": { "column": 14, - "line": 23 + "line": 24 } }, { "defaultMessage": "!!!Password", "end": { "column": 3, - "line": 30 + "line": 31 }, "file": "src/components/auth/Login.js", "id": "login.password.label", "start": { "column": 17, - "line": 27 + "line": 28 } }, { "defaultMessage": "!!!Sign in", "end": { "column": 3, - "line": 34 + "line": 35 }, "file": "src/components/auth/Login.js", "id": "login.submit.label", "start": { "column": 21, - "line": 31 + "line": 32 } }, { "defaultMessage": "!!!Email or password not valid", "end": { "column": 3, - "line": 38 + "line": 39 }, "file": "src/components/auth/Login.js", "id": "login.invalidCredentials", "start": { "column": 22, - "line": 35 + "line": 36 } }, { "defaultMessage": "!!!Using a Franz account to log in?", "end": { "column": 3, - "line": 42 + "line": 43 }, "file": "src/components/auth/Login.js", "id": "login.customServerQuestion", "start": { "column": 24, - "line": 39 + "line": 40 } }, { "defaultMessage": "!!!Try importing your Franz account into Ferdi", "end": { "column": 3, - "line": 46 + "line": 47 }, "file": "src/components/auth/Login.js", "id": "login.customServerSuggestion", "start": { "column": 26, - "line": 43 + "line": 44 } }, { "defaultMessage": "!!!Your session expired, please login again.", "end": { "column": 3, - "line": 50 + "line": 51 }, "file": "src/components/auth/Login.js", "id": "login.tokenExpired", "start": { "column": 16, - "line": 47 + "line": 48 } }, { "defaultMessage": "!!!Your session expired, please login again.", "end": { "column": 3, - "line": 54 + "line": 55 }, "file": "src/components/auth/Login.js", "id": "login.serverLogout", "start": { "column": 16, - "line": 51 + "line": 52 } }, { "defaultMessage": "!!!Create a free account", "end": { "column": 3, - "line": 58 + "line": 59 }, "file": "src/components/auth/Login.js", "id": "login.link.signup", "start": { "column": 14, - "line": 55 + "line": 56 } }, { "defaultMessage": "!!!Change server", "end": { "column": 3, - "line": 62 + "line": 63 }, "file": "src/components/auth/Login.js", "id": "login.changeServer", "start": { "column": 16, - "line": 59 + "line": 60 } }, { "defaultMessage": "!!!Use Ferdi without an Account", "end": { "column": 3, - "line": 66 + "line": 67 }, "file": "src/components/auth/Login.js", "id": "services.serverless", "start": { "column": 14, - "line": 63 + "line": 64 } }, { "defaultMessage": "!!!Forgot password", "end": { "column": 3, - "line": 70 + "line": 71 }, "file": "src/components/auth/Login.js", "id": "login.link.password", "start": { "column": 16, - "line": 67 + "line": 68 } } ], @@ -3241,416 +3241,416 @@ "defaultMessage": "!!!Settings", "end": { "column": 3, - "line": 26 + "line": 27 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headline", "start": { "column": 12, - "line": 23 + "line": 24 } }, { "defaultMessage": "!!!General", "end": { "column": 3, - "line": 30 + "line": 31 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineGeneral", "start": { "column": 19, - "line": 27 + "line": 28 } }, { "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.", "end": { "column": 3, - "line": 34 + "line": 35 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.sentryInfo", "start": { "column": 14, - "line": 31 + "line": 32 } }, { "defaultMessage": "!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "end": { "column": 3, - "line": 38 + "line": 39 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.hibernateInfo", "start": { "column": 17, - "line": 35 + "line": 36 } }, { "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable", "end": { "column": 3, - "line": 42 + "line": 43 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.inactivityLockInfo", "start": { "column": 22, - "line": 39 + "line": 40 } }, { "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)", "end": { "column": 3, - "line": 46 + "line": 47 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.todoServerInfo", "start": { "column": 18, - "line": 43 + "line": 44 } }, { "defaultMessage": "!!!Password", "end": { "column": 3, - "line": 50 + "line": 51 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.lockedPassword", "start": { "column": 18, - "line": 47 + "line": 48 } }, { "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "end": { "column": 3, - "line": 54 + "line": 55 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.lockedPasswordInfo", "start": { "column": 22, - "line": 51 + "line": 52 } }, { "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", "end": { "column": 3, - "line": 58 + "line": 59 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.lockInfo", "start": { "column": 12, - "line": 55 + "line": 56 } }, { "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "end": { "column": 3, - "line": 62 + "line": 63 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.scheduledDNDTimeInfo", "start": { "column": 24, - "line": 59 + "line": 60 } }, { "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "end": { "column": 3, - "line": 66 + "line": 67 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.scheduledDNDInfo", "start": { "column": 20, - "line": 63 + "line": 64 } }, { "defaultMessage": "!!!Language", "end": { "column": 3, - "line": 70 + "line": 71 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineLanguage", "start": { "column": 20, - "line": 67 + "line": 68 } }, { "defaultMessage": "!!!Updates", "end": { "column": 3, - "line": 74 + "line": 75 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineUpdates", "start": { "column": 19, - "line": 71 + "line": 72 } }, { "defaultMessage": "!!!Appearance", "end": { "column": 3, - "line": 78 + "line": 79 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineAppearance", "start": { "column": 22, - "line": 75 + "line": 76 } }, { "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.", "end": { "column": 3, - "line": 82 + "line": 83 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.universalDarkModeInfo", "start": { "column": 25, - "line": 79 + "line": 80 } }, { "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})", "end": { "column": 3, - "line": 86 + "line": 87 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.accentColorInfo", "start": { "column": 19, - "line": 83 + "line": 84 } }, { "defaultMessage": "!!!Privacy", "end": { "column": 3, - "line": 90 + "line": 91 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlinePrivacy", "start": { "column": 19, - "line": 87 + "line": 88 } }, { "defaultMessage": "!!!Advanced", "end": { "column": 3, - "line": 94 + "line": 95 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.headlineAdvanced", "start": { "column": 20, - "line": 91 + "line": 92 } }, { "defaultMessage": "!!!Help us to translate Ferdi into your language.", "end": { "column": 3, - "line": 98 + "line": 99 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.translationHelp", "start": { "column": 19, - "line": 95 + "line": 96 } }, { "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.", "end": { "column": 3, - "line": 102 + "line": 103 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.spellCheckerLanguageInfo", "start": { "column": 28, - "line": 99 + "line": 100 } }, { "defaultMessage": "!!!Cache", "end": { "column": 3, - "line": 106 + "line": 107 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.subheadlineCache", "start": { "column": 20, - "line": 103 + "line": 104 } }, { "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", "end": { "column": 3, - "line": 110 + "line": 111 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.cacheInfo", "start": { "column": 13, - "line": 107 + "line": 108 } }, { "defaultMessage": "!!!Couldn't clear all cache", "end": { "column": 3, - "line": 114 + "line": 115 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.cacheNotCleared", "start": { "column": 19, - "line": 111 + "line": 112 } }, { "defaultMessage": "!!!Clear cache", "end": { "column": 3, - "line": 118 + "line": 119 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.buttonClearAllCache", "start": { "column": 23, - "line": 115 + "line": 116 } }, { "defaultMessage": "!!!Check for updates", "end": { "column": 3, - "line": 122 + "line": 123 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.buttonSearchForUpdate", "start": { "column": 25, - "line": 119 + "line": 120 } }, { "defaultMessage": "!!!Restart & install update", "end": { "column": 3, - "line": 126 + "line": 127 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.buttonInstallUpdate", "start": { "column": 23, - "line": 123 + "line": 124 } }, { "defaultMessage": "!!!Is searching for update", "end": { "column": 3, - "line": 130 + "line": 131 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.updateStatusSearching", "start": { "column": 25, - "line": 127 + "line": 128 } }, { "defaultMessage": "!!!Update available, downloading...", "end": { "column": 3, - "line": 134 + "line": 135 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.updateStatusAvailable", "start": { "column": 25, - "line": 131 + "line": 132 } }, { "defaultMessage": "!!!You are using the latest version of Ferdi", "end": { "column": 3, - "line": 138 + "line": 139 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.updateStatusUpToDate", "start": { "column": 24, - "line": 135 + "line": 136 } }, { "defaultMessage": "!!!Current version:", "end": { "column": 3, - "line": 142 + "line": 143 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.currentVersion", "start": { "column": 18, - "line": 139 + "line": 140 } }, { "defaultMessage": "!!!Changes require restart", "end": { "column": 3, - "line": 146 + "line": 147 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.restartRequired", "start": { "column": 29, - "line": 143 + "line": 144 } }, { "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", "end": { "column": 3, - "line": 150 + "line": 151 }, "file": "src/components/settings/settings/EditSettingsForm.js", "id": "settings.app.languageDisclaimer", "start": { "column": 22, - "line": 147 + "line": 148 } } ], @@ -3862,104 +3862,104 @@ "defaultMessage": "!!!Team", "end": { "column": 3, - "line": 20 + "line": 21 }, "file": "src/components/settings/team/TeamDashboard.js", "id": "settings.team.headline", "start": { "column": 12, - "line": 17 + "line": 18 } }, { "defaultMessage": "!!!Franz Team Management", "end": { "column": 3, - "line": 24 + "line": 25 }, "file": "src/components/settings/team/TeamDashboard.js", "id": "settings.team.contentHeadline", "start": { "column": 19, - "line": 21 + "line": 22 } }, { "defaultMessage": "!!!Your are currently using Franz Servers, which is why you have access to Team Management.", "end": { "column": 3, - "line": 28 + "line": 29 }, "file": "src/components/settings/team/TeamDashboard.js", "id": "settings.team.intro", "start": { "column": 9, - "line": 25 + "line": 26 } }, { "defaultMessage": "!!!Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.", "end": { "column": 3, - "line": 32 + "line": 33 }, "file": "src/components/settings/team/TeamDashboard.js", "id": "settings.team.copy", "start": { "column": 8, - "line": 29 + "line": 30 } }, { "defaultMessage": "!!!Manage your Team on meetfranz.com", "end": { "column": 3, - "line": 36 + "line": 37 }, "file": "src/components/settings/team/TeamDashboard.js", "id": "settings.team.manageAction", "start": { "column": 16, - "line": 33 + "line": 34 } }, { "defaultMessage": "!!!Upgrade your Account", "end": { "column": 3, - "line": 40 + "line": 41 }, "file": "src/components/settings/team/TeamDashboard.js", "id": "settings.team.upgradeAction", "start": { "column": 17, - "line": 37 + "line": 38 } }, { "defaultMessage": "!!!Teams are unavailable", "end": { "column": 3, - "line": 44 + "line": 45 }, "file": "src/components/settings/team/TeamDashboard.js", "id": "settings.team.teamsUnavailable", "start": { "column": 20, - "line": 41 + "line": 42 } }, { "defaultMessage": "!!!Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.", "end": { "column": 3, - "line": 48 + "line": 49 }, "file": "src/components/settings/team/TeamDashboard.js", "id": "settings.team.teamsUnavailableInfo", "start": { "column": 24, - "line": 45 + "line": 46 } } ], @@ -7353,962 +7353,962 @@ "defaultMessage": "!!!Edit", "end": { "column": 3, - "line": 26 + "line": 27 }, "file": "src/lib/Menu.js", "id": "menu.edit", "start": { "column": 8, - "line": 23 + "line": 24 } }, { "defaultMessage": "!!!Undo", "end": { "column": 3, - "line": 30 + "line": 31 }, "file": "src/lib/Menu.js", "id": "menu.edit.undo", "start": { "column": 8, - "line": 27 + "line": 28 } }, { "defaultMessage": "!!!Redo", "end": { "column": 3, - "line": 34 + "line": 35 }, "file": "src/lib/Menu.js", "id": "menu.edit.redo", "start": { "column": 8, - "line": 31 + "line": 32 } }, { "defaultMessage": "!!!Cut", "end": { "column": 3, - "line": 38 + "line": 39 }, "file": "src/lib/Menu.js", "id": "menu.edit.cut", "start": { "column": 7, - "line": 35 + "line": 36 } }, { "defaultMessage": "!!!Copy", "end": { "column": 3, - "line": 42 + "line": 43 }, "file": "src/lib/Menu.js", "id": "menu.edit.copy", "start": { "column": 8, - "line": 39 + "line": 40 } }, { "defaultMessage": "!!!Paste", "end": { "column": 3, - "line": 46 + "line": 47 }, "file": "src/lib/Menu.js", "id": "menu.edit.paste", "start": { "column": 9, - "line": 43 + "line": 44 } }, { "defaultMessage": "!!!Paste And Match Style", "end": { "column": 3, - "line": 50 + "line": 51 }, "file": "src/lib/Menu.js", "id": "menu.edit.pasteAndMatchStyle", "start": { "column": 22, - "line": 47 + "line": 48 } }, { "defaultMessage": "!!!Delete", "end": { "column": 3, - "line": 54 + "line": 55 }, "file": "src/lib/Menu.js", "id": "menu.edit.delete", "start": { "column": 10, - "line": 51 + "line": 52 } }, { "defaultMessage": "!!!Select All", "end": { "column": 3, - "line": 58 + "line": 59 }, "file": "src/lib/Menu.js", "id": "menu.edit.selectAll", "start": { "column": 13, - "line": 55 + "line": 56 } }, { "defaultMessage": "!!!Find in Page", "end": { "column": 3, - "line": 62 + "line": 63 }, "file": "src/lib/Menu.js", "id": "menu.edit.findInPage", "start": { "column": 14, - "line": 59 + "line": 60 } }, { "defaultMessage": "!!!Speech", "end": { "column": 3, - "line": 66 + "line": 67 }, "file": "src/lib/Menu.js", "id": "menu.edit.speech", "start": { "column": 10, - "line": 63 + "line": 64 } }, { "defaultMessage": "!!!Start Speaking", "end": { "column": 3, - "line": 70 + "line": 71 }, "file": "src/lib/Menu.js", "id": "menu.edit.startSpeaking", "start": { "column": 17, - "line": 67 + "line": 68 } }, { "defaultMessage": "!!!Stop Speaking", "end": { "column": 3, - "line": 74 + "line": 75 }, "file": "src/lib/Menu.js", "id": "menu.edit.stopSpeaking", "start": { "column": 16, - "line": 71 + "line": 72 } }, { "defaultMessage": "!!!Start Dictation", "end": { "column": 3, - "line": 78 + "line": 79 }, "file": "src/lib/Menu.js", "id": "menu.edit.startDictation", "start": { "column": 18, - "line": 75 + "line": 76 } }, { "defaultMessage": "!!!Emoji & Symbols", "end": { "column": 3, - "line": 82 + "line": 83 }, "file": "src/lib/Menu.js", "id": "menu.edit.emojiSymbols", "start": { "column": 16, - "line": 79 + "line": 80 } }, { "defaultMessage": "!!!Open Quick Switch", "end": { "column": 3, - "line": 86 + "line": 87 }, "file": "src/lib/Menu.js", "id": "menu.view.openQuickSwitch", "start": { "column": 19, - "line": 83 + "line": 84 } }, { "defaultMessage": "!!!Back", "end": { "column": 3, - "line": 90 + "line": 91 }, "file": "src/lib/Menu.js", "id": "menu.view.back", "start": { "column": 8, - "line": 87 + "line": 88 } }, { "defaultMessage": "!!!Forward", "end": { "column": 3, - "line": 94 + "line": 95 }, "file": "src/lib/Menu.js", "id": "menu.view.forward", "start": { "column": 11, - "line": 91 + "line": 92 } }, { "defaultMessage": "!!!Actual Size", "end": { "column": 3, - "line": 98 + "line": 99 }, "file": "src/lib/Menu.js", "id": "menu.view.resetZoom", "start": { "column": 13, - "line": 95 + "line": 96 } }, { "defaultMessage": "!!!Zoom In", "end": { "column": 3, - "line": 102 + "line": 103 }, "file": "src/lib/Menu.js", "id": "menu.view.zoomIn", "start": { "column": 10, - "line": 99 + "line": 100 } }, { "defaultMessage": "!!!Zoom Out", "end": { "column": 3, - "line": 106 + "line": 107 }, "file": "src/lib/Menu.js", "id": "menu.view.zoomOut", "start": { "column": 11, - "line": 103 + "line": 104 } }, { "defaultMessage": "!!!Enter Full Screen", "end": { "column": 3, - "line": 110 + "line": 111 }, "file": "src/lib/Menu.js", "id": "menu.view.enterFullScreen", "start": { "column": 19, - "line": 107 + "line": 108 } }, { "defaultMessage": "!!!Exit Full Screen", "end": { "column": 3, - "line": 114 + "line": 115 }, "file": "src/lib/Menu.js", "id": "menu.view.exitFullScreen", "start": { "column": 18, - "line": 111 + "line": 112 } }, { "defaultMessage": "!!!Toggle Full Screen", "end": { "column": 3, - "line": 118 + "line": 119 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleFullScreen", "start": { "column": 20, - "line": 115 + "line": 116 } }, { "defaultMessage": "!!!Toggle Dark Mode", "end": { "column": 3, - "line": 122 + "line": 123 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleDarkMode", "start": { "column": 18, - "line": 119 + "line": 120 } }, { "defaultMessage": "!!!Toggle Developer Tools", "end": { "column": 3, - "line": 126 + "line": 127 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleDevTools", "start": { "column": 18, - "line": 123 + "line": 124 } }, { "defaultMessage": "!!!Toggle Todos Developer Tools", "end": { "column": 3, - "line": 130 + "line": 131 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleTodosDevTools", "start": { "column": 23, - "line": 127 + "line": 128 } }, { "defaultMessage": "!!!Toggle Service Developer Tools", "end": { "column": 3, - "line": 134 + "line": 135 }, "file": "src/lib/Menu.js", "id": "menu.view.toggleServiceDevTools", "start": { "column": 25, - "line": 131 + "line": 132 } }, { "defaultMessage": "!!!Reload Service", "end": { "column": 3, - "line": 138 + "line": 139 }, "file": "src/lib/Menu.js", "id": "menu.view.reloadService", "start": { "column": 17, - "line": 135 + "line": 136 } }, { "defaultMessage": "!!!Reload Ferdi", "end": { "column": 3, - "line": 142 + "line": 143 }, "file": "src/lib/Menu.js", "id": "menu.view.reloadFranz", "start": { "column": 15, - "line": 139 + "line": 140 } }, { "defaultMessage": "!!!Lock Ferdi", "end": { "column": 3, - "line": 146 + "line": 147 }, "file": "src/lib/Menu.js", "id": "menu.view.lockFerdi", "start": { "column": 13, - "line": 143 + "line": 144 } }, { "defaultMessage": "!!!Reload ToDos", "end": { "column": 3, - "line": 150 + "line": 151 }, "file": "src/lib/Menu.js", "id": "menu.view.reloadTodos", "start": { "column": 15, - "line": 147 + "line": 148 } }, { "defaultMessage": "!!!Minimize", "end": { "column": 3, - "line": 154 + "line": 155 }, "file": "src/lib/Menu.js", "id": "menu.window.minimize", "start": { "column": 12, - "line": 151 + "line": 152 } }, { "defaultMessage": "!!!Close", "end": { "column": 3, - "line": 158 + "line": 159 }, "file": "src/lib/Menu.js", "id": "menu.window.close", "start": { "column": 9, - "line": 155 + "line": 156 } }, { "defaultMessage": "!!!Learn More", "end": { "column": 3, - "line": 162 + "line": 163 }, "file": "src/lib/Menu.js", "id": "menu.help.learnMore", "start": { "column": 13, - "line": 159 + "line": 160 } }, { "defaultMessage": "!!!Changelog", "end": { "column": 3, - "line": 166 + "line": 167 }, "file": "src/lib/Menu.js", "id": "menu.help.changelog", "start": { "column": 13, - "line": 163 + "line": 164 } }, { "defaultMessage": "!!!Support", "end": { "column": 3, - "line": 170 + "line": 171 }, "file": "src/lib/Menu.js", "id": "menu.help.support", "start": { "column": 11, - "line": 167 + "line": 168 } }, { "defaultMessage": "!!!Copy Debug Information", "end": { "column": 3, - "line": 174 + "line": 175 }, "file": "src/lib/Menu.js", "id": "menu.help.debugInfo", "start": { "column": 13, - "line": 171 + "line": 172 } }, { "defaultMessage": "!!!Publish Debug Information", "end": { "column": 3, - "line": 178 + "line": 179 }, "file": "src/lib/Menu.js", "id": "menu.help.publishDebugInfo", "start": { "column": 20, - "line": 175 + "line": 176 } }, { "defaultMessage": "!!!Ferdi Debug Information", "end": { "column": 3, - "line": 182 + "line": 183 }, "file": "src/lib/Menu.js", "id": "menu.help.debugInfoCopiedHeadline", "start": { "column": 27, - "line": 179 + "line": 180 } }, { "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.", "end": { "column": 3, - "line": 186 + "line": 187 }, "file": "src/lib/Menu.js", "id": "menu.help.debugInfoCopiedBody", "start": { "column": 23, - "line": 183 + "line": 184 } }, { "defaultMessage": "!!!Unlock with Touch ID", "end": { "column": 3, - "line": 190 + "line": 191 }, "file": "src/lib/Menu.js", "id": "locked.touchId", "start": { "column": 11, - "line": 187 + "line": 188 } }, { "defaultMessage": "!!!unlock via Touch ID", "end": { "column": 3, - "line": 194 + "line": 195 }, "file": "src/lib/Menu.js", "id": "locked.touchIdPrompt", "start": { "column": 17, - "line": 191 + "line": 192 } }, { "defaultMessage": "!!!Terms of Service", "end": { "column": 3, - "line": 198 + "line": 199 }, "file": "src/lib/Menu.js", "id": "menu.help.tos", "start": { "column": 7, - "line": 195 + "line": 196 } }, { "defaultMessage": "!!!Privacy Statement", "end": { "column": 3, - "line": 202 + "line": 203 }, "file": "src/lib/Menu.js", "id": "menu.help.privacy", "start": { "column": 11, - "line": 199 + "line": 200 } }, { "defaultMessage": "!!!File", "end": { "column": 3, - "line": 206 + "line": 207 }, "file": "src/lib/Menu.js", "id": "menu.file", "start": { "column": 8, - "line": 203 + "line": 204 } }, { "defaultMessage": "!!!View", "end": { "column": 3, - "line": 210 + "line": 211 }, "file": "src/lib/Menu.js", "id": "menu.view", "start": { "column": 8, - "line": 207 + "line": 208 } }, { "defaultMessage": "!!!Services", "end": { "column": 3, - "line": 214 + "line": 215 }, "file": "src/lib/Menu.js", "id": "menu.services", "start": { "column": 12, - "line": 211 + "line": 212 } }, { "defaultMessage": "!!!Window", "end": { "column": 3, - "line": 218 + "line": 219 }, "file": "src/lib/Menu.js", "id": "menu.window", "start": { "column": 10, - "line": 215 + "line": 216 } }, { "defaultMessage": "!!!Help", "end": { "column": 3, - "line": 222 + "line": 223 }, "file": "src/lib/Menu.js", "id": "menu.help", "start": { "column": 8, - "line": 219 + "line": 220 } }, { "defaultMessage": "!!!About Ferdi", "end": { "column": 3, - "line": 226 + "line": 227 }, "file": "src/lib/Menu.js", "id": "menu.app.about", "start": { "column": 9, - "line": 223 + "line": 224 } }, { "defaultMessage": "!!!What's new?", "end": { "column": 3, - "line": 230 + "line": 231 }, "file": "src/lib/Menu.js", "id": "menu.app.announcement", "start": { "column": 16, - "line": 227 + "line": 228 } }, { "defaultMessage": "!!!Settings", "end": { "column": 3, - "line": 234 + "line": 235 }, "file": "src/lib/Menu.js", "id": "menu.app.settings", "start": { "column": 12, - "line": 231 + "line": 232 } }, { "defaultMessage": "!!!Check for updates", "end": { "column": 3, - "line": 238 + "line": 239 }, "file": "src/lib/Menu.js", "id": "menu.app.checkForUpdates", "start": { "column": 19, - "line": 235 + "line": 236 } }, { "defaultMessage": "!!!Hide", "end": { "column": 3, - "line": 242 + "line": 243 }, "file": "src/lib/Menu.js", "id": "menu.app.hide", "start": { "column": 8, - "line": 239 + "line": 240 } }, { "defaultMessage": "!!!Hide Others", "end": { "column": 3, - "line": 246 + "line": 247 }, "file": "src/lib/Menu.js", "id": "menu.app.hideOthers", "start": { "column": 14, - "line": 243 + "line": 244 } }, { "defaultMessage": "!!!Unhide", "end": { "column": 3, - "line": 250 + "line": 251 }, "file": "src/lib/Menu.js", "id": "menu.app.unhide", "start": { "column": 10, - "line": 247 + "line": 248 } }, { "defaultMessage": "!!!Auto-hide menu bar", "end": { "column": 3, - "line": 254 + "line": 255 }, "file": "src/lib/Menu.js", "id": "menu.app.autohideMenuBar", "start": { "column": 19, - "line": 251 + "line": 252 } }, { "defaultMessage": "!!!Quit", "end": { "column": 3, - "line": 258 + "line": 259 }, "file": "src/lib/Menu.js", "id": "menu.app.quit", "start": { "column": 8, - "line": 255 + "line": 256 } }, { "defaultMessage": "!!!Add New Service...", "end": { "column": 3, - "line": 262 + "line": 263 }, "file": "src/lib/Menu.js", "id": "menu.services.addNewService", "start": { "column": 17, - "line": 259 + "line": 260 } }, { "defaultMessage": "!!!Add New Workspace...", "end": { "column": 3, - "line": 266 + "line": 267 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.addNewWorkspace", "start": { "column": 19, - "line": 263 + "line": 264 } }, { "defaultMessage": "!!!Open workspace drawer", "end": { "column": 3, - "line": 270 + "line": 271 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.openWorkspaceDrawer", "start": { "column": 23, - "line": 267 + "line": 268 } }, { "defaultMessage": "!!!Close workspace drawer", "end": { "column": 3, - "line": 274 + "line": 275 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.closeWorkspaceDrawer", "start": { "column": 24, - "line": 271 + "line": 272 } }, { "defaultMessage": "!!!Activate next service...", "end": { "column": 3, - "line": 278 + "line": 279 }, "file": "src/lib/Menu.js", "id": "menu.services.setNextServiceActive", "start": { "column": 23, - "line": 275 + "line": 276 } }, { "defaultMessage": "!!!Activate previous service...", "end": { "column": 3, - "line": 282 + "line": 283 }, "file": "src/lib/Menu.js", "id": "menu.services.activatePreviousService", "start": { "column": 27, - "line": 279 + "line": 280 } }, { "defaultMessage": "!!!Disable notifications & audio", "end": { "column": 3, - "line": 286 + "line": 287 }, "file": "src/lib/Menu.js", "id": "sidebar.muteApp", "start": { "column": 11, - "line": 283 + "line": 284 } }, { "defaultMessage": "!!!Enable notifications & audio", "end": { "column": 3, - "line": 290 + "line": 291 }, "file": "src/lib/Menu.js", "id": "sidebar.unmuteApp", "start": { "column": 13, - "line": 287 + "line": 288 } }, { "defaultMessage": "!!!Workspaces", "end": { "column": 3, - "line": 294 + "line": 295 }, "file": "src/lib/Menu.js", "id": "menu.workspaces", "start": { "column": 14, - "line": 291 + "line": 292 } }, { "defaultMessage": "!!!Default", "end": { "column": 3, - "line": 298 + "line": 299 }, "file": "src/lib/Menu.js", "id": "menu.workspaces.defaultWorkspace", "start": { "column": 20, - "line": 295 + "line": 296 } }, { "defaultMessage": "!!!Todos", "end": { "column": 3, - "line": 302 + "line": 303 }, "file": "src/lib/Menu.js", "id": "menu.todos", "start": { "column": 9, - "line": 299 + "line": 300 } }, { "defaultMessage": "!!!Open Todos drawer", "end": { "column": 3, - "line": 306 + "line": 307 }, "file": "src/lib/Menu.js", "id": "menu.Todoss.openTodosDrawer", "start": { "column": 19, - "line": 303 + "line": 304 } }, { "defaultMessage": "!!!Close Todos drawer", "end": { "column": 3, - "line": 310 + "line": 311 }, "file": "src/lib/Menu.js", "id": "menu.Todoss.closeTodosDrawer", "start": { "column": 20, - "line": 307 + "line": 308 } }, { "defaultMessage": "!!!Enable Todos", "end": { "column": 3, - "line": 314 + "line": 315 }, "file": "src/lib/Menu.js", "id": "menu.todos.enableTodos", "start": { "column": 15, - "line": 311 + "line": 312 } }, { "defaultMessage": "!!!Home", "end": { "column": 3, - "line": 318 + "line": 319 }, "file": "src/lib/Menu.js", "id": "menu.services.goHome", "start": { "column": 17, - "line": 315 + "line": 316 } } ], diff --git a/src/i18n/messages/src/components/auth/ChangeServer.json b/src/i18n/messages/src/components/auth/ChangeServer.json index 8cdfc6623..c8f74a3c0 100644 --- a/src/i18n/messages/src/components/auth/ChangeServer.json +++ b/src/i18n/messages/src/components/auth/ChangeServer.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Change server", "file": "src/components/auth/ChangeServer.js", "start": { - "line": 13, + "line": 14, "column": 12 }, "end": { - "line": 16, + "line": 17, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!Server", "file": "src/components/auth/ChangeServer.js", "start": { - "line": 17, + "line": 18, "column": 9 }, "end": { - "line": 20, + "line": 21, "column": 3 } }, @@ -30,11 +30,11 @@ "defaultMessage": "!!!Extra settings offered by Ferdi will not be saved", "file": "src/components/auth/ChangeServer.js", "start": { - "line": 21, + "line": 22, "column": 11 }, "end": { - "line": 24, + "line": 25, "column": 3 } }, @@ -43,11 +43,11 @@ "defaultMessage": "!!!Custom server", "file": "src/components/auth/ChangeServer.js", "start": { - "line": 25, + "line": 26, "column": 21 }, "end": { - "line": 28, + "line": 29, "column": 3 } }, @@ -56,11 +56,11 @@ "defaultMessage": "!!!Enter a valid URL", "file": "src/components/auth/ChangeServer.js", "start": { - "line": 29, + "line": 30, "column": 12 }, "end": { - "line": 32, + "line": 33, "column": 3 } }, @@ -69,11 +69,11 @@ "defaultMessage": "!!!Submit", "file": "src/components/auth/ChangeServer.js", "start": { - "line": 33, + "line": 34, "column": 10 }, "end": { - "line": 36, + "line": 37, "column": 3 } } diff --git a/src/i18n/messages/src/components/auth/Login.json b/src/i18n/messages/src/components/auth/Login.json index c3b4ee4eb..275b04478 100644 --- a/src/i18n/messages/src/components/auth/Login.json +++ b/src/i18n/messages/src/components/auth/Login.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Sign in", "file": "src/components/auth/Login.js", "start": { - "line": 19, + "line": 20, "column": 12 }, "end": { - "line": 22, + "line": 23, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!Email address", "file": "src/components/auth/Login.js", "start": { - "line": 23, + "line": 24, "column": 14 }, "end": { - "line": 26, + "line": 27, "column": 3 } }, @@ -30,11 +30,11 @@ "defaultMessage": "!!!Password", "file": "src/components/auth/Login.js", "start": { - "line": 27, + "line": 28, "column": 17 }, "end": { - "line": 30, + "line": 31, "column": 3 } }, @@ -43,11 +43,11 @@ "defaultMessage": "!!!Sign in", "file": "src/components/auth/Login.js", "start": { - "line": 31, + "line": 32, "column": 21 }, "end": { - "line": 34, + "line": 35, "column": 3 } }, @@ -56,11 +56,11 @@ "defaultMessage": "!!!Email or password not valid", "file": "src/components/auth/Login.js", "start": { - "line": 35, + "line": 36, "column": 22 }, "end": { - "line": 38, + "line": 39, "column": 3 } }, @@ -69,11 +69,11 @@ "defaultMessage": "!!!Using a Franz account to log in?", "file": "src/components/auth/Login.js", "start": { - "line": 39, + "line": 40, "column": 24 }, "end": { - "line": 42, + "line": 43, "column": 3 } }, @@ -82,11 +82,11 @@ "defaultMessage": "!!!Try importing your Franz account into Ferdi", "file": "src/components/auth/Login.js", "start": { - "line": 43, + "line": 44, "column": 26 }, "end": { - "line": 46, + "line": 47, "column": 3 } }, @@ -95,11 +95,11 @@ "defaultMessage": "!!!Your session expired, please login again.", "file": "src/components/auth/Login.js", "start": { - "line": 47, + "line": 48, "column": 16 }, "end": { - "line": 50, + "line": 51, "column": 3 } }, @@ -108,11 +108,11 @@ "defaultMessage": "!!!Your session expired, please login again.", "file": "src/components/auth/Login.js", "start": { - "line": 51, + "line": 52, "column": 16 }, "end": { - "line": 54, + "line": 55, "column": 3 } }, @@ -121,11 +121,11 @@ "defaultMessage": "!!!Create a free account", "file": "src/components/auth/Login.js", "start": { - "line": 55, + "line": 56, "column": 14 }, "end": { - "line": 58, + "line": 59, "column": 3 } }, @@ -134,11 +134,11 @@ "defaultMessage": "!!!Change server", "file": "src/components/auth/Login.js", "start": { - "line": 59, + "line": 60, "column": 16 }, "end": { - "line": 62, + "line": 63, "column": 3 } }, @@ -147,11 +147,11 @@ "defaultMessage": "!!!Use Ferdi without an Account", "file": "src/components/auth/Login.js", "start": { - "line": 63, + "line": 64, "column": 14 }, "end": { - "line": 66, + "line": 67, "column": 3 } }, @@ -160,11 +160,11 @@ "defaultMessage": "!!!Forgot password", "file": "src/components/auth/Login.js", "start": { - "line": 67, + "line": 68, "column": 16 }, "end": { - "line": 70, + "line": 71, "column": 3 } } diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json index 68c04e434..50c73d9b1 100644 --- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json +++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Settings", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 23, + "line": 24, "column": 12 }, "end": { - "line": 26, + "line": 27, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!General", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 27, + "line": 28, "column": 19 }, "end": { - "line": 30, + "line": 31, "column": 3 } }, @@ -30,11 +30,11 @@ "defaultMessage": "!!!Sending telemetry data allows us to find errors in Ferdi - we will not send any personal information like your message data! Changing this option requires you to restart Ferdi.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 31, + "line": 32, "column": 14 }, "end": { - "line": 34, + "line": 35, "column": 3 } }, @@ -43,11 +43,11 @@ "defaultMessage": "!!!By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 35, + "line": 36, "column": 17 }, "end": { - "line": 38, + "line": 39, "column": 3 } }, @@ -56,11 +56,11 @@ "defaultMessage": "!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 39, + "line": 40, "column": 22 }, "end": { - "line": 42, + "line": 43, "column": 3 } }, @@ -69,11 +69,11 @@ "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 43, + "line": 44, "column": 18 }, "end": { - "line": 46, + "line": 47, "column": 3 } }, @@ -82,11 +82,11 @@ "defaultMessage": "!!!Password", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 47, + "line": 48, "column": 18 }, "end": { - "line": 50, + "line": 51, "column": 3 } }, @@ -95,11 +95,11 @@ "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 51, + "line": 52, "column": 22 }, "end": { - "line": 54, + "line": 55, "column": 3 } }, @@ -108,11 +108,11 @@ "defaultMessage": "!!!Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 55, + "line": 56, "column": 12 }, "end": { - "line": 58, + "line": 59, "column": 3 } }, @@ -121,11 +121,11 @@ "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 59, + "line": 60, "column": 24 }, "end": { - "line": 62, + "line": 63, "column": 3 } }, @@ -134,11 +134,11 @@ "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 63, + "line": 64, "column": 20 }, "end": { - "line": 66, + "line": 67, "column": 3 } }, @@ -147,11 +147,11 @@ "defaultMessage": "!!!Language", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 67, + "line": 68, "column": 20 }, "end": { - "line": 70, + "line": 71, "column": 3 } }, @@ -160,11 +160,11 @@ "defaultMessage": "!!!Updates", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 71, + "line": 72, "column": 19 }, "end": { - "line": 74, + "line": 75, "column": 3 } }, @@ -173,11 +173,11 @@ "defaultMessage": "!!!Appearance", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 75, + "line": 76, "column": 22 }, "end": { - "line": 78, + "line": 79, "column": 3 } }, @@ -186,11 +186,11 @@ "defaultMessage": "!!!Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 79, + "line": 80, "column": 25 }, "end": { - "line": 82, + "line": 83, "column": 3 } }, @@ -199,11 +199,11 @@ "defaultMessage": "!!!Write your accent color in a CSS-compatible format. (Default: {defaultAccentColor})", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 83, + "line": 84, "column": 19 }, "end": { - "line": 86, + "line": 87, "column": 3 } }, @@ -212,11 +212,11 @@ "defaultMessage": "!!!Privacy", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 87, + "line": 88, "column": 19 }, "end": { - "line": 90, + "line": 91, "column": 3 } }, @@ -225,11 +225,11 @@ "defaultMessage": "!!!Advanced", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 91, + "line": 92, "column": 20 }, "end": { - "line": 94, + "line": 95, "column": 3 } }, @@ -238,11 +238,11 @@ "defaultMessage": "!!!Help us to translate Ferdi into your language.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 95, + "line": 96, "column": 19 }, "end": { - "line": 98, + "line": 99, "column": 3 } }, @@ -251,11 +251,11 @@ "defaultMessage": "!!!Ferdi uses your Mac's build-in spellchecker to check for typos. If you want to change the languages the spellchecker checks for, you can do so in your Mac's System Preferences.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 99, + "line": 100, "column": 28 }, "end": { - "line": 102, + "line": 103, "column": 3 } }, @@ -264,11 +264,11 @@ "defaultMessage": "!!!Cache", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 103, + "line": 104, "column": 20 }, "end": { - "line": 106, + "line": 107, "column": 3 } }, @@ -277,11 +277,11 @@ "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 107, + "line": 108, "column": 13 }, "end": { - "line": 110, + "line": 111, "column": 3 } }, @@ -290,11 +290,11 @@ "defaultMessage": "!!!Couldn't clear all cache", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 111, + "line": 112, "column": 19 }, "end": { - "line": 114, + "line": 115, "column": 3 } }, @@ -303,11 +303,11 @@ "defaultMessage": "!!!Clear cache", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 115, + "line": 116, "column": 23 }, "end": { - "line": 118, + "line": 119, "column": 3 } }, @@ -316,11 +316,11 @@ "defaultMessage": "!!!Check for updates", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 119, + "line": 120, "column": 25 }, "end": { - "line": 122, + "line": 123, "column": 3 } }, @@ -329,11 +329,11 @@ "defaultMessage": "!!!Restart & install update", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 123, + "line": 124, "column": 23 }, "end": { - "line": 126, + "line": 127, "column": 3 } }, @@ -342,11 +342,11 @@ "defaultMessage": "!!!Is searching for update", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 127, + "line": 128, "column": 25 }, "end": { - "line": 130, + "line": 131, "column": 3 } }, @@ -355,11 +355,11 @@ "defaultMessage": "!!!Update available, downloading...", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 131, + "line": 132, "column": 25 }, "end": { - "line": 134, + "line": 135, "column": 3 } }, @@ -368,11 +368,11 @@ "defaultMessage": "!!!You are using the latest version of Ferdi", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 135, + "line": 136, "column": 24 }, "end": { - "line": 138, + "line": 139, "column": 3 } }, @@ -381,11 +381,11 @@ "defaultMessage": "!!!Current version:", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 139, + "line": 140, "column": 18 }, "end": { - "line": 142, + "line": 143, "column": 3 } }, @@ -394,11 +394,11 @@ "defaultMessage": "!!!Changes require restart", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 143, + "line": 144, "column": 29 }, "end": { - "line": 146, + "line": 147, "column": 3 } }, @@ -407,11 +407,11 @@ "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", "file": "src/components/settings/settings/EditSettingsForm.js", "start": { - "line": 147, + "line": 148, "column": 22 }, "end": { - "line": 150, + "line": 151, "column": 3 } } diff --git a/src/i18n/messages/src/components/settings/team/TeamDashboard.json b/src/i18n/messages/src/components/settings/team/TeamDashboard.json index c980b5b7e..0a3b818a7 100644 --- a/src/i18n/messages/src/components/settings/team/TeamDashboard.json +++ b/src/i18n/messages/src/components/settings/team/TeamDashboard.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Team", "file": "src/components/settings/team/TeamDashboard.js", "start": { - "line": 17, + "line": 18, "column": 12 }, "end": { - "line": 20, + "line": 21, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!Franz Team Management", "file": "src/components/settings/team/TeamDashboard.js", "start": { - "line": 21, + "line": 22, "column": 19 }, "end": { - "line": 24, + "line": 25, "column": 3 } }, @@ -30,11 +30,11 @@ "defaultMessage": "!!!Your are currently using Franz Servers, which is why you have access to Team Management.", "file": "src/components/settings/team/TeamDashboard.js", "start": { - "line": 25, + "line": 26, "column": 9 }, "end": { - "line": 28, + "line": 29, "column": 3 } }, @@ -43,11 +43,11 @@ "defaultMessage": "!!!Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.", "file": "src/components/settings/team/TeamDashboard.js", "start": { - "line": 29, + "line": 30, "column": 8 }, "end": { - "line": 32, + "line": 33, "column": 3 } }, @@ -56,11 +56,11 @@ "defaultMessage": "!!!Manage your Team on meetfranz.com", "file": "src/components/settings/team/TeamDashboard.js", "start": { - "line": 33, + "line": 34, "column": 16 }, "end": { - "line": 36, + "line": 37, "column": 3 } }, @@ -69,11 +69,11 @@ "defaultMessage": "!!!Upgrade your Account", "file": "src/components/settings/team/TeamDashboard.js", "start": { - "line": 37, + "line": 38, "column": 17 }, "end": { - "line": 40, + "line": 41, "column": 3 } }, @@ -82,11 +82,11 @@ "defaultMessage": "!!!Teams are unavailable", "file": "src/components/settings/team/TeamDashboard.js", "start": { - "line": 41, + "line": 42, "column": 20 }, "end": { - "line": 44, + "line": 45, "column": 3 } }, @@ -95,11 +95,11 @@ "defaultMessage": "!!!Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.", "file": "src/components/settings/team/TeamDashboard.js", "start": { - "line": 45, + "line": 46, "column": 24 }, "end": { - "line": 48, + "line": 49, "column": 3 } } diff --git a/src/i18n/messages/src/lib/Menu.json b/src/i18n/messages/src/lib/Menu.json index 22929e947..d5a8d5923 100644 --- a/src/i18n/messages/src/lib/Menu.json +++ b/src/i18n/messages/src/lib/Menu.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Edit", "file": "src/lib/Menu.js", "start": { - "line": 23, + "line": 24, "column": 8 }, "end": { - "line": 26, + "line": 27, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!Undo", "file": "src/lib/Menu.js", "start": { - "line": 27, + "line": 28, "column": 8 }, "end": { - "line": 30, + "line": 31, "column": 3 } }, @@ -30,11 +30,11 @@ "defaultMessage": "!!!Redo", "file": "src/lib/Menu.js", "start": { - "line": 31, + "line": 32, "column": 8 }, "end": { - "line": 34, + "line": 35, "column": 3 } }, @@ -43,11 +43,11 @@ "defaultMessage": "!!!Cut", "file": "src/lib/Menu.js", "start": { - "line": 35, + "line": 36, "column": 7 }, "end": { - "line": 38, + "line": 39, "column": 3 } }, @@ -56,11 +56,11 @@ "defaultMessage": "!!!Copy", "file": "src/lib/Menu.js", "start": { - "line": 39, + "line": 40, "column": 8 }, "end": { - "line": 42, + "line": 43, "column": 3 } }, @@ -69,11 +69,11 @@ "defaultMessage": "!!!Paste", "file": "src/lib/Menu.js", "start": { - "line": 43, + "line": 44, "column": 9 }, "end": { - "line": 46, + "line": 47, "column": 3 } }, @@ -82,11 +82,11 @@ "defaultMessage": "!!!Paste And Match Style", "file": "src/lib/Menu.js", "start": { - "line": 47, + "line": 48, "column": 22 }, "end": { - "line": 50, + "line": 51, "column": 3 } }, @@ -95,11 +95,11 @@ "defaultMessage": "!!!Delete", "file": "src/lib/Menu.js", "start": { - "line": 51, + "line": 52, "column": 10 }, "end": { - "line": 54, + "line": 55, "column": 3 } }, @@ -108,11 +108,11 @@ "defaultMessage": "!!!Select All", "file": "src/lib/Menu.js", "start": { - "line": 55, + "line": 56, "column": 13 }, "end": { - "line": 58, + "line": 59, "column": 3 } }, @@ -121,11 +121,11 @@ "defaultMessage": "!!!Find in Page", "file": "src/lib/Menu.js", "start": { - "line": 59, + "line": 60, "column": 14 }, "end": { - "line": 62, + "line": 63, "column": 3 } }, @@ -134,11 +134,11 @@ "defaultMessage": "!!!Speech", "file": "src/lib/Menu.js", "start": { - "line": 63, + "line": 64, "column": 10 }, "end": { - "line": 66, + "line": 67, "column": 3 } }, @@ -147,11 +147,11 @@ "defaultMessage": "!!!Start Speaking", "file": "src/lib/Menu.js", "start": { - "line": 67, + "line": 68, "column": 17 }, "end": { - "line": 70, + "line": 71, "column": 3 } }, @@ -160,11 +160,11 @@ "defaultMessage": "!!!Stop Speaking", "file": "src/lib/Menu.js", "start": { - "line": 71, + "line": 72, "column": 16 }, "end": { - "line": 74, + "line": 75, "column": 3 } }, @@ -173,11 +173,11 @@ "defaultMessage": "!!!Start Dictation", "file": "src/lib/Menu.js", "start": { - "line": 75, + "line": 76, "column": 18 }, "end": { - "line": 78, + "line": 79, "column": 3 } }, @@ -186,11 +186,11 @@ "defaultMessage": "!!!Emoji & Symbols", "file": "src/lib/Menu.js", "start": { - "line": 79, + "line": 80, "column": 16 }, "end": { - "line": 82, + "line": 83, "column": 3 } }, @@ -199,11 +199,11 @@ "defaultMessage": "!!!Open Quick Switch", "file": "src/lib/Menu.js", "start": { - "line": 83, + "line": 84, "column": 19 }, "end": { - "line": 86, + "line": 87, "column": 3 } }, @@ -212,11 +212,11 @@ "defaultMessage": "!!!Back", "file": "src/lib/Menu.js", "start": { - "line": 87, + "line": 88, "column": 8 }, "end": { - "line": 90, + "line": 91, "column": 3 } }, @@ -225,11 +225,11 @@ "defaultMessage": "!!!Forward", "file": "src/lib/Menu.js", "start": { - "line": 91, + "line": 92, "column": 11 }, "end": { - "line": 94, + "line": 95, "column": 3 } }, @@ -238,11 +238,11 @@ "defaultMessage": "!!!Actual Size", "file": "src/lib/Menu.js", "start": { - "line": 95, + "line": 96, "column": 13 }, "end": { - "line": 98, + "line": 99, "column": 3 } }, @@ -251,11 +251,11 @@ "defaultMessage": "!!!Zoom In", "file": "src/lib/Menu.js", "start": { - "line": 99, + "line": 100, "column": 10 }, "end": { - "line": 102, + "line": 103, "column": 3 } }, @@ -264,11 +264,11 @@ "defaultMessage": "!!!Zoom Out", "file": "src/lib/Menu.js", "start": { - "line": 103, + "line": 104, "column": 11 }, "end": { - "line": 106, + "line": 107, "column": 3 } }, @@ -277,11 +277,11 @@ "defaultMessage": "!!!Enter Full Screen", "file": "src/lib/Menu.js", "start": { - "line": 107, + "line": 108, "column": 19 }, "end": { - "line": 110, + "line": 111, "column": 3 } }, @@ -290,11 +290,11 @@ "defaultMessage": "!!!Exit Full Screen", "file": "src/lib/Menu.js", "start": { - "line": 111, + "line": 112, "column": 18 }, "end": { - "line": 114, + "line": 115, "column": 3 } }, @@ -303,11 +303,11 @@ "defaultMessage": "!!!Toggle Full Screen", "file": "src/lib/Menu.js", "start": { - "line": 115, + "line": 116, "column": 20 }, "end": { - "line": 118, + "line": 119, "column": 3 } }, @@ -316,11 +316,11 @@ "defaultMessage": "!!!Toggle Dark Mode", "file": "src/lib/Menu.js", "start": { - "line": 119, + "line": 120, "column": 18 }, "end": { - "line": 122, + "line": 123, "column": 3 } }, @@ -329,11 +329,11 @@ "defaultMessage": "!!!Toggle Developer Tools", "file": "src/lib/Menu.js", "start": { - "line": 123, + "line": 124, "column": 18 }, "end": { - "line": 126, + "line": 127, "column": 3 } }, @@ -342,11 +342,11 @@ "defaultMessage": "!!!Toggle Todos Developer Tools", "file": "src/lib/Menu.js", "start": { - "line": 127, + "line": 128, "column": 23 }, "end": { - "line": 130, + "line": 131, "column": 3 } }, @@ -355,11 +355,11 @@ "defaultMessage": "!!!Toggle Service Developer Tools", "file": "src/lib/Menu.js", "start": { - "line": 131, + "line": 132, "column": 25 }, "end": { - "line": 134, + "line": 135, "column": 3 } }, @@ -368,11 +368,11 @@ "defaultMessage": "!!!Reload Service", "file": "src/lib/Menu.js", "start": { - "line": 135, + "line": 136, "column": 17 }, "end": { - "line": 138, + "line": 139, "column": 3 } }, @@ -381,11 +381,11 @@ "defaultMessage": "!!!Reload Ferdi", "file": "src/lib/Menu.js", "start": { - "line": 139, + "line": 140, "column": 15 }, "end": { - "line": 142, + "line": 143, "column": 3 } }, @@ -394,11 +394,11 @@ "defaultMessage": "!!!Lock Ferdi", "file": "src/lib/Menu.js", "start": { - "line": 143, + "line": 144, "column": 13 }, "end": { - "line": 146, + "line": 147, "column": 3 } }, @@ -407,11 +407,11 @@ "defaultMessage": "!!!Reload ToDos", "file": "src/lib/Menu.js", "start": { - "line": 147, + "line": 148, "column": 15 }, "end": { - "line": 150, + "line": 151, "column": 3 } }, @@ -420,11 +420,11 @@ "defaultMessage": "!!!Minimize", "file": "src/lib/Menu.js", "start": { - "line": 151, + "line": 152, "column": 12 }, "end": { - "line": 154, + "line": 155, "column": 3 } }, @@ -433,11 +433,11 @@ "defaultMessage": "!!!Close", "file": "src/lib/Menu.js", "start": { - "line": 155, + "line": 156, "column": 9 }, "end": { - "line": 158, + "line": 159, "column": 3 } }, @@ -446,11 +446,11 @@ "defaultMessage": "!!!Learn More", "file": "src/lib/Menu.js", "start": { - "line": 159, + "line": 160, "column": 13 }, "end": { - "line": 162, + "line": 163, "column": 3 } }, @@ -459,11 +459,11 @@ "defaultMessage": "!!!Changelog", "file": "src/lib/Menu.js", "start": { - "line": 163, + "line": 164, "column": 13 }, "end": { - "line": 166, + "line": 167, "column": 3 } }, @@ -472,11 +472,11 @@ "defaultMessage": "!!!Support", "file": "src/lib/Menu.js", "start": { - "line": 167, + "line": 168, "column": 11 }, "end": { - "line": 170, + "line": 171, "column": 3 } }, @@ -485,11 +485,11 @@ "defaultMessage": "!!!Copy Debug Information", "file": "src/lib/Menu.js", "start": { - "line": 171, + "line": 172, "column": 13 }, "end": { - "line": 174, + "line": 175, "column": 3 } }, @@ -498,11 +498,11 @@ "defaultMessage": "!!!Publish Debug Information", "file": "src/lib/Menu.js", "start": { - "line": 175, + "line": 176, "column": 20 }, "end": { - "line": 178, + "line": 179, "column": 3 } }, @@ -511,11 +511,11 @@ "defaultMessage": "!!!Ferdi Debug Information", "file": "src/lib/Menu.js", "start": { - "line": 179, + "line": 180, "column": 27 }, "end": { - "line": 182, + "line": 183, "column": 3 } }, @@ -524,11 +524,11 @@ "defaultMessage": "!!!Your Debug Information has been copied to your clipboard.", "file": "src/lib/Menu.js", "start": { - "line": 183, + "line": 184, "column": 23 }, "end": { - "line": 186, + "line": 187, "column": 3 } }, @@ -537,11 +537,11 @@ "defaultMessage": "!!!Unlock with Touch ID", "file": "src/lib/Menu.js", "start": { - "line": 187, + "line": 188, "column": 11 }, "end": { - "line": 190, + "line": 191, "column": 3 } }, @@ -550,11 +550,11 @@ "defaultMessage": "!!!unlock via Touch ID", "file": "src/lib/Menu.js", "start": { - "line": 191, + "line": 192, "column": 17 }, "end": { - "line": 194, + "line": 195, "column": 3 } }, @@ -563,11 +563,11 @@ "defaultMessage": "!!!Terms of Service", "file": "src/lib/Menu.js", "start": { - "line": 195, + "line": 196, "column": 7 }, "end": { - "line": 198, + "line": 199, "column": 3 } }, @@ -576,11 +576,11 @@ "defaultMessage": "!!!Privacy Statement", "file": "src/lib/Menu.js", "start": { - "line": 199, + "line": 200, "column": 11 }, "end": { - "line": 202, + "line": 203, "column": 3 } }, @@ -589,11 +589,11 @@ "defaultMessage": "!!!File", "file": "src/lib/Menu.js", "start": { - "line": 203, + "line": 204, "column": 8 }, "end": { - "line": 206, + "line": 207, "column": 3 } }, @@ -602,11 +602,11 @@ "defaultMessage": "!!!View", "file": "src/lib/Menu.js", "start": { - "line": 207, + "line": 208, "column": 8 }, "end": { - "line": 210, + "line": 211, "column": 3 } }, @@ -615,11 +615,11 @@ "defaultMessage": "!!!Services", "file": "src/lib/Menu.js", "start": { - "line": 211, + "line": 212, "column": 12 }, "end": { - "line": 214, + "line": 215, "column": 3 } }, @@ -628,11 +628,11 @@ "defaultMessage": "!!!Window", "file": "src/lib/Menu.js", "start": { - "line": 215, + "line": 216, "column": 10 }, "end": { - "line": 218, + "line": 219, "column": 3 } }, @@ -641,11 +641,11 @@ "defaultMessage": "!!!Help", "file": "src/lib/Menu.js", "start": { - "line": 219, + "line": 220, "column": 8 }, "end": { - "line": 222, + "line": 223, "column": 3 } }, @@ -654,11 +654,11 @@ "defaultMessage": "!!!About Ferdi", "file": "src/lib/Menu.js", "start": { - "line": 223, + "line": 224, "column": 9 }, "end": { - "line": 226, + "line": 227, "column": 3 } }, @@ -667,11 +667,11 @@ "defaultMessage": "!!!What's new?", "file": "src/lib/Menu.js", "start": { - "line": 227, + "line": 228, "column": 16 }, "end": { - "line": 230, + "line": 231, "column": 3 } }, @@ -680,11 +680,11 @@ "defaultMessage": "!!!Settings", "file": "src/lib/Menu.js", "start": { - "line": 231, + "line": 232, "column": 12 }, "end": { - "line": 234, + "line": 235, "column": 3 } }, @@ -693,11 +693,11 @@ "defaultMessage": "!!!Check for updates", "file": "src/lib/Menu.js", "start": { - "line": 235, + "line": 236, "column": 19 }, "end": { - "line": 238, + "line": 239, "column": 3 } }, @@ -706,11 +706,11 @@ "defaultMessage": "!!!Hide", "file": "src/lib/Menu.js", "start": { - "line": 239, + "line": 240, "column": 8 }, "end": { - "line": 242, + "line": 243, "column": 3 } }, @@ -719,11 +719,11 @@ "defaultMessage": "!!!Hide Others", "file": "src/lib/Menu.js", "start": { - "line": 243, + "line": 244, "column": 14 }, "end": { - "line": 246, + "line": 247, "column": 3 } }, @@ -732,11 +732,11 @@ "defaultMessage": "!!!Unhide", "file": "src/lib/Menu.js", "start": { - "line": 247, + "line": 248, "column": 10 }, "end": { - "line": 250, + "line": 251, "column": 3 } }, @@ -745,11 +745,11 @@ "defaultMessage": "!!!Auto-hide menu bar", "file": "src/lib/Menu.js", "start": { - "line": 251, + "line": 252, "column": 19 }, "end": { - "line": 254, + "line": 255, "column": 3 } }, @@ -758,11 +758,11 @@ "defaultMessage": "!!!Quit", "file": "src/lib/Menu.js", "start": { - "line": 255, + "line": 256, "column": 8 }, "end": { - "line": 258, + "line": 259, "column": 3 } }, @@ -771,11 +771,11 @@ "defaultMessage": "!!!Add New Service...", "file": "src/lib/Menu.js", "start": { - "line": 259, + "line": 260, "column": 17 }, "end": { - "line": 262, + "line": 263, "column": 3 } }, @@ -784,11 +784,11 @@ "defaultMessage": "!!!Add New Workspace...", "file": "src/lib/Menu.js", "start": { - "line": 263, + "line": 264, "column": 19 }, "end": { - "line": 266, + "line": 267, "column": 3 } }, @@ -797,11 +797,11 @@ "defaultMessage": "!!!Open workspace drawer", "file": "src/lib/Menu.js", "start": { - "line": 267, + "line": 268, "column": 23 }, "end": { - "line": 270, + "line": 271, "column": 3 } }, @@ -810,11 +810,11 @@ "defaultMessage": "!!!Close workspace drawer", "file": "src/lib/Menu.js", "start": { - "line": 271, + "line": 272, "column": 24 }, "end": { - "line": 274, + "line": 275, "column": 3 } }, @@ -823,11 +823,11 @@ "defaultMessage": "!!!Activate next service...", "file": "src/lib/Menu.js", "start": { - "line": 275, + "line": 276, "column": 23 }, "end": { - "line": 278, + "line": 279, "column": 3 } }, @@ -836,11 +836,11 @@ "defaultMessage": "!!!Activate previous service...", "file": "src/lib/Menu.js", "start": { - "line": 279, + "line": 280, "column": 27 }, "end": { - "line": 282, + "line": 283, "column": 3 } }, @@ -849,11 +849,11 @@ "defaultMessage": "!!!Disable notifications & audio", "file": "src/lib/Menu.js", "start": { - "line": 283, + "line": 284, "column": 11 }, "end": { - "line": 286, + "line": 287, "column": 3 } }, @@ -862,11 +862,11 @@ "defaultMessage": "!!!Enable notifications & audio", "file": "src/lib/Menu.js", "start": { - "line": 287, + "line": 288, "column": 13 }, "end": { - "line": 290, + "line": 291, "column": 3 } }, @@ -875,11 +875,11 @@ "defaultMessage": "!!!Workspaces", "file": "src/lib/Menu.js", "start": { - "line": 291, + "line": 292, "column": 14 }, "end": { - "line": 294, + "line": 295, "column": 3 } }, @@ -888,11 +888,11 @@ "defaultMessage": "!!!Default", "file": "src/lib/Menu.js", "start": { - "line": 295, + "line": 296, "column": 20 }, "end": { - "line": 298, + "line": 299, "column": 3 } }, @@ -901,11 +901,11 @@ "defaultMessage": "!!!Todos", "file": "src/lib/Menu.js", "start": { - "line": 299, + "line": 300, "column": 9 }, "end": { - "line": 302, + "line": 303, "column": 3 } }, @@ -914,11 +914,11 @@ "defaultMessage": "!!!Open Todos drawer", "file": "src/lib/Menu.js", "start": { - "line": 303, + "line": 304, "column": 19 }, "end": { - "line": 306, + "line": 307, "column": 3 } }, @@ -927,11 +927,11 @@ "defaultMessage": "!!!Close Todos drawer", "file": "src/lib/Menu.js", "start": { - "line": 307, + "line": 308, "column": 20 }, "end": { - "line": 310, + "line": 311, "column": 3 } }, @@ -940,11 +940,11 @@ "defaultMessage": "!!!Enable Todos", "file": "src/lib/Menu.js", "start": { - "line": 311, + "line": 312, "column": 15 }, "end": { - "line": 314, + "line": 315, "column": 3 } }, @@ -953,11 +953,11 @@ "defaultMessage": "!!!Home", "file": "src/lib/Menu.js", "start": { - "line": 315, + "line": 316, "column": 17 }, "end": { - "line": 318, + "line": 319, "column": 3 } } diff --git a/src/lib/Menu.js b/src/lib/Menu.js index 92013a5dc..6e3f120ba 100644 --- a/src/lib/Menu.js +++ b/src/lib/Menu.js @@ -4,8 +4,9 @@ import { } from '@electron/remote'; import { autorun, observable } from 'mobx'; import { defineMessages } from 'react-intl'; +import { GITHUB_FERDI_URL, LIVE_API_FERDI_WEBSITE } from '../config'; import { - cmdKey, ctrlKey, isLinux, isMac, + cmdKey, ctrlKey, isLinux, isMac, termsBase, } from '../environment'; import { announcementsStore } from '../features/announcements'; import { announcementActions } from '../features/announcements/actions'; @@ -322,10 +323,6 @@ function getActiveWebview() { return window.ferdi.stores.services.active.webview; } -function termsBase() { - return window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com'; -} - const _templateFactory = (intl, locked) => [ { label: intl.formatMessage(menuItems.edit), @@ -521,7 +518,7 @@ const _templateFactory = (intl, locked) => [ submenu: [ { label: intl.formatMessage(menuItems.learnMore), - click() { shell.openExternal('https://getferdi.com'); }, + click() { shell.openExternal(LIVE_API_FERDI_WEBSITE); }, }, { label: intl.formatMessage(menuItems.announcement), @@ -535,7 +532,7 @@ const _templateFactory = (intl, locked) => [ }, { label: intl.formatMessage(menuItems.support), - click() { shell.openExternal('https://getferdi.com/contact'); }, + click() { shell.openExternal(`${LIVE_API_FERDI_WEBSITE}/contact`); }, }, { type: 'separator', @@ -787,18 +784,18 @@ const _titleBarTemplateFactory = (intl, locked) => [ submenu: [ { label: intl.formatMessage(menuItems.learnMore), - click() { shell.openExternal('https://getferdi.com'); }, + click() { shell.openExternal(LIVE_API_FERDI_WEBSITE); }, }, { label: intl.formatMessage(menuItems.changelog), - click() { shell.openExternal('https://github.com/getferdi/ferdi/blob/master/CHANGELOG.md'); }, + click() { shell.openExternal(`${GITHUB_FERDI_URL}/ferdi/blob/master/CHANGELOG.md`); }, }, { type: 'separator', }, { label: intl.formatMessage(menuItems.support), - click() { shell.openExternal('https://getferdi.com/contact'); }, + click() { shell.openExternal(`${LIVE_API_FERDI_WEBSITE}/contact`); }, }, { type: 'separator', -- cgit v1.2.3-54-g00ecf