From a7b72a6b7c47762dd1a261c5fbd53bc65bd719d7 Mon Sep 17 00:00:00 2001
From: Kailash Nadh <kailash@nadh.in>
Date: Sun, 31 Jan 2021 13:38:35 +0530
Subject: [PATCH] Fix broken i18n language keys

---
 cmd/public.go                         | 4 ++--
 frontend/src/views/SubscriberForm.vue | 4 ++--
 i18n/en.json                          | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cmd/public.go b/cmd/public.go
index a21e1b2..8062a96 100644
--- a/cmd/public.go
+++ b/cmd/public.go
@@ -244,7 +244,7 @@ func handleOptinPage(c echo.Context) error {
 		}
 
 		return c.Render(http.StatusOK, tplMessage,
-			makeMsgTpl(app.i18n.T("public.subsConfirmedTitle"), "",
+			makeMsgTpl(app.i18n.T("public.subConfirmedTitle"), "",
 				app.i18n.Ts("public.subConfirmed")))
 	}
 
@@ -291,7 +291,7 @@ func handleSubscriptionForm(c echo.Context) error {
 	}
 
 	return c.Render(http.StatusOK, tplMessage,
-		makeMsgTpl(app.i18n.T("public.subsConfirmedTitle"), "",
+		makeMsgTpl(app.i18n.T("public.subConfirmedTitle"), "",
 			app.i18n.Ts("public.subConfirmed")))
 }
 
diff --git a/frontend/src/views/SubscriberForm.vue b/frontend/src/views/SubscriberForm.vue
index 0a5918f..7aab45b 100644
--- a/frontend/src/views/SubscriberForm.vue
+++ b/frontend/src/views/SubscriberForm.vue
@@ -23,9 +23,9 @@
             :placeholder="$t('globals.fields.name')"></b-input>
         </b-field>
 
-        <b-field :label="Status" label-position="on-border"
+        <b-field :label="$t('globals.fields.status')" label-position="on-border"
           :message="$t('subscribers.blocklistedHelp')">
-          <b-select v-model="form.status" placeholder="Status" required>
+          <b-select v-model="form.status" :placeholder="$t('globals.fields.status')" required>
             <option value="enabled">{{ $t('subscribers.status.enabled') }}</option>
             <option value="blocklisted">{{ $t('subscribers.status.blocklisted') }}</option>
           </b-select>
diff --git a/i18n/en.json b/i18n/en.json
index f5b2018..f7fe4cb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,6 +2,7 @@
     "_.code": "en",
     "_.name": "English (en)",
     "admin.errorMarshallingConfig": "Error marshalling config: {error}",
+    "campaigns.addAltText": "Add alternate plain text message",
     "campaigns.cantUpdate": "Cannot update a running or a finished campaign.",
     "campaigns.clicks": "Clicks",
     "campaigns.confirmDelete": "Delete {name}",
@@ -37,13 +38,12 @@
     "campaigns.onlyPausedDraft": "Only paused campaigns and drafts can be started.",
     "campaigns.onlyScheduledAsDraft": "Only scheduled campaigns can be saved as drafts.",
     "campaigns.pause": "Pause",
-    "campaigns.addAltText": "Add alternate plain text message",
-    "campaigns.removeAltText": "Remove alternate plain text message",
     "campaigns.plainText": "Plain text",
     "campaigns.preview": "Preview",
     "campaigns.progress": "Progress",
     "campaigns.queryPlaceholder": "Name or subject",
     "campaigns.rawHTML": "Raw HTML",
+    "campaigns.removeAltText": "Remove alternate plain text message",
     "campaigns.richText": "Rich text",
     "campaigns.schedule": "Schedule campaign",
     "campaigns.scheduled": "Scheduled",
@@ -402,6 +402,7 @@
     "subscribers.reset": "Reset",
     "subscribers.selectAll": "Select all {num}",
     "subscribers.status.blocklisted": "Blocklisted",
+    "subscribers.status.confirmed": "Confirmed",
     "subscribers.status.enabled": "Enabled",
     "subscribers.status.subscribed": "Subscribed",
     "subscribers.status.unconfirmed": "Unconfirmed",