From 1fcfccd9fb8d52a599aea1145deff7c3aaecaa97 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Mon, 17 May 2021 17:08:05 +0530 Subject: Changed occurrences of 'Franz' to 'Ferdi' (probably missed earlier while catchup from Franz source). [skip ci] --- src/api/utils/auth.js | 10 +++++----- src/components/services/content/ConnectionLostBanner.js | 2 +- src/components/services/tabs/TabItem.js | 2 +- src/config.js | 2 +- src/electron/ipc-api/cld.js | 2 +- src/electron/ipc-api/dnd.js | 2 +- src/electron/macOSPermissions.js | 5 ++--- src/features/planSelection/api.js | 2 +- src/features/planSelection/index.js | 2 +- src/features/planSelection/store.js | 2 +- src/features/trialStatusBar/index.js | 2 +- src/features/trialStatusBar/store.js | 2 +- src/i18n/locales/defaultMessages.json | 2 +- .../src/components/services/content/ConnectionLostBanner.json | 2 +- src/index.js | 2 +- src/models/Service.js | 2 +- src/webview/lib/RecipeWebview.js | 2 +- src/webview/spellchecker.js | 2 +- 18 files changed, 23 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js index 6dbdeaa7f..4dbfcd6d4 100644 --- a/src/api/utils/auth.js +++ b/src/api/utils/auth.js @@ -8,11 +8,11 @@ export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => mode: 'cors', headers: Object.assign({ 'Content-Type': 'application/json', - 'X-Franz-Source': 'desktop', - 'X-Franz-Version': app.getVersion(), - 'X-Franz-platform': process.platform, - 'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(), - 'X-Franz-System-Locale': app.getLocale(), + 'X-Ferdi-Source': 'desktop', + 'X-Ferdi-Version': app.getVersion(), + 'X-Ferdi-platform': process.platform, + 'X-Ferdi-Timezone-Offset': new Date().getTimezoneOffset(), + 'X-Ferdi-System-Locale': app.getLocale(), }, options.headers), }); diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js index 9609a65b1..36ab2b351 100644 --- a/src/components/services/content/ConnectionLostBanner.js +++ b/src/components/services/content/ConnectionLostBanner.js @@ -14,7 +14,7 @@ import { LIVE_API_WEBSITE } from '../../../config'; const messages = defineMessages({ text: { id: 'connectionLostBanner.message', - defaultMessage: '!!!Oh no! Franz lost the connection to {name}.', + defaultMessage: '!!!Oh no! Ferdi lost the connection to {name}.', }, moreInformation: { id: 'connectionLostBanner.informationLink', diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index 75611f77c..24bbe7939 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js @@ -12,7 +12,7 @@ import { observable, autorun } from 'mobx'; import ServiceModel from '../../../models/Service'; import { ctrlKey, cmdKey } from '../../../environment'; -const IS_SERVICE_DEBUGGING_ENABLED = (localStorage.getItem('debug') || '').includes('Franz:Service'); +const IS_SERVICE_DEBUGGING_ENABLED = (localStorage.getItem('debug') || '').includes('Ferdi:Service'); const { Menu, dialog, app } = remote; diff --git a/src/config.js b/src/config.js index 9117089c5..ecd1aa316 100644 --- a/src/config.js +++ b/src/config.js @@ -212,7 +212,7 @@ export const ALLOWED_PROTOCOLS = [ 'https:', 'http:', 'ftp:', - 'franz:', + 'ferdi:', ]; export const PLANS = { diff --git a/src/electron/ipc-api/cld.js b/src/electron/ipc-api/cld.js index 23f18aa94..73e320ad9 100644 --- a/src/electron/ipc-api/cld.js +++ b/src/electron/ipc-api/cld.js @@ -1,7 +1,7 @@ import { ipcMain } from 'electron'; import cld from 'cld'; -const debug = require('debug')('Franz:ipcApi:cld'); +const debug = require('debug')('Ferdi:ipcApi:cld'); export default async () => { ipcMain.handle('detect-language', async (event, { sample }) => { diff --git a/src/electron/ipc-api/dnd.js b/src/electron/ipc-api/dnd.js index 4589aa222..da4d7781e 100644 --- a/src/electron/ipc-api/dnd.js +++ b/src/electron/ipc-api/dnd.js @@ -1,7 +1,7 @@ import { ipcMain } from 'electron'; import { getDoNotDisturb } from '@meetfranz/electron-notification-state'; -const debug = require('debug')('Franz:ipcApi:dnd'); +const debug = require('debug')('Ferdi:ipcApi:dnd'); export default async () => { ipcMain.handle('get-dnd', async () => { diff --git a/src/electron/macOSPermissions.js b/src/electron/macOSPermissions.js index 682a46a41..940b16c6e 100644 --- a/src/electron/macOSPermissions.js +++ b/src/electron/macOSPermissions.js @@ -10,7 +10,7 @@ if (isMac) { askForScreenCaptureAccess = require('node-mac-permissions').askForScreenCaptureAccess; } -const debug = require('debug')('Franz:macOSPermissions'); +const debug = require('debug')('Ferdi:macOSPermissions'); const permissionExists = macosVersion.isGreaterThanOrEqualTo('10.15'); const filePath = path.join(app.getPath('userData'), '.has-app-requested-screen-capture-permissions'); @@ -49,7 +49,6 @@ function createStatusFile() { } } - export default async function (mainWindow) { debug('Checking camera & microphone permissions'); systemPreferences.askForMediaAccess('camera'); @@ -61,7 +60,7 @@ export default async function (mainWindow) { const { response } = await dialog.showMessageBox(mainWindow, { type: 'info', message: 'Enable Screen Sharing', - detail: 'To enable screen sharing for some services, Franz needs the permission to record your screen.', + detail: 'To enable screen sharing for some services, Ferdi needs the permission to record your screen.', buttons: [ 'Allow screen sharing', 'No', diff --git a/src/features/planSelection/api.js b/src/features/planSelection/api.js index 734643f10..65e6c2e82 100644 --- a/src/features/planSelection/api.js +++ b/src/features/planSelection/api.js @@ -2,7 +2,7 @@ import { sendAuthRequest } from '../../api/utils/auth'; import { API, API_VERSION } from '../../environment'; import Request from '../../stores/lib/Request'; -const debug = require('debug')('Franz:feature:planSelection:api'); +const debug = require('debug')('Ferdi:feature:planSelection:api'); export const planSelectionApi = { downgrade: async () => { diff --git a/src/features/planSelection/index.js b/src/features/planSelection/index.js index 890be8871..b96ad6d8f 100644 --- a/src/features/planSelection/index.js +++ b/src/features/planSelection/index.js @@ -1,7 +1,7 @@ import { reaction } from 'mobx'; import PlanSelectionStore from './store'; -const debug = require('debug')('Franz:feature:planSelection'); +const debug = require('debug')('Ferdi:feature:planSelection'); export const planSelectionStore = new PlanSelectionStore(); diff --git a/src/features/planSelection/store.js b/src/features/planSelection/store.js index 448e323ff..de8fc7584 100644 --- a/src/features/planSelection/store.js +++ b/src/features/planSelection/store.js @@ -9,7 +9,7 @@ import { FeatureStore } from '../utils/FeatureStore'; import { createActionBindings } from '../utils/ActionBinding'; import { downgradeUserRequest } from './api'; -const debug = require('debug')('Franz:feature:planSelection:store'); +const debug = require('debug')('Ferdi:feature:planSelection:store'); export default class PlanSelectionStore extends FeatureStore { @observable isFeatureEnabled = false; diff --git a/src/features/trialStatusBar/index.js b/src/features/trialStatusBar/index.js index ec84cdfd7..987b5c04e 100644 --- a/src/features/trialStatusBar/index.js +++ b/src/features/trialStatusBar/index.js @@ -1,7 +1,7 @@ import { reaction } from 'mobx'; import TrialStatusBarStore from './store'; -const debug = require('debug')('Franz:feature:trialStatusBar'); +const debug = require('debug')('Ferdi:feature:trialStatusBar'); export const GA_CATEGORY_TRIAL_STATUS_BAR = 'trialStatusBar'; diff --git a/src/features/trialStatusBar/store.js b/src/features/trialStatusBar/store.js index 89cf32392..858a08238 100644 --- a/src/features/trialStatusBar/store.js +++ b/src/features/trialStatusBar/store.js @@ -9,7 +9,7 @@ import { trialStatusBarActions } from './actions'; import { FeatureStore } from '../utils/FeatureStore'; import { createActionBindings } from '../utils/ActionBinding'; -const debug = require('debug')('Franz:feature:trialStatusBar:store'); +const debug = require('debug')('Ferdi:feature:trialStatusBar:store'); export default class TrialStatusBarStore extends FeatureStore { @observable isFeatureActive = false; diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index cdad061ca..b93a49b47 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -1525,7 +1525,7 @@ { "descriptors": [ { - "defaultMessage": "!!!Oh no! Franz lost the connection to {name}.", + "defaultMessage": "!!!Oh no! Ferdi lost the connection to {name}.", "end": { "column": 3, "line": 18 diff --git a/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json b/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json index fd7019f41..bcfb6ab94 100644 --- a/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json +++ b/src/i18n/messages/src/components/services/content/ConnectionLostBanner.json @@ -1,7 +1,7 @@ [ { "id": "connectionLostBanner.message", - "defaultMessage": "!!!Oh no! Franz lost the connection to {name}.", + "defaultMessage": "!!!Oh no! Ferdi lost the connection to {name}.", "file": "src/components/services/content/ConnectionLostBanner.js", "start": { "line": 15, diff --git a/src/index.js b/src/index.js index 840591ed5..396d2e649 100644 --- a/src/index.js +++ b/src/index.js @@ -360,7 +360,7 @@ const createWindow = () => { // https://electronjs.org/docs/api/chrome-command-line-switches // used for Kerberos support // Usage e.g. MACOS -// $ Franz.app/Contents/MacOS/Ferdi --auth-server-whitelist *.mydomain.com --auth-negotiate-delegate-whitelist *.mydomain.com +// $ Ferdi.app/Contents/MacOS/Ferdi --auth-server-whitelist *.mydomain.com --auth-negotiate-delegate-whitelist *.mydomain.com const argv = require('minimist')(process.argv.slice(1)); if (argv['auth-server-whitelist']) { diff --git a/src/models/Service.js b/src/models/Service.js index ef1276619..a980ca4a3 100644 --- a/src/models/Service.js +++ b/src/models/Service.js @@ -6,7 +6,7 @@ import path from 'path'; import userAgent from '../helpers/userAgent-helpers'; import { TODOS_RECIPE_ID, todosStore } from '../features/todos'; -const debug = require('debug')('Franz:Service'); +const debug = require('debug')('Ferdi:Service'); export const RESTRICTION_TYPES = { SERVICE_LIMIT: 0, diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js index add5fffa6..a9a3a1f51 100644 --- a/src/webview/lib/RecipeWebview.js +++ b/src/webview/lib/RecipeWebview.js @@ -1,7 +1,7 @@ const { ipcRenderer } = require('electron'); const fs = require('fs-extra'); -const debug = require('debug')('Franz:Plugin:RecipeWebview'); +const debug = require('debug')('Ferdi:Plugin:RecipeWebview'); class RecipeWebview { constructor() { diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js index e7ef102e9..d7c917326 100644 --- a/src/webview/spellchecker.js +++ b/src/webview/spellchecker.js @@ -4,7 +4,7 @@ import { import { SPELLCHECKER_LOCALES } from '../i18n/languages'; import { isMac } from '../environment'; -const debug = require('debug')('Franz:spellchecker'); +const debug = require('debug')('Ferdi:spellchecker'); const webContents = remote.getCurrentWebContents(); const [defaultLocale] = webContents.session.getSpellCheckerLanguages(); -- cgit v1.2.3-70-g09d2