From f9e451de7e7721885bac6fe77ba9bba5633c3353 Mon Sep 17 00:00:00 2001
From: Michael An <1822852997@qq.com>
Date: Fri, 26 Apr 2019 14:02:19 +0800
Subject: [PATCH] org user gettext

---
 .../src/components/dialog/org-add-user-dialog.js   | 14 +++++++-------
 frontend/src/pages/org-admin/org-libraries.js      |  5 ++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/dialog/org-add-user-dialog.js b/frontend/src/components/dialog/org-add-user-dialog.js
index f7b5f9e2f5..c40f196d7c 100644
--- a/frontend/src/components/dialog/org-add-user-dialog.js
+++ b/frontend/src/components/dialog/org-add-user-dialog.js
@@ -100,10 +100,10 @@ class AddOrgUserDialog extends React.Component {
   }
 
   validateInputParams() {
-    let errMessage = '';
+    let errMessage;
     let email = this.state.email;
     if (!email.length) {
-      errMessage = 'email is required';
+      errMessage = gettext('email is required');
       this.setState({errMessage: errMessage});
       return false;
     }
@@ -111,17 +111,17 @@ class AddOrgUserDialog extends React.Component {
     let password1 = this.state.password;
     let password2 = this.state.passwdnew;
     if (!password1.length) {
-      errMessage = 'Please enter password';
+      errMessage = gettext('Please enter password');
       this.setState({errMessage: errMessage});
       return false;
     }
     if (!password2.length) {
-      errMessage = 'Please enter the password again';
+      errMessage = gettext('Please enter the password again');
       this.setState({errMessage: errMessage});
       return false;
     }
     if (password1 !== password2) {
-      errMessage = 'Passwords don\'t match';
+      errMessage = gettext('Passwords don\'t match');
       this.setState({errMessage: errMessage});
       return false;
     }
@@ -130,7 +130,7 @@ class AddOrgUserDialog extends React.Component {
 
   render() {
     return (
-      <Modal isOpen={true}>
+      <Modal isOpen={true} toggle={this.toggle}>
         <ModalHeader toggle={this.toggle}>{gettext('Add User')}</ModalHeader>
         <ModalBody>
           <Form>
@@ -157,7 +157,7 @@ class AddOrgUserDialog extends React.Component {
               <Input id="userPwdNew" innerRef={input => {this.passwdNewInput = input;}}  className="passwd"   value={this.state.passwdnew || ''} onChange={this.inputPasswordNew} />
             </FormGroup>
           </Form>
-          <Label className="err-message">{gettext(this.state.errMessage)}</Label>
+          {this.state.errMessage && <Label className="err-message">{this.state.errMessage}</Label>}
         </ModalBody>
         <ModalFooter>
           <Button color="primary" disabled={this.state.isAddingUser} onClick={this.handleSubmit} className={this.state.isAddingUser ? 'btn-loading' : ''}>{gettext('Submit')}</Button>
diff --git a/frontend/src/pages/org-admin/org-libraries.js b/frontend/src/pages/org-admin/org-libraries.js
index 627af545ca..8d42b6ac92 100644
--- a/frontend/src/pages/org-admin/org-libraries.js
+++ b/frontend/src/pages/org-admin/org-libraries.js
@@ -115,7 +115,7 @@ class OrgLibraries extends Component {
                       deleteRepoItem={this.deleteRepoItem}
                       transferRepoItem={this.transferRepoItem}
                     />
-                  )}
+                  );}
                 )}
               </tbody>
             </table>
@@ -132,9 +132,8 @@ class OrgLibraries extends Component {
 }
 
 const propTypes = {
-  key: PropTypes.number.isRequired,
   repo: PropTypes.object.isRequired,
-  isItemFreezed: PropTypes.boolean,
+  isItemFreezed: PropTypes.bool,
   onFreezedItem: PropTypes.func.isRequired,
   onUnfreezedItem: PropTypes.func.isRequired,
   deleteRepoItem: PropTypes.func.isRequired,