From c381775c9783b2af8c8ecc2c55e76aaab42ed3ef Mon Sep 17 00:00:00 2001 From: vantezzen Date: Sun, 8 Sep 2019 10:44:12 +0200 Subject: Implement meetfranz/franz#879 --- src/i18n/locales/en-US.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/i18n/locales/en-US.json') diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 67f80bf18..7d397b4d3 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -214,6 +214,7 @@ "settings.app.form.enableTodos": "Enable Ferdi Todos", "settings.app.form.language": "Language", "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", + "settings.app.form.privateNotifications": "Don't show message content in notifications", "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window", "settings.app.form.server": "Server", "settings.app.form.showDisabledServices": "Display disabled services tabs", -- cgit v1.2.3-70-g09d2 From 0fc163284024549def8990506cdead1870c15526 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Sun, 8 Sep 2019 10:45:48 +0200 Subject: Lint --- src/i18n/locales/defaultMessages.json | 53 ++++++++++++++++++++++------------- src/i18n/locales/en-US.json | 2 +- src/stores/ServicesStore.js | 4 +-- 3 files changed, 36 insertions(+), 23 deletions(-) (limited to 'src/i18n/locales/en-US.json') 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 @@ } }, { - "defaultMessage": "!!!Server", + "defaultMessage": "!!!Don't show message content in notifications", "end": { "column": 3, "line": 49 }, "file": "src/containers/settings/EditSettingsScreen.js", + "id": "settings.app.form.privateNotifications", + "start": { + "column": 24, + "line": 46 + } + }, + { + "defaultMessage": "!!!Server", + "end": { + "column": 3, + "line": 53 + }, + "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.server", "start": { "column": 10, - "line": 46 + "line": 50 } }, { "defaultMessage": "!!!Todo Server", "end": { "column": 3, - "line": 53 + "line": 57 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.todoServer", "start": { "column": 14, - "line": 50 + "line": 54 } }, { "defaultMessage": "!!!Language", "end": { "column": 3, - "line": 57 + "line": 61 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.language", "start": { "column": 12, - "line": 54 + "line": 58 } }, { "defaultMessage": "!!!Dark Mode", "end": { "column": 3, - "line": 61 + "line": 65 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.darkMode", "start": { "column": 12, - "line": 58 + "line": 62 } }, { "defaultMessage": "!!!Display disabled services tabs", "end": { "column": 3, - "line": 65 + "line": 69 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showDisabledServices", "start": { "column": 24, - "line": 62 + "line": 66 } }, { "defaultMessage": "!!!Show unread message badge when notifications are disabled", "end": { "column": 3, - "line": 69 + "line": 73 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.showMessagesBadgesWhenMuted", "start": { "column": 29, - "line": 66 + "line": 70 } }, { "defaultMessage": "!!!Enable spell checking", "end": { "column": 3, - "line": 73 + "line": 77 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableSpellchecking", "start": { "column": 23, - "line": 70 + "line": 74 } }, { "defaultMessage": "!!!Enable GPU Acceleration", "end": { "column": 3, - "line": 77 + "line": 81 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableGPUAcceleration", "start": { "column": 25, - "line": 74 + "line": 78 } }, { "defaultMessage": "!!!Include beta versions", "end": { "column": 3, - "line": 81 + "line": 85 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.beta", "start": { "column": 8, - "line": 78 + "line": 82 } }, { "defaultMessage": "!!!Enable Franz Todos", "end": { "column": 3, - "line": 85 + "line": 89 }, "file": "src/containers/settings/EditSettingsScreen.js", "id": "settings.app.form.enableTodos", "start": { "column": 15, - "line": 82 + "line": 86 } } ], 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 @@ "feature.todos.premium.rollout": "Everyone else will have to wait a little longer.", "feature.todos.premium.upgrade": "Upgrade Account", "global.api.unhealthy": "Can't connect to Ferdi online services", - "global.FranzProRequired": "Ferdi Professional Required", + "global.franzProRequired": "!!!Franz Professional Required", "global.notConnectedToTheInternet": "You are not connected to the internet.", "global.spellchecker.useDefault": "Use System Default ({default})", "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 { } if (service.isNotificationEnabled) { - let title = 'Notification from ' + service.name; + let title = `Notification from ${service.name}`; if (!this.stores.settings.all.app.privateNotifications) { options.body = typeof options.body === 'string' ? options.body : ''; title = typeof args[0].title === 'string' ? args[0].title : service.name; @@ -409,7 +409,7 @@ export default class ServicesStore extends Store { options.icon = '/assets/img/notification-badge.gif'; } - console.log(title, options) + console.log(title, options); this.actions.app.notify({ notificationId: args[0].notificationId, -- cgit v1.2.3-70-g09d2