From d2f933e15f51d6852af8af44ddadc2c90b3ac108 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Fri, 8 Apr 2022 12:45:41 -0400
Subject: [PATCH] Fix English language strings, as per #203

---
 docs/releases.md                |  6 +++++-
 web/public/static/langs/en.json | 20 ++++++++++----------
 web/src/app/Connection.js       |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/docs/releases.md b/docs/releases.md
index a06a9c31..524152dc 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -6,11 +6,15 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
 
 ## ntfy server v1.21.0 (UNRELEASED)
 
-**Features:**:
+**Features:**
 
 * Added ARMv6 build ([#200](https://github.com/binwiederhier/ntfy/issues/200), thanks to [@jcrubioa](https://github.com/jcrubioa) for reporting)
 * Web app internationalization support ([#189](https://github.com/binwiederhier/ntfy/issues/189))
 
+**Bugs:**
+
+* Web app: English language strings fixes ([#203](https://github.com/binwiederhier/ntfy/issues/203), thanks to [@StoyanDimitrov](https://github.com/StoyanDimitrov))
+
 -->
 
 ## ntfy Android app v1.11.0
diff --git a/web/public/static/langs/en.json b/web/public/static/langs/en.json
index ba226435..07aaff56 100644
--- a/web/public/static/langs/en.json
+++ b/web/public/static/langs/en.json
@@ -4,12 +4,12 @@
   "action_bar_clear_notifications": "Clear all notifications",
   "action_bar_unsubscribe": "Unsubscribe",
   "message_bar_type_message": "Type a message here",
-  "message_bar_error_publishing": "Error publishing message",
+  "message_bar_error_publishing": "Error publishing notification",
   "nav_topics_title": "Subscribed topics",
   "nav_button_all_notifications": "All notifications",
   "nav_button_settings": "Settings",
   "nav_button_documentation": "Documentation",
-  "nav_button_publish_message": "Publish message",
+  "nav_button_publish_message": "Publish notification",
   "nav_button_subscribe": "Subscribe to topic",
   "alert_grant_title": "Notifications are disabled",
   "alert_grant_description": "Grant your browser permission to display desktop notifications.",
@@ -36,15 +36,15 @@
   "notifications_no_subscriptions_description": "Click the \"Add subscription\" link to create or subscribe to a topic. After that, you can send messages via PUT or POST and you'll receive notifications here.",
   "notifications_example": "Example",
   "notifications_more_details": "For more information, check out the <websiteLink>website</websiteLink> or <docsLink>documentation</docsLink>.",
-  "notifications_loading": "Loading notifications ...",
+  "notifications_loading": "Loading notifications …",
   "publish_dialog_title_topic": "Publish to {{topic}}",
-  "publish_dialog_title_no_topic": "Publish message",
-  "publish_dialog_progress_uploading": "Uploading ...",
-  "publish_dialog_progress_uploading_detail": "Uploading {{loaded}}/{{total}} ({{percent}}%) ...",
-  "publish_dialog_message_published": "Message published",
+  "publish_dialog_title_no_topic": "Publish notification",
+  "publish_dialog_progress_uploading": "Uploading …",
+  "publish_dialog_progress_uploading_detail": "Uploading {{loaded}}/{{total}} ({{percent}}%) …",
+  "publish_dialog_message_published": "Notification published",
   "publish_dialog_attachment_limits_file_and_quota_reached": "exceeds {{fileSizeLimit}} file limit and quota, {{remainingBytes}} remaining",
   "publish_dialog_attachment_limits_file_reached": "exceeds {{fileSizeLimit}} file limit",
-  "publish_dialog_attachment_limits_quota_reached": "exceeds quota,{{remainingBytes}} remaining",
+  "publish_dialog_attachment_limits_quota_reached": "exceeds quota, {{remainingBytes}} remaining",
   "publish_dialog_priority_min": "Min. priority",
   "publish_dialog_priority_low": "Low priority",
   "publish_dialog_priority_default": "Default priority",
@@ -64,7 +64,7 @@
   "publish_dialog_click_label": "Click URL",
   "publish_dialog_click_placeholder": "URL that is opened when notification is clicked",
   "publish_dialog_email_label": "Email",
-  "publish_dialog_email_placeholder": "Address to forward the message to, e.g. phil@example.com",
+  "publish_dialog_email_placeholder": "Address to forward the notification to, e.g. phil@example.com",
   "publish_dialog_attach_label": "Attachment URL",
   "publish_dialog_attach_placeholder": "Attach file by URL, e.g. https://f-droid.org/F-Droid.apk",
   "publish_dialog_filename_label": "Filename",
@@ -135,5 +135,5 @@
   "error_boundary_description": "This should obviously not happen. Very sorry about this.<br/>If you have a minute, please <githubLink>report this on GitHub</githubLink>, or let us know via <discordLink>Discord</discordLink> or <matrixLink>Matrix</matrixLink>.",
   "error_boundary_button_copy_stack_trace": "Copy stack trace",
   "error_boundary_stack_trace": "Stack trace",
-  "error_boundary_gathering_info": "Gather more info ..."
+  "error_boundary_gathering_info": "Gather more info …"
 }
diff --git a/web/src/app/Connection.js b/web/src/app/Connection.js
index fbc54cc0..55778023 100644
--- a/web/src/app/Connection.js
+++ b/web/src/app/Connection.js
@@ -71,7 +71,7 @@ class Connection {
                 this.onStateChanged(this.subscriptionId, ConnectionState.Connecting);
             }
         };
-        this.ws.onerrgoogle.ccor = (event) => {
+        this.ws.onerror = (event) => {
             console.log(`[Connection, ${this.shortUrl}, ${this.connectionId}] Error occurred: ${event}`, event);
         };
     }