Merge branch 'imprv/integrate-customize-user-page-delete' into imprv/105325-117014-delete-completely-user-page

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

@@ -45,6 +45,11 @@
     "admin_only": "Admin only",
     "admin_and_author": "Admin and author",
     "anyone": "Anyone",
+    "user_home_page_deletion": {
+      "user_home_page_deletion": "User home page deletion",
+      "enable_user_home_page_deletion": "Enable user home page deletion",
+      "when_deleting_a_user_the_user_home_page_is_also_deleted": "When deleting a user, the user home page is also deleted."
+    },
     "session": "Session",
     "max_age": "Max age (msec)",
     "max_age_desc": "Specifies the number (in milliseconds) to expire users session.<br>Default: 2592000000 (30days)",

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

@@ -53,6 +53,11 @@
     "admin_only": "管理者のみ可能",
     "admin_and_author": "管理者とページ作者が可能",
     "anyone": "誰でも可能",
+    "user_home_page_deletion": {
+      "user_home_page_deletion": "ユーザーページの削除",
+      "enable_user_home_page_deletion": "ユーザーページの削除を有効化",
+      "when_deleting_a_user_the_user_home_page_is_also_deleted": "ユーザー削除時にユーザーページも削除します。"
+    },
     "session": "セッション",
     "max_age": "有効期間 (ミリ秒)",
     "max_age_desc": "ユーザーのセッション情報の有効期間をミリ秒で指定できます。<br>デフォルト値: 2592000000 (30日間)",

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

@@ -53,6 +53,11 @@
 		"admin_only": "仅管理员",
 		"admin_and_author": "管理员|作者",
 		"anyone": "任何人",
+    "user_home_page_deletion": {
+      "user_home_page_deletion": "删除用户页面",
+      "enable_user_home_page_deletion": "启用删除用户页面",
+      "when_deleting_a_user_the_user_home_page_is_also_deleted": "当一个用户被删除时，用户页面也会被删除。"
+    },
     "session": "会议",
     "max_age": "有效期间  (msec)",
     "max_age_desc": "指定使用户会话过期的数量(以毫秒为单位)。<br>默认值: 2592000000 (30天)",

apps/app/src/components/Admin/Security/SecuritySetting.jsx

@@ -453,7 +453,7 @@ class SecuritySetting extends React.Component {
           ].map(arr => this.renderPageDeletePermission(arr[0], arr[1], arr[2], arr[3]))
         }
 
-        <h4>ユーザーページの削除</h4>
+        <h4>{t('security_settings.user_home_page_deletion.user_home_page_deletion')}</h4>
         <div className="row mb-4">
           <div className="col-6 offset-3">
             <div className="custom-control custom-switch custom-checkbox-success">
@@ -465,10 +465,13 @@ class SecuritySetting extends React.Component {
                 onChange={() => { adminGeneralSecurityContainer.switchIsUsersHomePageDeletionEnabled() }}
               />
               <label className="custom-control-label" htmlFor="is-user-page-deletion-enabled">
-                無効化 / 有効化
+                {t('security_settings.user_home_page_deletion.enable_user_home_page_deletion')}
               </label>
             </div>
-            <p className="form-text text-muted small" dangerouslySetInnerHTML={{ __html: 'ユーザー削除時にユーザーページも削除します。' }} />
+            <p
+              className="form-text text-muted small"
+              dangerouslySetInnerHTML={{ __html: t('security_settings.user_home_page_deletion.when_deleting_a_user_the_user_home_page_is_also_deleted') }}
+            />
           </div>
         </div>