From 6b38499bdc4d3e6f55d50b363b0a83a7b577f0b8 Mon Sep 17 00:00:00 2001 From: binwiederhier Date: Tue, 13 Jun 2023 22:03:00 -0400 Subject: [PATCH] Revert alert text and button, and warning --- web/public/static/langs/ar.json | 4 +-- web/public/static/langs/bg.json | 4 +-- web/public/static/langs/cs.json | 4 +-- web/public/static/langs/da.json | 4 +-- web/public/static/langs/de.json | 4 +-- web/public/static/langs/en.json | 7 +++--- web/public/static/langs/es.json | 4 +-- web/public/static/langs/fr.json | 4 +-- web/public/static/langs/hu.json | 4 +-- web/public/static/langs/id.json | 4 +-- web/public/static/langs/it.json | 4 +-- web/public/static/langs/ja.json | 4 +-- web/public/static/langs/ko.json | 4 +-- web/public/static/langs/nb_NO.json | 4 +-- web/public/static/langs/nl.json | 4 +-- web/public/static/langs/pl.json | 4 +-- web/public/static/langs/pt.json | 4 +-- web/public/static/langs/pt_BR.json | 4 +-- web/public/static/langs/ru.json | 4 +-- web/public/static/langs/sv.json | 4 +-- web/public/static/langs/tr.json | 4 +-- web/public/static/langs/uk.json | 4 +-- web/public/static/langs/zh_Hans.json | 4 +-- web/public/static/langs/zh_Hant.json | 4 +-- web/src/components/Navigation.jsx | 37 +++++++++++----------------- 25 files changed, 64 insertions(+), 72 deletions(-) diff --git a/web/public/static/langs/ar.json b/web/public/static/langs/ar.json index 0c9fcc7d..df8f64b2 100644 --- a/web/public/static/langs/ar.json +++ b/web/public/static/langs/ar.json @@ -12,8 +12,8 @@ "nav_button_publish_message": "نشر الإشعار", "nav_button_subscribe": "اشترك في الموضوع", "nav_button_connecting": "جارٍ الاتصال", - "alert_grant_title": "تم تعطيل الإشعارات", - "alert_grant_description": "امنح متصفحك الإذن لعرض إشعارات سطح المكتب.", + "alert_notification_permission_required_title": "تم تعطيل الإشعارات", + "alert_notification_permission_required_description": "امنح متصفحك الإذن لعرض إشعارات سطح المكتب.", "notifications_list": "قائمة الإشعارات", "notifications_list_item": "إشعار", "notifications_mark_read": "وضع علامة كمقروء", diff --git a/web/public/static/langs/bg.json b/web/public/static/langs/bg.json index a040b015..bac65a8c 100644 --- a/web/public/static/langs/bg.json +++ b/web/public/static/langs/bg.json @@ -1,6 +1,6 @@ { "action_bar_clear_notifications": "Премахване на известия", - "alert_grant_description": "Разрешете на мрежовия четец да показва известия.", + "alert_notification_permission_required_description": "Разрешете на мрежовия четец да показва известия.", "notifications_attachment_copy_url_title": "Копиране на адреса на прикачения файл", "notifications_example": "Пример", "notifications_no_subscriptions_title": "Липсват абонаменти", @@ -47,7 +47,7 @@ "nav_button_settings": "Настройки", "nav_button_documentation": "Ръководство", "nav_button_subscribe": "Абониране за тема", - "alert_grant_title": "Известията са изключени", + "alert_notification_permission_required_title": "Известията са изключени", "alert_grant_button": "Разрешаване", "notifications_tags": "Етикети", "nav_button_publish_message": "Изпращане", diff --git a/web/public/static/langs/cs.json b/web/public/static/langs/cs.json index 6b967c87..0f736698 100644 --- a/web/public/static/langs/cs.json +++ b/web/public/static/langs/cs.json @@ -11,8 +11,8 @@ "nav_button_documentation": "Dokumentace", "nav_button_publish_message": "Odeslat oznámení", "nav_button_subscribe": "Přihlásit se k odběru tématu", - "alert_grant_title": "Oznámení jsou zakázána", - "alert_grant_description": "Udělte prohlížeči oprávnění k zobrazování oznámení na ploše.", + "alert_notification_permission_required_title": "Oznámení jsou zakázána", + "alert_notification_permission_required_description": "Udělte prohlížeči oprávnění k zobrazování oznámení na ploše.", "alert_grant_button": "Udělit nyní", "alert_not_supported_title": "Oznámení nejsou podporována", "alert_not_supported_description": "Oznámení nejsou ve vašem prohlížeči podporována.", diff --git a/web/public/static/langs/da.json b/web/public/static/langs/da.json index c7477dfc..21e7de76 100644 --- a/web/public/static/langs/da.json +++ b/web/public/static/langs/da.json @@ -40,8 +40,8 @@ "nav_button_all_notifications": "Alle notifikationer", "nav_button_connecting": "forbinder", "nav_upgrade_banner_label": "Opgrader til ntfy Pro", - "alert_grant_title": "Notifikationer er deaktiveret", - "alert_grant_description": "Giv din browser tilladelse til at vise skrivebordsnotifikationer.", + "alert_notification_permission_required_title": "Notifikationer er deaktiveret", + "alert_notification_permission_required_description": "Giv din browser tilladelse til at vise skrivebordsnotifikationer.", "alert_not_supported_title": "Notifikationer understøttes ikke", "alert_not_supported_description": "Notifikationer understøttes ikke i din browser.", "alert_not_supported_context_description": "Notifikationer understøttes kun via HTTPS. Dette skyldes en begrænsning i Notifications API.", diff --git a/web/public/static/langs/de.json b/web/public/static/langs/de.json index 6343deec..61e18360 100644 --- a/web/public/static/langs/de.json +++ b/web/public/static/langs/de.json @@ -5,7 +5,7 @@ "nav_button_documentation": "Dokumentation", "nav_button_publish_message": "Benachrichtigung senden", "nav_button_subscribe": "Thema abonnieren", - "alert_grant_title": "Benachrichtigungen sind deaktiviert", + "alert_notification_permission_required_title": "Benachrichtigungen sind deaktiviert", "publish_dialog_base_url_label": "Service-URL", "publish_dialog_details_examples_description": "Beispiele und ausführliche Informationen zu allen Optionen findest Du in der Dokumentation.", "publish_dialog_attached_file_filename_placeholder": "Dateiname des Anhangs", @@ -31,7 +31,7 @@ "notifications_attachment_open_title": "Gehe zu {{url}}", "notifications_none_for_any_title": "Du hast keine Benachrichtigungen empfangen.", "action_bar_send_test_notification": "Test-Benachrichtigung senden", - "alert_grant_description": "Dem Browser erlauben, Desktop-Benachrichtigungen anzuzeigen.", + "alert_notification_permission_required_description": "Dem Browser erlauben, Desktop-Benachrichtigungen anzuzeigen.", "notifications_tags": "Tags", "message_bar_type_message": "Gib hier eine Nachricht ein", "message_bar_error_publishing": "Fehler beim Senden der Benachrichtigung", diff --git a/web/public/static/langs/en.json b/web/public/static/langs/en.json index 89ca8931..5a57c71c 100644 --- a/web/public/static/langs/en.json +++ b/web/public/static/langs/en.json @@ -54,11 +54,12 @@ "nav_button_connecting": "connecting", "nav_upgrade_banner_label": "Upgrade to ntfy Pro", "nav_upgrade_banner_description": "Reserve topics, more messages & emails, and larger attachments", - "alert_notification_permission_required_title": "Permission required", - "alert_notification_permission_required_description": "Please click here to enable notifications", + "alert_notification_permission_required_title": "Notifications are disabled", + "alert_notification_permission_required_description": "Grant your browser permission to display desktop notifications.", + "alert_notification_permission_required_button": "Grant now", "alert_notification_permission_denied_title": "Notifications are blocked", "alert_notification_permission_denied_description": "Please re-enable them in your browser and refresh the page to receive notifications", - "alert_notification_ios_install_required_title": "iOS Install Required", + "alert_notification_ios_install_required_title": "iOS install required", "alert_notification_ios_install_required_description": "Click on the Share icon and Add to Home Screen to enable notifications on iOS", "alert_not_supported_title": "Notifications not supported", "alert_not_supported_description": "Notifications are not supported in your browser.", diff --git a/web/public/static/langs/es.json b/web/public/static/langs/es.json index 62ecdaf6..d77eb356 100644 --- a/web/public/static/langs/es.json +++ b/web/public/static/langs/es.json @@ -7,8 +7,8 @@ "action_bar_unsubscribe": "Cancelar la suscripción", "message_bar_type_message": "Escriba un mensaje aquí", "message_bar_error_publishing": "Error al publicar la notificación", - "alert_grant_title": "Las notificaciones están deshabilitadas", - "alert_grant_description": "Concede a tu navegador permiso para mostrar notificaciones en el escritorio.", + "alert_notification_permission_required_title": "Las notificaciones están deshabilitadas", + "alert_notification_permission_required_description": "Concede a tu navegador permiso para mostrar notificaciones en el escritorio.", "nav_button_all_notifications": "Todas las notificaciones", "nav_button_settings": "Ajustes", "nav_button_subscribe": "Suscribirse al tópico", diff --git a/web/public/static/langs/fr.json b/web/public/static/langs/fr.json index cf4bb721..be9f2925 100644 --- a/web/public/static/langs/fr.json +++ b/web/public/static/langs/fr.json @@ -50,8 +50,8 @@ "publish_dialog_attachment_limits_file_reached": "Dépasse la limite du fichier {{fileSizeLimit}}", "nav_button_subscribe": "S'abonner au sujet", "notifications_no_subscriptions_description": "Cliquez sur le lien « {{linktext}} » pour créer ou vous abonner à un sujet. Après cela, vous pouvez envoyer des messages via PUT ou POST et vous recevrez des notifications ici.", - "alert_grant_title": "Les notifications sont désactivées", - "alert_grant_description": "Autorisez votre navigateur à afficher les notifications du bureau.", + "alert_notification_permission_required_title": "Les notifications sont désactivées", + "alert_notification_permission_required_description": "Autorisez votre navigateur à afficher les notifications du bureau.", "alert_grant_button": "Accorder maintenant", "notifications_none_for_any_title": "Vous n'avez reçu aucune notification.", "publish_dialog_title_topic": "Publier vers {{topic}}", diff --git a/web/public/static/langs/hu.json b/web/public/static/langs/hu.json index b52e3a48..21e4a257 100644 --- a/web/public/static/langs/hu.json +++ b/web/public/static/langs/hu.json @@ -8,8 +8,8 @@ "message_bar_error_publishing": "Hiba történt az értesítés elküldése közben", "nav_button_all_notifications": "Összes értesítés", "nav_topics_title": "Feliratkozott témák", - "alert_grant_title": "Az értesítések le vannak tiltva", - "alert_grant_description": "Engedélyezd a böngészőnek, hogy asztali értesítéseket jeleníttessen meg.", + "alert_notification_permission_required_title": "Az értesítések le vannak tiltva", + "alert_notification_permission_required_description": "Engedélyezd a böngészőnek, hogy asztali értesítéseket jeleníttessen meg.", "nav_button_settings": "Beállítások", "nav_button_documentation": "Dokumentáció", "nav_button_publish_message": "Értesítés küldése", diff --git a/web/public/static/langs/id.json b/web/public/static/langs/id.json index 48fcda0b..ae9922f7 100644 --- a/web/public/static/langs/id.json +++ b/web/public/static/langs/id.json @@ -22,8 +22,8 @@ "common_add": "Tambahkan", "nav_topics_title": "Topik yang dilanggani", "nav_button_subscribe": "Berlangganan ke topik", - "alert_grant_title": "Notifikasi dinonaktifkan", - "alert_grant_description": "Berikan izin ke peramban untuk menampilkan notifikasi desktop.", + "alert_notification_permission_required_title": "Notifikasi dinonaktifkan", + "alert_notification_permission_required_description": "Berikan izin ke peramban untuk menampilkan notifikasi desktop.", "alert_not_supported_description": "Notifikasi tidak didukung dalam peramban Anda.", "notifications_attachment_open_title": "Pergi ke {{url}}", "notifications_attachment_open_button": "Buka lampiran", diff --git a/web/public/static/langs/it.json b/web/public/static/langs/it.json index 95c4b5b1..ac02cf7b 100644 --- a/web/public/static/langs/it.json +++ b/web/public/static/langs/it.json @@ -15,7 +15,7 @@ "nav_button_subscribe": "Iscriviti al topic", "nav_button_muted": "Notifiche disattivate", "nav_button_connecting": "connessione", - "alert_grant_title": "Le notifiche sono disabilitate", + "alert_notification_permission_required_title": "Le notifiche sono disabilitate", "alert_grant_button": "Concedi ora", "notifications_list": "Elenco notifiche", "notifications_list_item": "Notifiche", @@ -155,7 +155,7 @@ "alert_not_supported_description": "Le notifiche non sono supportate nel tuo browser.", "nav_button_documentation": "Documentazione", "notifications_actions_http_request_title": "Invia HTTP {{method}} a {{url}}", - "alert_grant_description": "Concedi al tuo browser l'autorizzazione a visualizzare le notifiche sul desktop.", + "alert_notification_permission_required_description": "Concedi al tuo browser l'autorizzazione a visualizzare le notifiche sul desktop.", "alert_not_supported_title": "Notifiche non supportate", "notifications_attachment_file_app": "file app Android", "notifications_no_subscriptions_description": "Fai clic sul link \"{{linktext}}\" per creare o iscriverti a un topic. Successivamente, puoi inviare messaggi tramite PUT o POST e riceverai le notifiche qui.", diff --git a/web/public/static/langs/ja.json b/web/public/static/langs/ja.json index 554cd9d3..714b5d4f 100644 --- a/web/public/static/langs/ja.json +++ b/web/public/static/langs/ja.json @@ -28,13 +28,13 @@ "message_bar_type_message": "メッセージを入力してください", "nav_topics_title": "購読しているトピック", "nav_button_subscribe": "トピックを購読", - "alert_grant_description": "ブラウザのデスクトップ通知を許可してください。", + "alert_notification_permission_required_description": "ブラウザのデスクトップ通知を許可してください。", "alert_grant_button": "許可する", "notifications_attachment_link_expires": "リンクは {{date}} に失効します", "notifications_click_copy_url_button": "リンクをコピー", "notifications_none_for_topic_description": "トピックに通知を送信するには、トピックのURLにPUTかPOSTしてください。", "nav_button_publish_message": "通知を送信", - "alert_grant_title": "通知は無効化されています", + "alert_notification_permission_required_title": "通知は無効化されています", "alert_not_supported_title": "通知機能はサポートされていません", "notifications_tags": "タグ", "notifications_attachment_copy_url_button": "URLをコピー", diff --git a/web/public/static/langs/ko.json b/web/public/static/langs/ko.json index 2e46c7a1..eb591d44 100644 --- a/web/public/static/langs/ko.json +++ b/web/public/static/langs/ko.json @@ -17,8 +17,8 @@ "nav_button_subscribe": "주제 구독하기", "nav_button_muted": "알림 음소거됨", "nav_button_connecting": "연결중", - "alert_grant_title": "알림이 비활성화되어 있습니다", - "alert_grant_description": "데스크톱 알림을 받기 위해서는 브라우저에서 권한을 부여해야 합니다.", + "alert_notification_permission_required_title": "알림이 비활성화되어 있습니다", + "alert_notification_permission_required_description": "데스크톱 알림을 받기 위해서는 브라우저에서 권한을 부여해야 합니다.", "alert_grant_button": "권한 부여하기", "alert_not_supported_title": "알림이 지원되지 않습니다", "notifications_list_item": "알림", diff --git a/web/public/static/langs/nb_NO.json b/web/public/static/langs/nb_NO.json index 0dd9571b..1caebe9d 100644 --- a/web/public/static/langs/nb_NO.json +++ b/web/public/static/langs/nb_NO.json @@ -9,7 +9,7 @@ "nav_button_settings": "Innstillinger", "nav_button_documentation": "Dokumentasjon", "nav_topics_title": "Abonnerte emner", - "alert_grant_title": "Merknader er avskrudd", + "alert_notification_permission_required_title": "Merknader er avskrudd", "alert_not_supported_title": "Merknader støttes ikke", "notifications_copied_to_clipboard": "Kopiert til utklippstavlen", "notifications_attachment_copy_url_title": "Kopier vedleggsnettadresse til utklippstavlen", @@ -133,7 +133,7 @@ "publish_dialog_chip_delay_label": "Forsink leveringen", "publish_dialog_details_examples_description": "For eksempler og en detaljert beskrivelse av alle sendefunksjoner, se dokumentasjonen.", "publish_dialog_base_url_placeholder": "Tjeneste-URL, f.eks. https://example.com", - "alert_grant_description": "Gi nettleseren din tillatelse til å vise skrivebordsvarsler.", + "alert_notification_permission_required_description": "Gi nettleseren din tillatelse til å vise skrivebordsvarsler.", "alert_not_supported_description": "Varsler støttes ikke i nettleseren din.", "notifications_attachment_file_app": "Android-app-fil", "notifications_no_subscriptions_description": "Klikk på \"{{linktext}}\"-koblingen for å opprette eller abonnere på et emne. Etter det kan du sende meldinger via PUT eller POST, og du vil motta varsler her.", diff --git a/web/public/static/langs/nl.json b/web/public/static/langs/nl.json index 8ccb629d..2feb2eaa 100644 --- a/web/public/static/langs/nl.json +++ b/web/public/static/langs/nl.json @@ -35,8 +35,8 @@ "nav_button_subscribe": "Abonneer op onderwerp", "nav_button_muted": "Notificaties gedempt", "nav_button_connecting": "verbinden", - "alert_grant_title": "Notificaties zijn uitgeschakeld", - "alert_grant_description": "Verleen je browser toestemming voor het weergeven van notificaties.", + "alert_notification_permission_required_title": "Notificaties zijn uitgeschakeld", + "alert_notification_permission_required_description": "Verleen je browser toestemming voor het weergeven van notificaties.", "alert_grant_button": "Nu toestaan", "alert_not_supported_title": "Notificaties zijn niet ondersteund", "notifications_list": "Notificatielijst", diff --git a/web/public/static/langs/pl.json b/web/public/static/langs/pl.json index 9dea2b8a..c370649c 100644 --- a/web/public/static/langs/pl.json +++ b/web/public/static/langs/pl.json @@ -9,8 +9,8 @@ "nav_button_all_notifications": "Wszystkie powiadomienia", "nav_button_documentation": "Dokumentacja", "nav_button_muted": "Powiadomienia wyciszone", - "alert_grant_title": "Powiadomienia są wyłączone", - "alert_grant_description": "Udziel przeglądarce pozwolenia na wyświetlanie powiadomień na pulpicie.", + "alert_notification_permission_required_title": "Powiadomienia są wyłączone", + "alert_notification_permission_required_description": "Udziel przeglądarce pozwolenia na wyświetlanie powiadomień na pulpicie.", "alert_grant_button": "Pozwól teraz", "alert_not_supported_title": "Powiadomienia nie są obsługiwane", "alert_not_supported_description": "Powiadomienia nie są obsługiwane przez Twoją przeglądarkę.", diff --git a/web/public/static/langs/pt.json b/web/public/static/langs/pt.json index 57d56565..3deccab6 100644 --- a/web/public/static/langs/pt.json +++ b/web/public/static/langs/pt.json @@ -15,8 +15,8 @@ "nav_button_subscribe": "Subscrever tópico", "nav_button_muted": "Notificações desativadas", "nav_button_connecting": "A ligar", - "alert_grant_title": "As notificações estão desativadas", - "alert_grant_description": "Conceder permissão ao seu navegador para mostrar notificações.", + "alert_notification_permission_required_title": "As notificações estão desativadas", + "alert_notification_permission_required_description": "Conceder permissão ao seu navegador para mostrar notificações.", "alert_not_supported_title": "Notificações não suportadas", "notifications_list": "Lista de notificações", "alert_not_supported_description": "As notificações não são suportadas pelo seu navegador.", diff --git a/web/public/static/langs/pt_BR.json b/web/public/static/langs/pt_BR.json index 16ba3a14..46c919fd 100644 --- a/web/public/static/langs/pt_BR.json +++ b/web/public/static/langs/pt_BR.json @@ -7,8 +7,8 @@ "nav_button_all_notifications": "Todas notificações", "nav_button_settings": "Configurações", "nav_button_subscribe": "Inscrever no tópico", - "alert_grant_title": "Notificações estão desativadas", - "alert_grant_description": "Conceder ao navegador permissão para mostrar notificações.", + "alert_notification_permission_required_title": "Notificações estão desativadas", + "alert_notification_permission_required_description": "Conceder ao navegador permissão para mostrar notificações.", "alert_grant_button": "Conceder agora", "alert_not_supported_title": "Notificações não são suportadas", "alert_not_supported_description": "Notificações não são suportadas pelo seu navagador.", diff --git a/web/public/static/langs/ru.json b/web/public/static/langs/ru.json index 9633d97d..3bd568d8 100644 --- a/web/public/static/langs/ru.json +++ b/web/public/static/langs/ru.json @@ -8,7 +8,7 @@ "notifications_none_for_topic_description": "Чтобы отправить уведомление на данную тему, просто сделаете PUT или POST-запрос на URL-адрес этой темы.", "notifications_none_for_any_description": "Чтобы отправить уведомление на тему, просто сделаете PUT или POST-запрос на её URL-адрес. Вот пример с использованием одной из ваших тем.", "notifications_no_subscriptions_title": "Похоже, что у вас ещё нет подписок.", - "alert_grant_description": "Разрешите браузеру показывать уведомления.", + "alert_notification_permission_required_description": "Разрешите браузеру показывать уведомления.", "notifications_no_subscriptions_description": "Нажмите на ссылку \"{{linktext}}\", чтобы создать или подписаться на тему. После этого Вы сможете отправлять сообщения используя PUT или POST-запросы и получать уведомления здесь.", "notifications_example": "Пример", "notifications_more_details": "Для более подробной информации, посетите наш сайт или документацию.", @@ -57,7 +57,7 @@ "notifications_attachment_link_expired": "срок действия ссылки для скачивания истёк", "notifications_click_copy_url_button": "Скопировать ссылку", "notifications_none_for_any_title": "Вы ещё не получали никаких уведомлений.", - "alert_grant_title": "Уведомления отключены", + "alert_notification_permission_required_title": "Уведомления отключены", "notifications_attachment_copy_url_title": "Скопировать URL-адрес вложения", "notifications_actions_open_url_title": "Перейти на {{url}}", "notifications_tags": "Тэги", diff --git a/web/public/static/langs/sv.json b/web/public/static/langs/sv.json index bc4a5405..1cd5eba3 100644 --- a/web/public/static/langs/sv.json +++ b/web/public/static/langs/sv.json @@ -11,7 +11,7 @@ "nav_button_documentation": "Dokumentation", "nav_button_publish_message": "Publicera notis", "nav_button_subscribe": "Prenumerera på kategori", - "alert_grant_title": "Notiser är avstängda", + "alert_notification_permission_required_title": "Notiser är avstängda", "alert_grant_button": "Bevilja nu", "alert_not_supported_title": "Notiser stöds inte", "notifications_list": "Notifieringslista", @@ -38,7 +38,7 @@ "notifications_attachment_link_expires": "länken utgår {{date}}", "notifications_attachment_file_image": "bild fil", "notifications_attachment_file_audio": "ljud fil", - "alert_grant_description": "Ge din webbläsare behörighet att visa skrivbordsnotiser.", + "alert_notification_permission_required_description": "Ge din webbläsare behörighet att visa skrivbordsnotiser.", "alert_not_supported_description": "Notiser stöds inte i din webbläsare.", "notifications_mark_read": "Markera som läst", "notifications_attachment_file_video": "video fil", diff --git a/web/public/static/langs/tr.json b/web/public/static/langs/tr.json index 3eccda88..ede1a515 100644 --- a/web/public/static/langs/tr.json +++ b/web/public/static/langs/tr.json @@ -59,8 +59,8 @@ "notifications_attachment_open_button": "Eki aç", "nav_button_documentation": "Belgelendirme", "nav_button_publish_message": "Bildirim yayınla", - "alert_grant_title": "Bildirimler devre dışı", - "alert_grant_description": "Tarayıcınıza masaüstü bildirimlerini görüntüleme izni verin.", + "alert_notification_permission_required_title": "Bildirimler devre dışı", + "alert_notification_permission_required_description": "Tarayıcınıza masaüstü bildirimlerini görüntüleme izni verin.", "alert_not_supported_description": "Tarayıcınızda bildirimler desteklenmiyor.", "notifications_copied_to_clipboard": "Panoya kopyalandı", "notifications_tags": "Etiketler", diff --git a/web/public/static/langs/uk.json b/web/public/static/langs/uk.json index 32a30795..d9c8210d 100644 --- a/web/public/static/langs/uk.json +++ b/web/public/static/langs/uk.json @@ -10,8 +10,8 @@ "nav_button_subscribe": "Підписатися на тему", "nav_button_muted": "Сповіщення вимкнено", "nav_button_connecting": "підключення", - "alert_grant_title": "Сповіщення вимкнено", - "alert_grant_description": "Дозвольте браузеру показувати сповіщення.", + "alert_notification_permission_required_title": "Сповіщення вимкнено", + "alert_notification_permission_required_description": "Дозвольте браузеру показувати сповіщення.", "alert_grant_button": "Дозволити", "alert_not_supported_title": "Сповіщення не підтримуються", "notifications_list_item": "Сповіщення", diff --git a/web/public/static/langs/zh_Hans.json b/web/public/static/langs/zh_Hans.json index 2db95f56..2c7618f6 100644 --- a/web/public/static/langs/zh_Hans.json +++ b/web/public/static/langs/zh_Hans.json @@ -15,8 +15,8 @@ "nav_button_publish_message": "发布通知", "nav_button_subscribe": "订阅主题", "nav_button_connecting": "正在连接", - "alert_grant_title": "已禁用通知", - "alert_grant_description": "授予浏览器显示桌面通知的权限。", + "alert_notification_permission_required_title": "已禁用通知", + "alert_notification_permission_required_description": "授予浏览器显示桌面通知的权限。", "alert_grant_button": "现在授予", "alert_not_supported_title": "不支持通知", "alert_not_supported_description": "您的浏览器不支持通知。", diff --git a/web/public/static/langs/zh_Hant.json b/web/public/static/langs/zh_Hant.json index aafc28e0..d971aa31 100644 --- a/web/public/static/langs/zh_Hant.json +++ b/web/public/static/langs/zh_Hant.json @@ -4,7 +4,7 @@ "action_bar_toggle_mute": "通知靜音/解除通知靜音", "action_bar_toggle_action_menu": "開啟/關閉操作選單", "message_bar_type_message": "在這輸入訊息", - "alert_grant_description": "允許瀏覽器權限以顯示桌面通知。", + "alert_notification_permission_required_description": "允許瀏覽器權限以顯示桌面通知。", "alert_grant_button": "允許", "notifications_list": "通知清單", "notifications_list_item": "通知", @@ -42,7 +42,7 @@ "nav_button_settings": "設定", "nav_button_subscribe": "訂閱主題", "nav_button_connecting": "連線中", - "alert_grant_title": "通知已關閉", + "alert_notification_permission_required_title": "通知已關閉", "alert_not_supported_title": "不支援通知", "alert_not_supported_description": "瀏覽器不支援通知。", "notifications_tags": "標籤", diff --git a/web/src/components/Navigation.jsx b/web/src/components/Navigation.jsx index a5852525..5c48a456 100644 --- a/web/src/components/Navigation.jsx +++ b/web/src/components/Navigation.jsx @@ -16,7 +16,7 @@ import { Tooltip, Typography, Box, - IconButton, + IconButton, Button } from "@mui/material"; import * as React from "react"; import { useContext, useState } from "react"; @@ -355,23 +355,17 @@ const SubscriptionItem = (props) => { const NotificationPermissionRequired = ({ refreshPermissions }) => { const { t } = useTranslation(); + const requestPermission = async () => { + await notifier.maybeRequestPermission(); + refreshPermissions(); + }; return ( - + {t("alert_notification_permission_required_title")} - - {/* component=Button is not an anchor, false positive */} - {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */} - { - await notifier.maybeRequestPermission(); - refreshPermissions(); - }} - > - {t("alert_notification_permission_required_description")} - - + {t("alert_notification_permission_required_description")} + ); }; @@ -389,13 +383,10 @@ const NotificationPermissionDeniedAlert = () => { const NotificationIOSInstallRequiredAlert = () => { const { t } = useTranslation(); return ( - <> - - {t("alert_notification_ios_install_required_title")} - {t("alert_notification_ios_install_required_description")} - - - + + {t("alert_notification_ios_install_required_title")} + {t("alert_notification_ios_install_required_description")} + ); };