Skip to content
This repository has been archived by the owner on Sep 27, 2024. It is now read-only.

fix(settings): change elk to moz social in notifications settings [MOSOWEB-89] #84

Merged
merged 3 commits into from
Nov 15, 2023
Merged

fix(settings): change elk to moz social in notifications settings [MOSOWEB-89] #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a26890
fix(settings): change elk to moz social in notifications settings
jpezninjo Nov 14, 2023
a865702
fix(settings): german translations
jpezninjo Nov 14, 2023
ae8d128
Merge branch 'main' into fix/push-notifications-elk-language
jpezninjo Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions locales/de-DE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,10 +479,10 @@
"unsupported": "Ihr Browser unterstützt keine Push-Benachrichtigungen.",
"warning": {
"enable_close": "Schließen",
"enable_description": "Um Benachrichtigungen zu erhalten, wenn Elk nicht geöffnet ist, aktiviere Push-Benachrichtigungen. \nDu kannst genau steuern, welche Arten von Interaktionen Push-Benachrichtigungen generieren, indem du die Schaltfläche \"@:settings.notifications.show_btn{'\"'} oben aktivierest, sobald sie aktiviert ist.",
"enable_description_desktop": "Um Benachrichtigungen zu erhalten, wenn Elk nicht geöffnet ist, aktiviere Push-Benachrichtigungen. \nDu kannst unter „Einstellungen > Benachrichtigungen > Einstellungen für Push-Benachrichtigungen“ genau steuern, welche Arten von Interaktionen Push-Benachrichtigungen generieren, sobald diese aktiviert sind.",
"enable_description": "Um Benachrichtigungen zu erhalten, wenn Mozilla.social nicht geöffnet ist, aktiviere Push-Benachrichtigungen. \nDu kannst genau steuern, welche Arten von Interaktionen Push-Benachrichtigungen generieren, indem du die Schaltfläche \"@:settings.notifications.show_btn{'\"'} oben aktivierest, sobald sie aktiviert ist.",
Copy link

@cadeyrn cadeyrn Nov 15, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was already wrong in the previous version, but since you're already on it: "aktivierest" should be "aktivierst". I am not sure if that's the best word, and it's also not what the English original says. Additionally, "aktivierst" would be repeated twice in quick succession. This doesn't sound good and even makes the sentence a bit confusing.

Suggestion for enable_description: "Um Benachrichtigungen zu erhalten, wenn Mozilla.social nicht geöffnet ist, aktiviere Push-Benachrichtigungen. \nÜber die Schaltfläche "@:settings.notifications.show_btn{'"'} oben kannst genau steuern, welche Arten von Interaktionen Push-Benachrichtigungen generieren, sobald diese aktiviert ist."

This would be closer to the English translation and less confusing.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @cadeyrn, thanks for the suggestion! I've put your changes onto a new branch and will ask our product if these fixes can come in. PR is here - #87

"enable_description_desktop": "Um Benachrichtigungen zu erhalten, wenn Mozilla.social nicht geöffnet ist, aktiviere Push-Benachrichtigungen. \nDu kannst unter „Einstellungen > Benachrichtigungen > Einstellungen für Push-Benachrichtigungen“ genau steuern, welche Arten von Interaktionen Push-Benachrichtigungen generieren, sobald diese aktiviert sind.",
"enable_description_mobile": "Du erreichst die Einstellungen auch über das Navigationsmenü „Einstellungen > Benachrichtigungen > Push-Benachrichtigungseinstellungen“.",
"enable_description_settings": "Um Benachrichtigungen zu erhalten, wenn Elk nicht geöffnet ist, aktiviere Push-Benachrichtigungen. \nDu kannst genau steuern, welche Arten von Interaktionen Push-Benachrichtigungen auf demselben Bildschirm generieren, sobald du sie aktivierst.",
"enable_description_settings": "Um Benachrichtigungen zu erhalten, wenn Mozilla.social nicht geöffnet ist, aktiviere Push-Benachrichtigungen. \nDu kannst genau steuern, welche Arten von Interaktionen Push-Benachrichtigungen auf demselben Bildschirm generieren, sobald du sie aktivierst.",
"enable_desktop": "Aktiviere Push-Benachrichtigungen",
"enable_title": "Verpasse nie wieder Benachrichtigungen",
"re_auth": "Offenbar unterstützt dein Server keine Push-Benachrichtigungen. \nVersuche dich abzumelden und erneut anzumelden. Wenn diese Meldung weiterhin angezeigt wird, wende dich an dein Serveradministrator."
Expand Down
6 changes: 3 additions & 3 deletions locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,10 +524,10 @@
"unsupported": "Your browser does not support push notifications.",
"warning": {
"enable_close": "Close",
"enable_description": "To receive notifications when Elk is not open, enable push notifications. You can control precisely what types of interactions generate push notifications via the \"@:settings.notifications.show_btn{'\"'} button above once enabled.",
"enable_description_desktop": "To receive notifications when Elk is not open, enable push notifications. You can control precisely what types of interactions generate push notifications in \"Settings > Notifications > Push notifications settings\" once enabled.",
"enable_description": "To receive notifications when Mozilla.social is not open, enable push notifications. You can control precisely what types of interactions generate push notifications via the \"@:settings.notifications.show_btn{'\"'} button above once enabled.",
Copy link
Author

@jpezninjo jpezninjo Nov 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 3 translation entries are for the 3 different versions of this UI, based on a prop called closeableHeader and a css check for xl

"enable_description_desktop": "To receive notifications when Mozilla.social is not open, enable push notifications. You can control precisely what types of interactions generate push notifications in \"Settings > Notifications > Push notifications settings\" once enabled.",
"enable_description_mobile": "You can also access the settings using the navigation menu \"Settings > Notifications > Push notification settings\".",
"enable_description_settings": "To receive notifications when Elk is not open, enable push notifications. You will be able to control precisely what types of interactions generate push notifications on this same screen once you enable them.",
"enable_description_settings": "To receive notifications when Mozilla.social is not open, enable push notifications. You will be able to control precisely what types of interactions generate push notifications on this same screen once you enable them.",
"enable_desktop": "Enable push notifications",
"enable_title": "Never miss anything",
"re_auth": "It seems that your server does not support push notifications. Try sign out and sign in again, if this message still appears contact your server administrator."
Expand Down
Loading