122299 fix json

apps/app/public/static/locales/en_US/translation.json

@@ -445,12 +445,6 @@
     "file_upload_succeeded": "File upload succeeded.",
     "file_upload_failed": "File upload failed.",
     "initialize_successed": "Succeeded to initialize {{target}}",
-    "grant_user_admin": "Succeeded to grant {{username}} admin",
-    "revoke_user_admin": "Succeeded to revoke {{username}} admin",
-    "activate_user_success": "Succeeded to activating {{username}}",
-    "deactivate_user_success": "Succeeded to deactivate {{username}}",
-    "remove_user_success": "Succeeded to removing {{username}}",
-    "remove_external_user_success": "Succeeded to remove {{accountId}}",
     "remove_share_link_success": "Succeeded to remove {{shareLinkId}}",
     "issue_share_link": "Succeeded to issue new share link",
     "remove_share_link": "Succeeded to remove {{count}} share links",

apps/app/public/static/locales/ja_JP/admin.json

@@ -752,7 +752,7 @@
       "deactivate_account": "アカウント停止",
       "your_own": "自分自身のアカウントを停止することはできません",
       "revoke_admin_access": "管理者から外す",
-      "cannot_remove": "自分自身を管理者から外すことはできません",
+      "cannot_revoke": "自分自身を管理者から外すことはできません",
       "grant_admin_access": "管理者にする",
       "revoke_read_only_access": "閲覧のみアクセス権を外す",
       "grant_read_only_access": "閲覧のみアクセス権を付与する",

apps/app/public/static/locales/ja_JP/translation.json

@@ -478,12 +478,6 @@
     "file_upload_succeeded": "ファイルをアップロードしました",
     "file_upload_failed": "ファイルのアップロードに失敗しました",
     "initialize_successed": "{{target}}を初期化しました",
-    "grant_user_admin": "{{username}}を管理者に設定しました",
-    "revoke_user_admin": "{{username}}を管理者から外しました",
-    "activate_user_success": "{{username}}を有効化しました",
-    "deactivate_user_success": "{{username}}を無効化しました",
-    "remove_user_success": "{{username}}を削除しました",
-    "remove_external_user_success": "{{accountId}}を削除しました",
     "remove_share_link_success": "{{shareLinkId}}を削除しました",
     "issue_share_link": "共有リンクを作成しました",
     "remove_share_link": "共有リンクを{{count}}件削除しました",

apps/app/public/static/locales/zh_CN/admin.json

@@ -752,7 +752,7 @@
       "deactivate_account": "停用帐户",
       "your_own": "您不能停用自己的帐户",
       "revoke_admin_access": "删除管理员访问权限",
-      "cannot_remove": "您不能从管理员中删除自己",
+      "cannot_revoke": "您不能从管理员中删除自己",
       "grant_admin_access": "授予管理员访问权限",
       "revoke_read_only_access": "取消只读访问",
       "grant_read_only_access": "给予只读权限",

apps/app/public/static/locales/zh_CN/translation.json

@@ -434,12 +434,6 @@
     "file_upload_succeeded": "文件上传成功",
     "file_upload_failed": "文件上传失败",
     "initialize_successed": "Succeeded to initialize {{target}}",
-		"grant_user_admin": "Succeeded to grant {{username}} admin",
-    "revoke_user_admin": "Succeeded to revoke {{username}} admin ",
-		"activate_user_success": "Succeeded to activating {{username}}",
-		"deactivate_user_success": "Succeeded to deactivate {{username}}",
-		"remove_user_success": "Succeeded to removing {{username}} ",
-    "remove_external_user_success": "Succeeded to remove {{accountId}} ",
     "switch_disable_link_sharing_success": "成功更新分享链接设置",
     "failed_to_reset_password":"Failed to reset password",
     "save_succeeded": "已成功保存",

apps/app/src/server/models/user.js

@@ -265,18 +265,18 @@ module.exports = function(crowi) {
     });
   };
 
-  userSchema.methods.revokeAdmin = async function() {
-    logger.debug('Revove admin', this);
-    this.admin = 0;
-    return this.save();
-  };
-
   userSchema.methods.grantAdmin = async function() {
     logger.debug('Grant Admin', this);
     this.admin = 1;
     return this.save();
   };
 
+  userSchema.methods.revokeAdmin = async function() {
+    logger.debug('Revove admin', this);
+    this.admin = 0;
+    return this.save();
+  };
+
   userSchema.methods.grantReadOnly = async function() {
     logger.debug('Grant read only access', this);
     this.readOnly = 1;

apps/app/src/server/routes/apiv3/users.js

@@ -529,7 +529,7 @@ module.exports = (crowi) => {
 
     try {
       const userData = await User.findById(id);
-      await userData.revokeFromAdmin();
+      await userData.revokeAdmin();
 
       const serializedUserData = serializeUserSecurely(userData);