feat: restructure translations

getAlby · Sep 18, 2023 · 56b6278 · 56b6278
1 parent bb39069
commit 56b6278
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 32 deletions.
diff --git a/src/app/components/Enable/AlbyEnable.tsx b/src/app/components/Enable/AlbyEnable.tsx
@@ -46,7 +46,7 @@ function AlbyEnableComponent(props: Props) {
       domain: props.origin.domain,
       host: props.origin.host,
     });
-    alert(tCommon("block_added", { host: props.origin.host }));
+    alert(tCommon("enable.block_added", { host: props.origin.host }));
     msg.error(USER_REJECTED_ERROR);
   }
 
@@ -63,13 +63,11 @@ function AlbyEnableComponent(props: Props) {
           />
 
           <div className="dark:text-white pt-6">
-            <p className="mb-2">{tCommon("allow")}</p>
+            <p className="mb-2">{tCommon("enable.allow")}</p>
 
             <div className="mb-2 flex items-center">
               <CheckIcon className="w-5 h-5 mr-2" />
-              <p className="dark:text-white">
-                {tCommon("request_transaction_approval")}
-              </p>
+              <p className="dark:text-white">{tCommon("enable.request1")}</p>
             </div>
             <div className="mb-2 flex items-center">
               <CheckIcon className="w-5 h-5 mr-2" />
@@ -90,7 +88,7 @@ function AlbyEnableComponent(props: Props) {
             href="#"
             onClick={block}
           >
-            {tCommon("actions.block_and_ignore", { host: props.origin.host })}
+            {tCommon("enable.block_and_ignore", { host: props.origin.host })}
           </a>
         </div>
       </Container>

diff --git a/src/app/components/Enable/LiquidEnable.tsx b/src/app/components/Enable/LiquidEnable.tsx
@@ -46,7 +46,7 @@ function LiquidEnableComponent(props: Props) {
       domain: props.origin.domain,
       host: props.origin.host,
     });
-    alert(tCommon("block_added", { host: props.origin.host }));
+    alert(tCommon("enable.block_added", { host: props.origin.host }));
     msg.error(USER_REJECTED_ERROR);
   }
 
@@ -63,13 +63,11 @@ function LiquidEnableComponent(props: Props) {
           />
 
           <div className="dark:text-white pt-6">
-            <p className="mb-2">{tCommon("allow")}</p>
+            <p className="mb-2">{tCommon("enable.allow")}</p>
 
             <div className="mb-2 flex items-center">
               <CheckIcon className="w-5 h-5 mr-2" />
-              <p className="dark:text-white">
-                {tCommon("request_transaction_approval")}
-              </p>
+              <p className="dark:text-white">{tCommon("enable.request1")}</p>
             </div>
             <div className="mb-2 flex items-center">
               <CheckIcon className="w-5 h-5 mr-2" />
@@ -90,7 +88,7 @@ function LiquidEnableComponent(props: Props) {
             href="#"
             onClick={block}
           >
-            {tCommon("actions.block_and_ignore", { host: props.origin.host })}
+            {tCommon("enable.block_and_ignore", { host: props.origin.host })}
           </a>
         </div>
       </Container>

diff --git a/src/app/components/Enable/NostrEnable.tsx b/src/app/components/Enable/NostrEnable.tsx
@@ -46,7 +46,7 @@ function NostrEnableComponent(props: Props) {
       domain: props.origin.domain,
       host: props.origin.host,
     });
-    alert(tCommon("block_added", { host: props.origin.host }));
+    alert(tCommon("enable.block_added", { host: props.origin.host }));
     msg.error(USER_REJECTED_ERROR);
   }
 
@@ -63,7 +63,7 @@ function NostrEnableComponent(props: Props) {
           />
 
           <div className="dark:text-white pt-6">
-            <p className="mb-2">{tCommon("allow")}</p>
+            <p className="mb-2">{tCommon("enable.allow")}</p>
 
             <div className="mb-2 flex items-center">
               <CheckIcon className="w-5 h-5 mr-2" />
@@ -88,7 +88,7 @@ function NostrEnableComponent(props: Props) {
             href="#"
             onClick={block}
           >
-            {tCommon("actions.block_and_ignore", { host: props.origin.host })}
+            {tCommon("enable.block_and_ignore", { host: props.origin.host })}
           </a>
         </div>
       </Container>

diff --git a/src/app/components/Enable/WebbtcEnable.tsx b/src/app/components/Enable/WebbtcEnable.tsx
@@ -46,7 +46,7 @@ function WebbtcEnableComponent(props: Props) {
       domain: props.origin.domain,
       host: props.origin.host,
     });
-    alert(tCommon("block_added", { host: props.origin.host }));
+    alert(tCommon("enable.block_added", { host: props.origin.host }));
     msg.error(USER_REJECTED_ERROR);
   }
 
@@ -63,13 +63,11 @@ function WebbtcEnableComponent(props: Props) {
           />
 
           <div className="dark:text-white pt-6">
-            <p className="mb-2">{tCommon("allow")}</p>
+            <p className="mb-2">{tCommon("enable.allow")}</p>
 
             <div className="mb-2 flex items-center">
               <CheckIcon className="w-5 h-5 mr-2" />
-              <p className="dark:text-white">
-                {tCommon("request_transaction_approval")}
-              </p>
+              <p className="dark:text-white">{tCommon("enable.request1")}</p>
             </div>
             <div className="mb-2 flex items-center">
               <CheckIcon className="w-5 h-5 mr-2" />
@@ -90,7 +88,7 @@ function WebbtcEnableComponent(props: Props) {
             href="#"
             onClick={block}
           >
-            {tCommon("actions.block_and_ignore", { host: props.origin.host })}
+            {tCommon("enable.block_and_ignore", { host: props.origin.host })}
           </a>
         </div>
       </Container>

diff --git a/src/app/components/Enable/WeblnEnable.tsx b/src/app/components/Enable/WeblnEnable.tsx
@@ -46,7 +46,7 @@ function WeblnEnableComponent(props: Props) {
       domain: props.origin.domain,
       host: props.origin.host,
     });
-    alert(tCommon("block_added", { host: props.origin.host }));
+    alert(tCommon("enable.block_added", { host: props.origin.host }));
     msg.error(USER_REJECTED_ERROR);
   }
 
@@ -63,13 +63,11 @@ function WeblnEnableComponent(props: Props) {
           />
 
           <div className="dark:text-white pt-6">
-            <p className="mb-2">{tCommon("allow")}</p>
+            <p className="mb-2">{tCommon("enable.allow")}</p>
 
             <div className="mb-2 flex items-center">
               <CheckIcon className="w-5 h-5 mr-2" />
-              <p className="dark:text-white">
-                {tCommon("request_transaction_approval")}
-              </p>
+              <p className="dark:text-white">{tCommon("enable.request1")}</p>
             </div>
             <div className="mb-2 flex items-center">
               <CheckIcon className="w-5 h-5 mr-2" />
@@ -90,7 +88,7 @@ function WeblnEnableComponent(props: Props) {
             href="#"
             onClick={block}
           >
-            {tCommon("actions.block_and_ignore", { host: props.origin.host })}
+            {tCommon("enable.block_and_ignore", { host: props.origin.host })}
           </a>
         </div>
       </Container>

diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
@@ -971,7 +971,6 @@
     }
   },
   "common": {
-    "allow": "Allow this website to:",
     "password": "Password",
     "confirm_password": "Confirm Password",
     "advanced": "Advanced",
@@ -998,8 +997,6 @@
     "help": "Help",
     "balance": "Balance",
     "or": "or",
-    "block_added": "Added {{host}} to the blocklist, please reload the website.",
-    "request_transaction_approval": "Request approval for transactions",
     "actions": {
       "back": "Back",
       "delete": "Delete",
@@ -1032,8 +1029,7 @@
       "more": "More",
       "disconnect": "Disconnect",
       "review": "Review",
-      "download": "Download",
-      "block_and_ignore": "Block and ignore {{host}}"
+      "download": "Download"
     },
     "connectors": {
       "lnd": "LND",
@@ -1056,6 +1052,12 @@
       "between": "between {{min}} and {{max}}",
       "lessThanOrEqual": "≤ {{max}}",
       "greaterOrEqual": "≥ {{min}}"
+    },
+    "enable": {
+      "allow": "Allow this website to:",
+      "block_added": "Added {{host}} to the blocklist, please reload the website.",
+      "request1": "Request approval for transactions",
+      "block_and_ignore": "Block and ignore {{host}}"
     }
   },
   "components": {