2 files changed, 36 insertions, 38 deletions
diff --git a/FrontEnd/src/app/locales/en/translation.json b/FrontEnd/src/app/locales/en/translation.json
index 274d629b..63b2a1be 100644
--- a/FrontEnd/src/app/locales/en/translation.json
+++ b/FrontEnd/src/app/locales/en/translation.json
@@ -129,24 +129,6 @@
     "badCredential": "Username or password is invalid.",
     "alreadyLogin": "Already login! Redirect to home page in 3s!"
   },
-  "userPage": {
-    "dialogChangeNickname": {
-      "title": "Change Nickname",
-      "inputLabel": "New nickname"
-    },
-    "dialogChangeAvatar": {
-      "title": "Change Avatar",
-      "previewImgAlt": "preview",
-      "prompt": {
-        "select": "Please select a picture.",
-        "crop": "Please crop the picture.",
-        "processingCrop": "Cropping picture...",
-        "uploading": "Uploading...",
-        "preview": "Please preview avatar"
-      },
-      "upload": "upload"
-    }
-  },
   "settings": {
     "subheaders": {
       "account": "Account",
@@ -156,7 +138,8 @@
     "languageSecondary": "You language preference will be saved locally. Next time you visit this page, last language option will be used.",
     "changePassword": "Change account's password.",
     "logout": "Log out this account.",
-    "gotoSelf": "Click here to go to timeline of myself to change nickname and avatar.",
+    "changeAvatar": "Change avatar.",
+    "changeNickname": "Change nickname.",
     "dialogChangePassword": {
       "title": "Change Password",
       "prompt": "You are changing your password. You need to input the correct old password. After change, you need to login again and all old login will be invalid.",
@@ -170,6 +153,22 @@
     "dialogConfirmLogout": {
       "title": "Confirm Logout",
       "prompt": "Are you sure to log out? All cached data in the browser will be deleted."
+    },
+    "dialogChangeNickname": {
+      "title": "Change Nickname",
+      "inputLabel": "New nickname"
+    },
+    "dialogChangeAvatar": {
+      "title": "Change Avatar",
+      "previewImgAlt": "preview",
+      "prompt": {
+        "select": "Please select a picture.",
+        "crop": "Please crop the picture.",
+        "processingCrop": "Cropping picture...",
+        "uploading": "Uploading...",
+        "preview": "Please preview avatar"
+      },
+      "upload": "upload"
     }
   },
   "about": {
diff --git a/FrontEnd/src/app/locales/zh/translation.json b/FrontEnd/src/app/locales/zh/translation.json
index 759dc63c..296966c4 100644
--- a/FrontEnd/src/app/locales/zh/translation.json
+++ b/FrontEnd/src/app/locales/zh/translation.json
@@ -129,24 +129,6 @@
     "badCredential": "用户名或密码错误。",
     "alreadyLogin": "已经登陆，三秒后导航到首页！"
   },
-  "userPage": {
-    "dialogChangeNickname": {
-      "title": "更改昵称",
-      "inputLabel": "新昵称"
-    },
-    "dialogChangeAvatar": {
-      "title": "修改头像",
-      "previewImgAlt": "预览",
-      "prompt": {
-        "select": "请选择一个图片",
-        "crop": "请裁剪图片",
-        "processingCrop": "正在裁剪图片",
-        "uploading": "正在上传",
-        "preview": "请预览图片"
-      },
-      "upload": "上传"
-    }
-  },
   "settings": {
     "subheaders": {
       "account": "账户",
@@ -156,7 +138,8 @@
     "languageSecondary": "您的语言偏好将会存储在本地，下次浏览时将自动使用上次保存的语言选项。",
     "changePassword": "更改账号的密码。",
     "logout": "注销此账号。",
-    "gotoSelf": "点击前往个人时间线修改昵称和头像！",
+    "changeAvatar": "更改头像。",
+    "changeNickname": "更改昵称。",
     "dialogChangePassword": {
       "title": "修改密码",
       "prompt": "您正在修改密码，您需要输入正确的旧密码。成功修改后您需要重新登陆，而且以前所有的登录都会失效。",
@@ -170,6 +153,22 @@
     "dialogConfirmLogout": {
       "title": "确定注销",
       "prompt": "您确定注销此账号？这将删除所有已经缓存在浏览器的数据。"
+    },
+    "dialogChangeNickname": {
+      "title": "更改昵称",
+      "inputLabel": "新昵称"
+    },
+    "dialogChangeAvatar": {
+      "title": "修改头像",
+      "previewImgAlt": "预览",
+      "prompt": {
+        "select": "请选择一个图片",
+        "crop": "请裁剪图片",
+        "processingCrop": "正在裁剪图片",
+        "uploading": "正在上传",
+        "preview": "请预览图片"
+      },
+      "upload": "上传"
     }
   },
   "about": {