Merge branch 'main' into fet980-ownership-tab

ensdomains · Sep 23, 2023 · 8208ef2 · 8208ef2
2 parents 770b34e + 07f8f25
commit 8208ef2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/public/locales/zh/common.json b/public/locales/zh/common.json
@@ -87,6 +87,7 @@
   "name": {
     "registered": "已注册",
     "expires": "到期时间",
+    "graceEnd": "宽限期结束",
     "noExpiry": "无限期",
     "expiry": "到期",
     "parent": "父名称",
@@ -184,6 +185,7 @@
       "updateResolver": "更新解析器",
       "updateProfile": "更新个人资料",
       "setPrimaryName": "设置主名称",
+      "resetPrimaryName": "移除主名称",
       "updateEthAddress": "更新 ETH 地址",
       "testSendName": "发送名称",
       "burnFuses": "烧毁权限",
@@ -197,6 +199,7 @@
       "clearRecords": "清除记录",
       "updateRecords": "更新记录",
       "transferName": "转移名称",
+      "transferSubname": "转移子名称",
       "changePermissions": "更改权限",
       "syncManager": "同步管理员",
       "updateProfileRecords": "更新个人资料",
@@ -209,7 +212,6 @@
       "migrateProfileWithReset": "将现有记录设置到新的解析器上",
       "migrateProfileWithSync": "将现有记录设置到新的解析器上",
       "migrateProfileWithEthAddress": "在新解析器上设置现有记录和 ETH 地址",
-      "wrapName2": "包装名称并设置解析器",
       "wrapName": "包装该名称",
       "updateResolver": "将解析器更改为",
       "updateProfile": "更新现有解析器上的记录",
@@ -342,7 +344,7 @@
     "empty": "未找到选项"
   },
   "testnetFaucet": {
-    "explanation": "Goerli 上的每个地址都可以申请 {{amount}} ETH 来测试 ENS 管理器 app 以及所有新合约。",
+    "explanation": "{{ testnet }} 上的每个地址都可以申请 {{amount}} {{ ticker }} 来进行 ENS 管理器 app 或其他网络测试。",
     "note": "它可能在几分钟后才能出现在你的钱包里。"
   }
 }
diff --git a/public/locales/zh/register.json b/public/locales/zh/register.json
@@ -60,13 +60,16 @@
             "items": {
               "com.twitter": "Twitter",
               "com.github": "GitHub",
-              "com.discord": "Discord"
+              "com.discord": "Discord",
+              "org.telegram": "Telegram",
+              "email": "Email"
             },
             "placeholder": {
-              "com.twitter": "例如 nicksdjohnson",
-              "com.github": "例如 arachnid",
+              "com.twitter": "例如 ensdomains",
+              "com.github": "例如 ensdomains",
               "com.discord": "例如 nickjohnson",
-              "org.telegram": "e.g. nicksdjohnson"
+              "org.telegram": "例如 nicksdjohnson",
+              "email": "例如 [email protected]"
             }
           },
           "address": {

diff --git a/public/locales/zh/transactionFlow.json b/public/locales/zh/transactionFlow.json
@@ -55,7 +55,9 @@
             "default": "在此添加用户名",
             "com.twitter": "例如 nicksdjohnson",
             "com.github": "例如 arachnid",
-            "com.discord": "例如 nickjohnson"
+            "com.discord": "例如 nickjohnson",
+            "org.telegram": "例如 nicksdjohnson",
+            "email": "例如 [email protected]"
           }
         },
         "address": {
@@ -293,6 +295,10 @@
       "title": "不能重新创建该子名称",
       "message": "删除该子名称意味着不能再使用或重新创建它，一直到它过期 {{date}}。由于父名称控制权限已被撤销，因此该操作也无法撤消。"
     },
+    "deleteSubnameNotParentWarning": {
+      "title": "不能重新创建该子名称",
+      "message": "只有父名称(<b>{{parentOwner}}</b>) 的 {{ownershipTerm}} 可以重新创建该子名称。如果该子名称被删除，您将无法自己重新创建它。"
+    },
     "selectPrimaryName": {
       "title": "选择一个主名称",
       "errors": {
@@ -339,6 +345,10 @@
         "title": "未经授权的解析器",
         "description": "要使用此名称作为您的主名称，您需要先设置一个有效的解析器并更新该名称的 ETH 地址记录。"
       }     
+    },
+    "multiStepSubnameDelete": {
+      "title": "删除子名称",
+      "description": "删除该子名称需要执行多次交易"
     }
   },
   "errors": {

diff --git a/src/layouts/Basic.tsx b/src/layouts/Basic.tsx
@@ -69,6 +69,7 @@ export const Basic = withErrorBoundary(({ children }: { children: React.ReactNod
   const { boot } = useIntercom()
 
   useEffect(() => {
+    // Do not initialise with uid and email without implementing identity verification first
     boot()
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])