diff options
-rw-r--r-- | src/i18n/locales/defaultMessages.json | 53 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 2 | ||||
-rw-r--r-- | src/stores/ServicesStore.js | 4 |
3 files changed, 36 insertions, 23 deletions
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index ecb710471..eeb5dba4d 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -3567,133 +3567,146 @@ | |||
3567 | } | 3567 | } |
3568 | }, | 3568 | }, |
3569 | { | 3569 | { |
3570 | "defaultMessage": "!!!Server", | 3570 | "defaultMessage": "!!!Don't show message content in notifications", |
3571 | "end": { | 3571 | "end": { |
3572 | "column": 3, | 3572 | "column": 3, |
3573 | "line": 49 | 3573 | "line": 49 |
3574 | }, | 3574 | }, |
3575 | "file": "src/containers/settings/EditSettingsScreen.js", | 3575 | "file": "src/containers/settings/EditSettingsScreen.js", |
3576 | "id": "settings.app.form.privateNotifications", | ||
3577 | "start": { | ||
3578 | "column": 24, | ||
3579 | "line": 46 | ||
3580 | } | ||
3581 | }, | ||
3582 | { | ||
3583 | "defaultMessage": "!!!Server", | ||
3584 | "end": { | ||
3585 | "column": 3, | ||
3586 | "line": 53 | ||
3587 | }, | ||
3588 | "file": "src/containers/settings/EditSettingsScreen.js", | ||
3576 | "id": "settings.app.form.server", | 3589 | "id": "settings.app.form.server", |
3577 | "start": { | 3590 | "start": { |
3578 | "column": 10, | 3591 | "column": 10, |
3579 | "line": 46 | 3592 | "line": 50 |
3580 | } | 3593 | } |
3581 | }, | 3594 | }, |
3582 | { | 3595 | { |
3583 | "defaultMessage": "!!!Todo Server", | 3596 | "defaultMessage": "!!!Todo Server", |
3584 | "end": { | 3597 | "end": { |
3585 | "column": 3, | 3598 | "column": 3, |
3586 | "line": 53 | 3599 | "line": 57 |
3587 | }, | 3600 | }, |
3588 | "file": "src/containers/settings/EditSettingsScreen.js", | 3601 | "file": "src/containers/settings/EditSettingsScreen.js", |
3589 | "id": "settings.app.form.todoServer", | 3602 | "id": "settings.app.form.todoServer", |
3590 | "start": { | 3603 | "start": { |
3591 | "column": 14, | 3604 | "column": 14, |
3592 | "line": 50 | 3605 | "line": 54 |
3593 | } | 3606 | } |
3594 | }, | 3607 | }, |
3595 | { | 3608 | { |
3596 | "defaultMessage": "!!!Language", | 3609 | "defaultMessage": "!!!Language", |
3597 | "end": { | 3610 | "end": { |
3598 | "column": 3, | 3611 | "column": 3, |
3599 | "line": 57 | 3612 | "line": 61 |
3600 | }, | 3613 | }, |
3601 | "file": "src/containers/settings/EditSettingsScreen.js", | 3614 | "file": "src/containers/settings/EditSettingsScreen.js", |
3602 | "id": "settings.app.form.language", | 3615 | "id": "settings.app.form.language", |
3603 | "start": { | 3616 | "start": { |
3604 | "column": 12, | 3617 | "column": 12, |
3605 | "line": 54 | 3618 | "line": 58 |
3606 | } | 3619 | } |
3607 | }, | 3620 | }, |
3608 | { | 3621 | { |
3609 | "defaultMessage": "!!!Dark Mode", | 3622 | "defaultMessage": "!!!Dark Mode", |
3610 | "end": { | 3623 | "end": { |
3611 | "column": 3, | 3624 | "column": 3, |
3612 | "line": 61 | 3625 | "line": 65 |
3613 | }, | 3626 | }, |
3614 | "file": "src/containers/settings/EditSettingsScreen.js", | 3627 | "file": "src/containers/settings/EditSettingsScreen.js", |
3615 | "id": "settings.app.form.darkMode", | 3628 | "id": "settings.app.form.darkMode", |
3616 | "start": { | 3629 | "start": { |
3617 | "column": 12, | 3630 | "column": 12, |
3618 | "line": 58 | 3631 | "line": 62 |
3619 | } | 3632 | } |
3620 | }, | 3633 | }, |
3621 | { | 3634 | { |
3622 | "defaultMessage": "!!!Display disabled services tabs", | 3635 | "defaultMessage": "!!!Display disabled services tabs", |
3623 | "end": { | 3636 | "end": { |
3624 | "column": 3, | 3637 | "column": 3, |
3625 | "line": 65 | 3638 | "line": 69 |
3626 | }, | 3639 | }, |
3627 | "file": "src/containers/settings/EditSettingsScreen.js", | 3640 | "file": "src/containers/settings/EditSettingsScreen.js", |
3628 | "id": "settings.app.form.showDisabledServices", | 3641 | "id": "settings.app.form.showDisabledServices", |
3629 | "start": { | 3642 | "start": { |
3630 | "column": 24, | 3643 | "column": 24, |
3631 | "line": 62 | 3644 | "line": 66 |
3632 | } | 3645 | } |
3633 | }, | 3646 | }, |
3634 | { | 3647 | { |
3635 | "defaultMessage": "!!!Show unread message badge when notifications are disabled", | 3648 | "defaultMessage": "!!!Show unread message badge when notifications are disabled", |
3636 | "end": { | 3649 | "end": { |
3637 | "column": 3, | 3650 | "column": 3, |
3638 | "line": 69 | 3651 | "line": 73 |
3639 | }, | 3652 | }, |
3640 | "file": "src/containers/settings/EditSettingsScreen.js", | 3653 | "file": "src/containers/settings/EditSettingsScreen.js", |
3641 | "id": "settings.app.form.showMessagesBadgesWhenMuted", | 3654 | "id": "settings.app.form.showMessagesBadgesWhenMuted", |
3642 | "start": { | 3655 | "start": { |
3643 | "column": 29, | 3656 | "column": 29, |
3644 | "line": 66 | 3657 | "line": 70 |
3645 | } | 3658 | } |
3646 | }, | 3659 | }, |
3647 | { | 3660 | { |
3648 | "defaultMessage": "!!!Enable spell checking", | 3661 | "defaultMessage": "!!!Enable spell checking", |
3649 | "end": { | 3662 | "end": { |
3650 | "column": 3, | 3663 | "column": 3, |
3651 | "line": 73 | 3664 | "line": 77 |
3652 | }, | 3665 | }, |
3653 | "file": "src/containers/settings/EditSettingsScreen.js", | 3666 | "file": "src/containers/settings/EditSettingsScreen.js", |
3654 | "id": "settings.app.form.enableSpellchecking", | 3667 | "id": "settings.app.form.enableSpellchecking", |
3655 | "start": { | 3668 | "start": { |
3656 | "column": 23, | 3669 | "column": 23, |
3657 | "line": 70 | 3670 | "line": 74 |
3658 | } | 3671 | } |
3659 | }, | 3672 | }, |
3660 | { | 3673 | { |
3661 | "defaultMessage": "!!!Enable GPU Acceleration", | 3674 | "defaultMessage": "!!!Enable GPU Acceleration", |
3662 | "end": { | 3675 | "end": { |
3663 | "column": 3, | 3676 | "column": 3, |
3664 | "line": 77 | 3677 | "line": 81 |
3665 | }, | 3678 | }, |
3666 | "file": "src/containers/settings/EditSettingsScreen.js", | 3679 | "file": "src/containers/settings/EditSettingsScreen.js", |
3667 | "id": "settings.app.form.enableGPUAcceleration", | 3680 | "id": "settings.app.form.enableGPUAcceleration", |
3668 | "start": { | 3681 | "start": { |
3669 | "column": 25, | 3682 | "column": 25, |
3670 | "line": 74 | 3683 | "line": 78 |
3671 | } | 3684 | } |
3672 | }, | 3685 | }, |
3673 | { | 3686 | { |
3674 | "defaultMessage": "!!!Include beta versions", | 3687 | "defaultMessage": "!!!Include beta versions", |
3675 | "end": { | 3688 | "end": { |
3676 | "column": 3, | 3689 | "column": 3, |
3677 | "line": 81 | 3690 | "line": 85 |
3678 | }, | 3691 | }, |
3679 | "file": "src/containers/settings/EditSettingsScreen.js", | 3692 | "file": "src/containers/settings/EditSettingsScreen.js", |
3680 | "id": "settings.app.form.beta", | 3693 | "id": "settings.app.form.beta", |
3681 | "start": { | 3694 | "start": { |
3682 | "column": 8, | 3695 | "column": 8, |
3683 | "line": 78 | 3696 | "line": 82 |
3684 | } | 3697 | } |
3685 | }, | 3698 | }, |
3686 | { | 3699 | { |
3687 | "defaultMessage": "!!!Enable Franz Todos", | 3700 | "defaultMessage": "!!!Enable Franz Todos", |
3688 | "end": { | 3701 | "end": { |
3689 | "column": 3, | 3702 | "column": 3, |
3690 | "line": 85 | 3703 | "line": 89 |
3691 | }, | 3704 | }, |
3692 | "file": "src/containers/settings/EditSettingsScreen.js", | 3705 | "file": "src/containers/settings/EditSettingsScreen.js", |
3693 | "id": "settings.app.form.enableTodos", | 3706 | "id": "settings.app.form.enableTodos", |
3694 | "start": { | 3707 | "start": { |
3695 | "column": 15, | 3708 | "column": 15, |
3696 | "line": 82 | 3709 | "line": 86 |
3697 | } | 3710 | } |
3698 | } | 3711 | } |
3699 | ], | 3712 | ], |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 7d397b4d3..e6810509a 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -21,7 +21,7 @@ | |||
21 | "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.", | 21 | "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.", |
22 | "feature.todos.premium.upgrade": "Upgrade Account", | 22 | "feature.todos.premium.upgrade": "Upgrade Account", |
23 | "global.api.unhealthy": "Can't connect to Ferdi online services", | 23 | "global.api.unhealthy": "Can't connect to Ferdi online services", |
24 | "global.FranzProRequired": "Ferdi Professional Required", | 24 | "global.franzProRequired": "!!!Franz Professional Required", |
25 | "global.notConnectedToTheInternet": "You are not connected to the internet.", | 25 | "global.notConnectedToTheInternet": "You are not connected to the internet.", |
26 | "global.spellchecker.useDefault": "Use System Default ({default})", | 26 | "global.spellchecker.useDefault": "Use System Default ({default})", |
27 | "global.spellchecking.autodetect": "Detect language automatically", | 27 | "global.spellchecking.autodetect": "Detect language automatically", |
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 3ee799b69..1debf69f6 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js | |||
@@ -399,7 +399,7 @@ export default class ServicesStore extends Store { | |||
399 | } | 399 | } |
400 | 400 | ||
401 | if (service.isNotificationEnabled) { | 401 | if (service.isNotificationEnabled) { |
402 | let title = 'Notification from ' + service.name; | 402 | let title = `Notification from ${service.name}`; |
403 | if (!this.stores.settings.all.app.privateNotifications) { | 403 | if (!this.stores.settings.all.app.privateNotifications) { |
404 | options.body = typeof options.body === 'string' ? options.body : ''; | 404 | options.body = typeof options.body === 'string' ? options.body : ''; |
405 | title = typeof args[0].title === 'string' ? args[0].title : service.name; | 405 | title = typeof args[0].title === 'string' ? args[0].title : service.name; |
@@ -409,7 +409,7 @@ export default class ServicesStore extends Store { | |||
409 | options.icon = '/assets/img/notification-badge.gif'; | 409 | options.icon = '/assets/img/notification-badge.gif'; |
410 | } | 410 | } |
411 | 411 | ||
412 | console.log(title, options) | 412 | console.log(title, options); |
413 | 413 | ||
414 | this.actions.app.notify({ | 414 | this.actions.app.notify({ |
415 | notificationId: args[0].notificationId, | 415 | notificationId: args[0].notificationId, |