diff options
author | 2020-03-31 14:09:05 +0100 | |
---|---|---|
committer | 2020-03-31 14:09:05 +0100 | |
commit | 899d2bf551e111bdc68608dba02e93782eec9f85 (patch) | |
tree | 2ead7fcc3a8f08d74af186931267e9021d21812e /src/i18n | |
parent | Retry flaky commands on AppVeyor (#526) (diff) | |
download | ferdium-app-899d2bf551e111bdc68608dba02e93782eec9f85.tar.gz ferdium-app-899d2bf551e111bdc68608dba02e93782eec9f85.tar.zst ferdium-app-899d2bf551e111bdc68608dba02e93782eec9f85.zip |
* add condition if on todo options
* add drop down for todo server
* fix error TODOS_FRONTEND
* add todo list apps'
* update name of dropdown menu to Todo Service
* add other service to dropdown menu and subsetting field for user to input url
* add Other Service to drop down
* fixed typos
* reverted wording
* fix custom field
* fix linting
* fix linting
* Delete tsconfig.tsbuildinfo
* Delete tsconfig.tsbuildinfo
* Delete tsconfig.tsbuildinfo
* Add regex to validate custom todo url
* Add note with source of regex function
* Move regex function declaration to function body root
* Apply code style
* Add migration for todo settings
* Apply code style
Co-authored-by: romain <romain@jumboprivacy.com>
Co-authored-by: Roman <46404814+yourcontact@users.noreply.github.com>
Co-authored-by: romain <rpsa@pm.me>
Diffstat (limited to 'src/i18n')
-rw-r--r-- | src/i18n/locales/defaultMessages.json | 27 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 7 | ||||
-rw-r--r-- | src/i18n/locales/whitelist_en-US.json | 3 | ||||
-rw-r--r-- | src/i18n/messages/src/containers/settings/EditSettingsScreen.json | 17 | ||||
-rw-r--r-- | src/i18n/messages/src/features/todos/components/TodosWebview.json | 12 |
5 files changed, 47 insertions, 19 deletions
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index a5c83d7ab..906172221 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -4342,7 +4342,20 @@ | |||
4342 | "line": 82 | 4342 | "line": 82 |
4343 | }, | 4343 | }, |
4344 | "file": "src/containers/settings/EditSettingsScreen.js", | 4344 | "file": "src/containers/settings/EditSettingsScreen.js", |
4345 | "id": "settings.app.form.todoServer", | 4345 | "id": "settings.app.form.predefinedTodoServer", |
4346 | "start": { | ||
4347 | "column": 14, | ||
4348 | "line": 79 | ||
4349 | } | ||
4350 | }, | ||
4351 | { | ||
4352 | "defaultMessage": "!!!Custom Todo Server", | ||
4353 | "end": { | ||
4354 | "column": 3, | ||
4355 | "line": 82 | ||
4356 | }, | ||
4357 | "file": "src/containers/settings/EditSettingsScreen.js", | ||
4358 | "id": "settings.app.form.customTodoServer", | ||
4346 | "start": { | 4359 | "start": { |
4347 | "column": 14, | 4360 | "column": 14, |
4348 | "line": 79 | 4361 | "line": 79 |
@@ -5449,39 +5462,39 @@ | |||
5449 | "defaultMessage": "!!!Franz Todos are available to premium users now!", | 5462 | "defaultMessage": "!!!Franz Todos are available to premium users now!", |
5450 | "end": { | 5463 | "end": { |
5451 | "column": 3, | 5464 | "column": 3, |
5452 | "line": 20 | 5465 | "line": 30 |
5453 | }, | 5466 | }, |
5454 | "file": "src/features/todos/components/TodosWebview.js", | 5467 | "file": "src/features/todos/components/TodosWebview.js", |
5455 | "id": "feature.todos.premium.info", | 5468 | "id": "feature.todos.premium.info", |
5456 | "start": { | 5469 | "start": { |
5457 | "column": 15, | 5470 | "column": 15, |
5458 | "line": 17 | 5471 | "line": 27 |
5459 | } | 5472 | } |
5460 | }, | 5473 | }, |
5461 | { | 5474 | { |
5462 | "defaultMessage": "!!!Upgrade Account", | 5475 | "defaultMessage": "!!!Upgrade Account", |
5463 | "end": { | 5476 | "end": { |
5464 | "column": 3, | 5477 | "column": 3, |
5465 | "line": 24 | 5478 | "line": 34 |
5466 | }, | 5479 | }, |
5467 | "file": "src/features/todos/components/TodosWebview.js", | 5480 | "file": "src/features/todos/components/TodosWebview.js", |
5468 | "id": "feature.todos.premium.upgrade", | 5481 | "id": "feature.todos.premium.upgrade", |
5469 | "start": { | 5482 | "start": { |
5470 | "column": 14, | 5483 | "column": 14, |
5471 | "line": 21 | 5484 | "line": 31 |
5472 | } | 5485 | } |
5473 | }, | 5486 | }, |
5474 | { | 5487 | { |
5475 | "defaultMessage": "!!!Everyone else will have to wait a little longer.", | 5488 | "defaultMessage": "!!!Everyone else will have to wait a little longer.", |
5476 | "end": { | 5489 | "end": { |
5477 | "column": 3, | 5490 | "column": 3, |
5478 | "line": 28 | 5491 | "line": 38 |
5479 | }, | 5492 | }, |
5480 | "file": "src/features/todos/components/TodosWebview.js", | 5493 | "file": "src/features/todos/components/TodosWebview.js", |
5481 | "id": "feature.todos.premium.rollout", | 5494 | "id": "feature.todos.premium.rollout", |
5482 | "start": { | 5495 | "start": { |
5483 | "column": 15, | 5496 | "column": 15, |
5484 | "line": 25 | 5497 | "line": 35 |
5485 | } | 5498 | } |
5486 | } | 5499 | } |
5487 | ], | 5500 | ], |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 0762e855f..3306febe1 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -277,6 +277,7 @@ | |||
277 | "settings.app.form.autoLaunchInBackground": "Open in background", | 277 | "settings.app.form.autoLaunchInBackground": "Open in background", |
278 | "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", | 278 | "settings.app.form.autoLaunchOnStart": "Launch Ferdi on start", |
279 | "settings.app.form.beta": "Include beta versions", | 279 | "settings.app.form.beta": "Include beta versions", |
280 | "settings.app.form.customTodoServer": "Custom Todo Server", | ||
280 | "settings.app.form.darkMode": "Enable dark mode", | 281 | "settings.app.form.darkMode": "Enable dark mode", |
281 | "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", | 282 | "settings.app.form.enableGPUAcceleration": "Enable GPU Acceleration", |
282 | "settings.app.form.enableLock": "Enable Password Lock", | 283 | "settings.app.form.enableLock": "Enable Password Lock", |
@@ -293,6 +294,7 @@ | |||
293 | "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", | 294 | "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", |
294 | "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour", | 295 | "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour", |
295 | "settings.app.form.noUpdates": "Disable updates", | 296 | "settings.app.form.noUpdates": "Disable updates", |
297 | "settings.app.form.predefinedTodoServer": "Todo Server", | ||
296 | "settings.app.form.privateNotifications": "Don't show message content in notifications", | 298 | "settings.app.form.privateNotifications": "Don't show message content in notifications", |
297 | "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume", | 299 | "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume", |
298 | "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window", | 300 | "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window", |
@@ -304,7 +306,6 @@ | |||
304 | "settings.app.form.showDisabledServices": "Display disabled services tabs", | 306 | "settings.app.form.showDisabledServices": "Display disabled services tabs", |
305 | "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", | 307 | "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", |
306 | "settings.app.form.startMinimized": "Start minimized in tray", | 308 | "settings.app.form.startMinimized": "Start minimized in tray", |
307 | "settings.app.form.todoServer": "Todo Server", | ||
308 | "settings.app.form.universalDarkMode": "Enable universal Dark Mode", | 309 | "settings.app.form.universalDarkMode": "Enable universal Dark Mode", |
309 | "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", | 310 | "settings.app.form.useTouchIdToUnlock": "Allow using TouchID to unlock Ferdi", |
310 | "settings.app.headline": "Settings", | 311 | "settings.app.headline": "Settings", |
@@ -324,7 +325,7 @@ | |||
324 | "settings.app.scheduledDNDTimeInfo": "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.", | 325 | "settings.app.scheduledDNDTimeInfo": "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.", |
325 | "settings.app.sentryInfo": "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.", | 326 | "settings.app.sentryInfo": "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.", |
326 | "settings.app.subheadlineCache": "Cache", | 327 | "settings.app.subheadlineCache": "Cache", |
327 | "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)", | 328 | "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature.", |
328 | "settings.app.translationHelp": "Help us to translate Ferdi into your language.", | 329 | "settings.app.translationHelp": "Help us to translate Ferdi into your language.", |
329 | "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.", | 330 | "settings.app.universalDarkModeInfo": "Universal Dark Mode tries to dynamically generate dark mode styles for services that are otherwise not currently supported.", |
330 | "settings.app.updateStatusAvailable": "Update available, downloading...", | 331 | "settings.app.updateStatusAvailable": "Update available, downloading...", |
@@ -510,4 +511,4 @@ | |||
510 | "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>", | 511 | "workspaceDrawer.workspaceFeatureInfo": "<p>Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>", |
511 | "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", | 512 | "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", |
512 | "workspaces.switchingIndicator.switchingTo": "Switching to" | 513 | "workspaces.switchingIndicator.switchingTo": "Switching to" |
513 | } | 514 | } \ No newline at end of file |
diff --git a/src/i18n/locales/whitelist_en-US.json b/src/i18n/locales/whitelist_en-US.json index fe51488c7..32960f8ce 100644 --- a/src/i18n/locales/whitelist_en-US.json +++ b/src/i18n/locales/whitelist_en-US.json | |||
@@ -1 +1,2 @@ | |||
1 | [] | 1 | [ |
2 | ] \ No newline at end of file | ||
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index 6777a0d83..4293c93b4 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json | |||
@@ -156,7 +156,7 @@ | |||
156 | } | 156 | } |
157 | }, | 157 | }, |
158 | { | 158 | { |
159 | "id": "settings.app.form.todoServer", | 159 | "id": "settings.app.form.predefinedTodoServer", |
160 | "defaultMessage": "!!!Todo Server", | 160 | "defaultMessage": "!!!Todo Server", |
161 | "file": "src/containers/settings/EditSettingsScreen.js", | 161 | "file": "src/containers/settings/EditSettingsScreen.js", |
162 | "start": { | 162 | "start": { |
@@ -169,6 +169,19 @@ | |||
169 | } | 169 | } |
170 | }, | 170 | }, |
171 | { | 171 | { |
172 | "id": "settings.app.form.customTodoServer", | ||
173 | "defaultMessage": "!!!Custom Todo Server", | ||
174 | "file": "src/containers/settings/EditSettingsScreen.js", | ||
175 | "start": { | ||
176 | "line": 79, | ||
177 | "column": 14 | ||
178 | }, | ||
179 | "end": { | ||
180 | "line": 82, | ||
181 | "column": 3 | ||
182 | } | ||
183 | }, | ||
184 | { | ||
172 | "id": "settings.app.form.enableLock", | 185 | "id": "settings.app.form.enableLock", |
173 | "defaultMessage": "!!!Enable Password Lock", | 186 | "defaultMessage": "!!!Enable Password Lock", |
174 | "file": "src/containers/settings/EditSettingsScreen.js", | 187 | "file": "src/containers/settings/EditSettingsScreen.js", |
@@ -454,4 +467,4 @@ | |||
454 | "column": 3 | 467 | "column": 3 |
455 | } | 468 | } |
456 | } | 469 | } |
457 | ] \ No newline at end of file | 470 | ] |
diff --git a/src/i18n/messages/src/features/todos/components/TodosWebview.json b/src/i18n/messages/src/features/todos/components/TodosWebview.json index 19ea81171..173389570 100644 --- a/src/i18n/messages/src/features/todos/components/TodosWebview.json +++ b/src/i18n/messages/src/features/todos/components/TodosWebview.json | |||
@@ -4,11 +4,11 @@ | |||
4 | "defaultMessage": "!!!Franz Todos are available to premium users now!", | 4 | "defaultMessage": "!!!Franz Todos are available to premium users now!", |
5 | "file": "src/features/todos/components/TodosWebview.js", | 5 | "file": "src/features/todos/components/TodosWebview.js", |
6 | "start": { | 6 | "start": { |
7 | "line": 17, | 7 | "line": 27, |
8 | "column": 15 | 8 | "column": 15 |
9 | }, | 9 | }, |
10 | "end": { | 10 | "end": { |
11 | "line": 20, | 11 | "line": 30, |
12 | "column": 3 | 12 | "column": 3 |
13 | } | 13 | } |
14 | }, | 14 | }, |
@@ -17,11 +17,11 @@ | |||
17 | "defaultMessage": "!!!Upgrade Account", | 17 | "defaultMessage": "!!!Upgrade Account", |
18 | "file": "src/features/todos/components/TodosWebview.js", | 18 | "file": "src/features/todos/components/TodosWebview.js", |
19 | "start": { | 19 | "start": { |
20 | "line": 21, | 20 | "line": 31, |
21 | "column": 14 | 21 | "column": 14 |
22 | }, | 22 | }, |
23 | "end": { | 23 | "end": { |
24 | "line": 24, | 24 | "line": 34, |
25 | "column": 3 | 25 | "column": 3 |
26 | } | 26 | } |
27 | }, | 27 | }, |
@@ -30,11 +30,11 @@ | |||
30 | "defaultMessage": "!!!Everyone else will have to wait a little longer.", | 30 | "defaultMessage": "!!!Everyone else will have to wait a little longer.", |
31 | "file": "src/features/todos/components/TodosWebview.js", | 31 | "file": "src/features/todos/components/TodosWebview.js", |
32 | "start": { | 32 | "start": { |
33 | "line": 25, | 33 | "line": 35, |
34 | "column": 15 | 34 | "column": 15 |
35 | }, | 35 | }, |
36 | "end": { | 36 | "end": { |
37 | "line": 28, | 37 | "line": 38, |
38 | "column": 3 | 38 | "column": 3 |
39 | } | 39 | } |
40 | } | 40 | } |