Family member list

src/main/webapp/app/entities/club-family/family-member-create.tsx

@@ -49,7 +49,7 @@ export class FamilyMemberCreate extends React.Component<IFamilyMemberCreateProps
 
   renderNames(users: readonly IUser[]): ReactNode {
     return users && users.length <= 0 ? (
-      <option disabled>{translate('error.userNotFound')}</option>
+      <option disabled>{translate('error.noUserFound')}</option>
     ) : (
       users.map((user: IUser) => {
         if (user) {
@@ -110,7 +110,7 @@ export class FamilyMemberCreate extends React.Component<IFamilyMemberCreateProps
         <Row className="justify-content-center">
           <Col md="8">
             <h2>
-              <Translate contentKey="clubmanagementApp.clubFamily.member.createLabel">Add Family Member</Translate>
+              <Translate contentKey="clubmanagementApp.clubFamily.member.createOrEditLabel">Add or edit a CC Family Member</Translate>
             </h2>
           </Col>
         </Row>

src/main/webapp/app/entities/club-family/family-member.tsx

@@ -104,7 +104,7 @@ class FamilyMember extends React.Component<IFamilyMemberProps, IFamilyMemberStat
             </div>
           ) : (
             <div className="alert alert-warning my-3">
-              <Translate contentKey="clubmanagementApp.clubFamily.member.notFound">No Event Activities found</Translate>
+              <Translate contentKey="clubmanagementApp.clubFamily.member.notFound">No CC Family Member found</Translate>
             </div>
           )}
         </div>

src/main/webapp/app/shared/components/advancedSearchModal/advancedSearchModal.tsx

@@ -41,7 +41,12 @@ class AdvancedSearchModal extends React.Component<IFilterSearchBarProps, IAdvanc
     }
   }
 
-  renderYearSessionOptions = () => this.props.yearSessionOptions.map(year => <option key={year}>{year}</option>);
+  renderYearSessionOptions = () =>
+    this.props.yearSessionOptions.map(year => (
+      <option key={year} value={year}>
+        {year}
+      </option>
+    ));
 
   renderCourseProgramOptions = () =>
     this.props.courseProgramOptions.map(course => (

src/main/webapp/i18n/en/clubFamily.json

@@ -3,8 +3,8 @@
     "clubFamily": {
       "home": {
         "title": "CC Family",
-        "createLabel": "Create a new Club Family",
-        "createOrEditLabel": "Create or edit a Club Family",
+        "createLabel": "Create a new CC Family",
+        "createOrEditLabel": "Create or edit a CC Family",
         "notFound": "No CC Family found"
       },
       "member": {
@@ -13,11 +13,11 @@
         "createOrEditLabel": "Add or edit a CC Family Member",
         "notFound": "No CC Family Member found"
       },
-      "created": "A new Club Family is created with identifier {{ param }}",
-      "updated": "A Club Family is updated with identifier {{ param }}",
-      "deleted": "A Club Family is deleted with identifier {{ param }}",
+      "created": "A new CC Family is created with identifier {{ param }}",
+      "updated": "A CC Family is updated with identifier {{ param }}",
+      "deleted": "A CC Family is deleted with identifier {{ param }}",
       "delete": {
-        "question": "Are you sure you want to delete Club Family {{ id }}?"
+        "question": "Are you sure you want to delete CC Family {{ id }}?"
       },
       "detail": {
         "title": "CC Family"

src/main/webapp/i18n/en/global.json

@@ -166,8 +166,8 @@
     "idexists": "A new {{ entityName }} cannot already have an ID",
     "noname": "A new {{ entityName }} cannot be created without a name",
     "idnull": "Invalid ID",
-    "resultNotFound": "No result found",
-    "userNotFound": "No user found"
+    "noResultFound": "No result found",
+    "noUserFound": "No user found"
   },
   "footer": "ThirdCC @ 2020"
 }

src/main/webapp/i18n/zh-cn/clubFamily.json

@@ -13,14 +13,14 @@
         "createOrEditLabel": "添加或编辑CC家族成员",
         "notFound": "未发现任何CC家族成员"
       },
-      "created": "Club Family {{ param }} 创建成功",
-      "updated": "Club Family {{ param }} 更新成功",
-      "deleted": "Club Family {{ param }} 删除成功",
+      "created": "CC家族 {{ param }} 创建成功",
+      "updated": "CC家族 {{ param }} 更新成功",
+      "deleted": "CC家族 {{ param }} 删除成功",
       "delete": {
-        "question": "你确定要删除 Club Family {{ id }} 吗？"
+        "question": "你确定要删除 CC家族 {{ id }} 吗？"
       },
       "detail": {
-        "title": "Club Family"
+        "title": "CC家族"
       },
       "name": "名称",
       "slogan": "口号",
@@ -39,7 +39,7 @@
       },
       "kongque": {
         "name": "孔雀鱼",
-        "slogan": "我们是比精英中的精英还要更精英的精英",
+        "slogan": "我们是比精英中的精英还要精英的精英",
         "description": "孔雀家的鱼儿都是棒棒哒"
       },
       "qicai": {

src/main/webapp/i18n/zh-cn/global.json

@@ -166,8 +166,8 @@
     "idexists": "新建的 {{entityName}} 不能包含ID",
     "noname": "新建的 {{entityName}} 不能没有名字",
     "idnull": "Id 无效",
-    "resultNotFound": "未发现任何结果",
-    "userNotFound": "未发现任何用户"
+    "noResultFound": "未发现任何结果",
+    "noUserFound": "未发现任何用户"
   },
   "footer": "马大叁舍 ~ 鱼之家 @ 2020"
 }