diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/@types/mobx-form.types.ts | 2 | ||||
-rw-r--r-- | src/components/settings/releaseNotes/ReleaseNotesDashboard.tsx | 4 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.tsx | 4 | ||||
-rw-r--r-- | src/features/publishDebugInfo/Component.tsx | 2 | ||||
-rw-r--r-- | src/features/quickSwitch/Component.tsx | 2 | ||||
-rw-r--r-- | src/helpers/translation-helpers.ts | 2 | ||||
-rw-r--r-- | src/helpers/update-helpers.ts | 4 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 10 | ||||
-rw-r--r-- | src/internal-server/resources/views/transfer.edge | 2 | ||||
-rw-r--r-- | src/internal-server/start/routes.js | 2 | ||||
-rw-r--r-- | src/webview/contextMenuBuilder.ts | 2 |
11 files changed, 18 insertions, 18 deletions
diff --git a/src/@types/mobx-form.types.ts b/src/@types/mobx-form.types.ts index 67b0aa3ec..c9d226674 100644 --- a/src/@types/mobx-form.types.ts +++ b/src/@types/mobx-form.types.ts | |||
@@ -16,7 +16,7 @@ interface Listeners { | |||
16 | 16 | ||
17 | export interface Field extends Listeners { | 17 | export interface Field extends Listeners { |
18 | id?: string; | 18 | id?: string; |
19 | type?: string; // todo specifiy probably | 19 | type?: string; // todo specify probably |
20 | name?: string; | 20 | name?: string; |
21 | value?: any; | 21 | value?: any; |
22 | label?: string; | 22 | label?: string; |
diff --git a/src/components/settings/releaseNotes/ReleaseNotesDashboard.tsx b/src/components/settings/releaseNotes/ReleaseNotesDashboard.tsx index 1afc17491..e874b4469 100644 --- a/src/components/settings/releaseNotes/ReleaseNotesDashboard.tsx +++ b/src/components/settings/releaseNotes/ReleaseNotesDashboard.tsx | |||
@@ -16,12 +16,12 @@ const messages = defineMessages({ | |||
16 | connectionError: { | 16 | connectionError: { |
17 | id: 'settings.releasenotes.connectionError', | 17 | id: 'settings.releasenotes.connectionError', |
18 | defaultMessage: | 18 | defaultMessage: |
19 | 'An error occured when connecting to Github, please try again later.', | 19 | 'An error occurred when connecting to Github, please try again later.', |
20 | }, | 20 | }, |
21 | connectionErrorPageMissing: { | 21 | connectionErrorPageMissing: { |
22 | id: 'settings.releasenotes.connectionErrorPageMissing', | 22 | id: 'settings.releasenotes.connectionErrorPageMissing', |
23 | defaultMessage: | 23 | defaultMessage: |
24 | 'An error occured when connecting to Github, the page you are looking for is missing.', | 24 | 'An error occurred when connecting to Github, the page you are looking for is missing.', |
25 | }, | 25 | }, |
26 | }); | 26 | }); |
27 | 27 | ||
diff --git a/src/components/settings/settings/EditSettingsForm.tsx b/src/components/settings/settings/EditSettingsForm.tsx index 598158e20..7e6a89f99 100644 --- a/src/components/settings/settings/EditSettingsForm.tsx +++ b/src/components/settings/settings/EditSettingsForm.tsx | |||
@@ -88,7 +88,7 @@ const messages = defineMessages({ | |||
88 | lockInfo: { | 88 | lockInfo: { |
89 | id: 'settings.app.lockInfo', | 89 | id: 'settings.app.lockInfo', |
90 | defaultMessage: | 90 | defaultMessage: |
91 | 'Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdium or lock Ferdium yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.', | 91 | 'Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password every time you start Ferdium or lock Ferdium yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.', |
92 | }, | 92 | }, |
93 | scheduledDNDTimeInfo: { | 93 | scheduledDNDTimeInfo: { |
94 | id: 'settings.app.scheduledDNDTimeInfo', | 94 | id: 'settings.app.scheduledDNDTimeInfo', |
@@ -185,7 +185,7 @@ const messages = defineMessages({ | |||
185 | spellCheckerLanguageInfo: { | 185 | spellCheckerLanguageInfo: { |
186 | id: 'settings.app.spellCheckerLanguageInfo', | 186 | id: 'settings.app.spellCheckerLanguageInfo', |
187 | defaultMessage: | 187 | defaultMessage: |
188 | "Ferdium 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.", | 188 | "Ferdium uses your Mac's built-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.", |
189 | }, | 189 | }, |
190 | subheadlineCache: { | 190 | subheadlineCache: { |
191 | id: 'settings.app.subheadlineCache', | 191 | id: 'settings.app.subheadlineCache', |
diff --git a/src/features/publishDebugInfo/Component.tsx b/src/features/publishDebugInfo/Component.tsx index 8b38ba5af..c837ede4f 100644 --- a/src/features/publishDebugInfo/Component.tsx +++ b/src/features/publishDebugInfo/Component.tsx | |||
@@ -48,7 +48,7 @@ const messages = defineMessages({ | |||
48 | }, | 48 | }, |
49 | published: { | 49 | published: { |
50 | id: 'feature.publishDebugInfo.published', | 50 | id: 'feature.publishDebugInfo.published', |
51 | defaultMessage: 'Your debug log was published and is now availible at', | 51 | defaultMessage: 'Your debug log was published and is now available at', |
52 | }, | 52 | }, |
53 | }); | 53 | }); |
54 | 54 | ||
diff --git a/src/features/quickSwitch/Component.tsx b/src/features/quickSwitch/Component.tsx index a5c102386..4a48b1e6c 100644 --- a/src/features/quickSwitch/Component.tsx +++ b/src/features/quickSwitch/Component.tsx | |||
@@ -140,7 +140,7 @@ class QuickSwitchModal extends Component<IProps, IState> { | |||
140 | this.state.search && | 140 | this.state.search && |
141 | compact(invoke(this.state.search, 'match', /^[\da-z]/i)).length > 0 | 141 | compact(invoke(this.state.search, 'match', /^[\da-z]/i)).length > 0 |
142 | ) { | 142 | ) { |
143 | // Apply simple search algorythm to list of all services | 143 | // Apply simple search algorithm to list of all services |
144 | services = this.props.stores!.services.allDisplayed; | 144 | services = this.props.stores!.services.allDisplayed; |
145 | services = services.filter( | 145 | services = services.filter( |
146 | service => | 146 | service => |
diff --git a/src/helpers/translation-helpers.ts b/src/helpers/translation-helpers.ts index 2e8f6b260..105a0ccfc 100644 --- a/src/helpers/translation-helpers.ts +++ b/src/helpers/translation-helpers.ts | |||
@@ -8,7 +8,7 @@ export async function translateTo( | |||
8 | ): Promise<{ text: string; error: boolean }> { | 8 | ): Promise<{ text: string; error: boolean }> { |
9 | const errorText = | 9 | const errorText = |
10 | // TODO: Need to support i18n | 10 | // TODO: Need to support i18n |
11 | 'FERDIUM ERROR: An error occured. Please select less text to translate or try again later.'; | 11 | 'FERDIUM ERROR: An error occurred. Please select less text to translate or try again later.'; |
12 | 12 | ||
13 | if (translatorEngine === 'Google') { | 13 | if (translatorEngine === 'Google') { |
14 | const translationResult = await translateGoogle(text, { | 14 | const translationResult = await translateGoogle(text, { |
diff --git a/src/helpers/update-helpers.ts b/src/helpers/update-helpers.ts index 3e548c69b..a6a2162a7 100644 --- a/src/helpers/update-helpers.ts +++ b/src/helpers/update-helpers.ts | |||
@@ -29,12 +29,12 @@ const messages = defineMessages({ | |||
29 | connectionError: { | 29 | connectionError: { |
30 | id: 'settings.releasenotes.connectionError', | 30 | id: 'settings.releasenotes.connectionError', |
31 | defaultMessage: | 31 | defaultMessage: |
32 | 'An error occured when connecting to Github, please try again later.', | 32 | 'An error occurred when connecting to Github, please try again later.', |
33 | }, | 33 | }, |
34 | connectionErrorPageMissing: { | 34 | connectionErrorPageMissing: { |
35 | id: 'settings.releasenotes.connectionErrorPageMissing', | 35 | id: 'settings.releasenotes.connectionErrorPageMissing', |
36 | defaultMessage: | 36 | defaultMessage: |
37 | 'An error occured when connecting to Github, the page you are looking for is missing.', | 37 | 'An error occurred when connecting to Github, the page you are looking for is missing.', |
38 | }, | 38 | }, |
39 | }); | 39 | }); |
40 | 40 | ||
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 90a45e83c..1f7eff3e9 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -16,7 +16,7 @@ | |||
16 | "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdium. By publishing your debug information you accept Ferdium Debugger's privacy policy and terms of service", | 16 | "feature.publishDebugInfo.info": "Publishing your debug information helps us find issues and errors in Ferdium. By publishing your debug information you accept Ferdium Debugger's privacy policy and terms of service", |
17 | "feature.publishDebugInfo.privacy": "Privacy policy", | 17 | "feature.publishDebugInfo.privacy": "Privacy policy", |
18 | "feature.publishDebugInfo.publish": "Accept and publish", | 18 | "feature.publishDebugInfo.publish": "Accept and publish", |
19 | "feature.publishDebugInfo.published": "Your debug log was published and is now availible at", | 19 | "feature.publishDebugInfo.published": "Your debug log was published and is now available at", |
20 | "feature.publishDebugInfo.terms": "Terms of service", | 20 | "feature.publishDebugInfo.terms": "Terms of service", |
21 | "feature.publishDebugInfo.title": "Publish debug information", | 21 | "feature.publishDebugInfo.title": "Publish debug information", |
22 | "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.", | 22 | "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.", |
@@ -281,7 +281,7 @@ | |||
281 | "settings.app.hibernateInfo": "By default, Ferdium 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.", | 281 | "settings.app.hibernateInfo": "By default, Ferdium 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.", |
282 | "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdium should automatically lock. Use 0 to disable", | 282 | "settings.app.inactivityLockInfo": "Minutes of inactivity, after which Ferdium should automatically lock. Use 0 to disable", |
283 | "settings.app.infoOpenCertificatesFolder": "To install a certificate, click the button below to open the certificates folder and copy it into the folder. After that you can refresh the service (CTRL/CMD + R). To remove/uninstall, simply delete the certificate file and restart Ferdium.", | 283 | "settings.app.infoOpenCertificatesFolder": "To install a certificate, click the button below to open the certificates folder and copy it into the folder. After that you can refresh the service (CTRL/CMD + R). To remove/uninstall, simply delete the certificate file and restart Ferdium.", |
284 | "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdium or lock Ferdium yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.", | 284 | "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password every time you start Ferdium or lock Ferdium yourself using the lock symbol in the bottom left corner or the shortcut {lockShortcut}.", |
285 | "settings.app.lockedPassword": "Password", | 285 | "settings.app.lockedPassword": "Password", |
286 | "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdium.", | 286 | "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdium.", |
287 | "settings.app.overallTheme": "Overall Theme", | 287 | "settings.app.overallTheme": "Overall Theme", |
@@ -302,7 +302,7 @@ | |||
302 | "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdium - we will not send any personal information like your message data!", | 302 | "settings.app.sentryInfo": "Sending telemetry data allows us to find errors in Ferdium - we will not send any personal information like your message data!", |
303 | "settings.app.serverHelp": "Connected to server at {serverURL}", | 303 | "settings.app.serverHelp": "Connected to server at {serverURL}", |
304 | "settings.app.servicesUpdateStatusUpToDate": "Your services are up-to-date", | 304 | "settings.app.servicesUpdateStatusUpToDate": "Your services are up-to-date", |
305 | "settings.app.spellCheckerLanguageInfo": "Ferdium 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.", | 305 | "settings.app.spellCheckerLanguageInfo": "Ferdium uses your Mac's built-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.", |
306 | "settings.app.subheadlineCache": "Cache", | 306 | "settings.app.subheadlineCache": "Cache", |
307 | "settings.app.subheadlineFerdiumProfile": "Ferdium Profile", | 307 | "settings.app.subheadlineFerdiumProfile": "Ferdium Profile", |
308 | "settings.app.todoServerInfo": "This server will be used for the \"Ferdium Todo\" feature.", | 308 | "settings.app.todoServerInfo": "This server will be used for the \"Ferdium Todo\" feature.", |
@@ -334,8 +334,8 @@ | |||
334 | "settings.recipes.missingService": "Missing a service?", | 334 | "settings.recipes.missingService": "Missing a service?", |
335 | "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdium since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdium.", | 335 | "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdium since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdium.", |
336 | "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added", | 336 | "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added", |
337 | "settings.releasenotes.connectionError": "An error occured when connecting to Github, please try again later.", | 337 | "settings.releasenotes.connectionError": "An error occurred when connecting to Github, please try again later.", |
338 | "settings.releasenotes.connectionErrorPageMissing": "An error occured when connecting to Github, the page you are looking for is missing.", | 338 | "settings.releasenotes.connectionErrorPageMissing": "An error occurred when connecting to Github, the page you are looking for is missing.", |
339 | "settings.releasenotes.headline": "Release Notes", | 339 | "settings.releasenotes.headline": "Release Notes", |
340 | "settings.searchService": "Search service", | 340 | "settings.searchService": "Search service", |
341 | "settings.service.error.goBack": "Back to services", | 341 | "settings.service.error.goBack": "Back to services", |
diff --git a/src/internal-server/resources/views/transfer.edge b/src/internal-server/resources/views/transfer.edge index e793d1c30..f1d7b7332 100644 --- a/src/internal-server/resources/views/transfer.edge +++ b/src/internal-server/resources/views/transfer.edge | |||
@@ -4,7 +4,7 @@ | |||
4 | <h2>Import/Export data from another Ferdium server</h2> | 4 | <h2>Import/Export data from another Ferdium server</h2> |
5 | @if(success === true) | 5 | @if(success === true) |
6 | <div class="alert" style="background-color:#28C76F;"> | 6 | <div class="alert" style="background-color:#28C76F;"> |
7 | Sucessfully imported your account data | 7 | Successfully imported your account data |
8 | </div> | 8 | </div> |
9 | @endif | 9 | @endif |
10 | 10 | ||
diff --git a/src/internal-server/start/routes.js b/src/internal-server/start/routes.js index 2dbd0713e..b8d463945 100644 --- a/src/internal-server/start/routes.js +++ b/src/internal-server/start/routes.js | |||
@@ -64,7 +64,7 @@ Route.get('health', ({ response }) => | |||
64 | 64 | ||
65 | // API is grouped under '/v1/' route | 65 | // API is grouped under '/v1/' route |
66 | Route.group(() => { | 66 | Route.group(() => { |
67 | // User authentification | 67 | // User authentication |
68 | Route.post('auth/signup', 'UserController.signup'); | 68 | Route.post('auth/signup', 'UserController.signup'); |
69 | Route.post('auth/login', 'UserController.login'); | 69 | Route.post('auth/login', 'UserController.login'); |
70 | 70 | ||
diff --git a/src/webview/contextMenuBuilder.ts b/src/webview/contextMenuBuilder.ts index 155e533e9..dd39560da 100644 --- a/src/webview/contextMenuBuilder.ts +++ b/src/webview/contextMenuBuilder.ts | |||
@@ -2,7 +2,7 @@ | |||
2 | * Context Menu builder. | 2 | * Context Menu builder. |
3 | * | 3 | * |
4 | * Based on "electron-spellchecker"'s ContextMenuBuilder but customized for Ferdium | 4 | * Based on "electron-spellchecker"'s ContextMenuBuilder but customized for Ferdium |
5 | * and for usage with Electron's build-in spellchecker | 5 | * and for usage with Electron's built-in spellchecker |
6 | * | 6 | * |
7 | * Source: https://github.com/electron-userland/electron-spellchecker/blob/master/src/context-menu-builder.js | 7 | * Source: https://github.com/electron-userland/electron-spellchecker/blob/master/src/context-menu-builder.js |
8 | */ | 8 | */ |