Explorar el Código

displayed when the length of selectableUserGroups is greater than 0 & i18n

Shun Miyazawa hace 4 años
padre
commit
c64ec46d82

+ 1 - 0
packages/app/resource/locales/en_US/admin/admin.json

@@ -451,6 +451,7 @@
   },
   "user_group_management": {
     "create_group": "Create new group",
+    "add_child_group": "Add child group",
     "deny_create_group": "You can't create a new group with the current settings.",
     "group_name": "Group name",
     "group_example": "e.g. : Group1",

+ 1 - 0
packages/app/resource/locales/ja_JP/admin/admin.json

@@ -450,6 +450,7 @@
   },
   "user_group_management": {
     "create_group": "新規グループの作成",
+    "add_child_group": "子グループの追加",
     "deny_create_group": "新規グループの作成はできません。",
     "group_name": "グループ名",
     "group_example": "例: Group1",

+ 1 - 0
packages/app/resource/locales/zh_CN/admin/admin.json

@@ -460,6 +460,7 @@
   },
   "user_group_management": {
     "create_group": "创建新组",
+    "add_child_group": "添加一个子组",
     "deny_create_group": "不能用当前设置创建新组。",
     "group_name": "组名",
     "group_example": "e.g.:第1组",

+ 20 - 14
packages/app/src/components/Admin/UserGroupDetail/UserGroupDetailPage.tsx

@@ -148,30 +148,36 @@ const UserGroupDetailPage: FC = () => {
 
       <div className="dropdown">
         <button className="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown">
-          Add child group
+          {t('admin:user_group_management.add_child_group')}
         </button>
 
         <div className="dropdown-menu" aria-labelledby="dropdownMenuButton">
+
           {
-            selectableUserGroups.map(userGroup => (
-              <button
-                key={userGroup._id}
-                type="button"
-                className="dropdown-item"
-                onClick={() => onClickAddChildButton(userGroup)}
-              >
-                {userGroup.name}
-              </button>
-            ))
+            (selectableUserGroups != null && selectableUserGroups.length > 0) && (
+              <>
+                {
+                  selectableUserGroups.map(userGroup => (
+                    <button
+                      key={userGroup._id}
+                      type="button"
+                      className="dropdown-item"
+                      onClick={() => onClickAddChildButton(userGroup)}
+                    >
+                      {userGroup.name}
+                    </button>
+                  ))
+                }
+                <div className="dropdown-divider"></div>
+              </>
+            )
           }
 
-          <div className="dropdown-divider"></div>
-
           <button
             className="dropdown-item"
             type="button"
             onClick={() => onClickCreateGroupButton()}
-          >Create child group
+          >{t('admin:user_group_management.create_group')}
           </button>
         </div>
       </div>