Merge branch 'didam' into 'master'

apdet

See merge request !159

src/container/Otorisasi/User/AddUser.js

@@ -158,17 +158,17 @@ export default class AddUser extends Component {
         var isEmail = this.isEmail(this.state.email)
 
         if (R.isEmpty(this.state.fullname)) {
-            this.setState({ errorFullname: true, msgErrorFN: 'Nama Lengkap tidak boleh kosong' })
+            this.setState({ errorFullname: true, msgErrorFN: 'Full Name is Required' })
         } else if (R.isEmpty(this.state.email)) {
-            this.setState({ errorEmail: true, msgErrorEM: 'Email tidak boleh kosong' })
+            this.setState({ errorEmail: true, msgErrorEM: 'Email is Required' })
         } else if (!isEmail) {
-            this.setState({ errorEmail: true, msgErrorEM: 'Format email tidak sesuai!' })
+            this.setState({ errorEmail: true, msgErrorEM: 'Email format not recognized!' })
         } else if (R.isNil(this.state.role)) {
-            this.setState({ errorRoleName: true, msgErrorRN: 'Role Name tidak boleh kosong' })
+            this.setState({ errorRoleName: true, msgErrorRN: 'Role Name is Required' })
         } else if (R.isNil(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorSD: 'Start Date tidak boleh kosong' })
+            this.setState({ errorStartDate: true, msgErrorSD: 'Start Date is Required' })
         } else if (R.isNil(this.state.endDate)) {
-            this.setState({ errorEndDate: true, msgErrorED: 'End Date tidak boleh kosong' })
+            this.setState({ errorEndDate: true, msgErrorED: 'End Date is Required' })
         }
         // else if (this.state.privileges.length < 1) {
         //     alert('Hak Akses belum di pilih !!')

src/container/Otorisasi/User/EditUser.js

@@ -166,17 +166,17 @@ export default class EditUser extends Component {
         // console.log(this.state.tempData)
 
         if (R.isEmpty(this.state.tempData.fullname)) {
-            this.setState({ errorFullname: true, msgErrorFN: 'Nama Lengkap tidak boleh kosong' })
+            this.setState({ errorFullname: true, msgErrorFN: 'Full Name is Required' })
         } else if (R.isEmpty(this.state.tempData.email)) {
-            this.setState({ errorEmail: true, msgErrorEM: 'Email tidak boleh kosong' })
+            this.setState({ errorEmail: true, msgErrorEM: 'Email is Required' })
         } else if (!isEmail) {
-            this.setState({ errorEmail: true, msgErrorEM: 'Format email tidak sesuai!' })
+            this.setState({ errorEmail: true, msgErrorEM: 'Email format not recognized!' })
         } else if (R.isNil(this.state.role)) {
-            this.setState({ errorRoleName: true, msgErrorRN: 'Role Name tidak boleh kosong' })
+            this.setState({ errorRoleName: true, msgErrorRN: 'Role Name is Required' })
         } else if (R.isNil(this.state.tempData.start_date)) {
-            this.setState({ errorStartDate: true, msgErrorSD: 'Start Date tidak boleh kosong' })
+            this.setState({ errorStartDate: true, msgErrorSD: 'Start Date is Required' })
         } else if (R.isNil(this.state.tempData.end_date)) {
-            this.setState({ errorEndDate: true, msgErrorED: 'End Date tidak boleh kosong' })
+            this.setState({ errorEndDate: true, msgErrorED: 'End Date is Required' })
         }
         // else if (this.state.privileges.length < 1) {
         //     alert('Hak Akses belum di pilih !!')

src/container/Otorisasi/UserRole/AddRole.js

@@ -110,13 +110,13 @@ export default class AddRole extends Component {
 
     validasi() {
         if (R.isEmpty(this.state.roleName)) {
-            this.setState({ errorRoleName: true, msgErrorRN: 'Role Name tidak boleh kosong' })
+            this.setState({ errorRoleName: true, msgErrorRN: 'Role Name is Required' })
         } else if (R.isNil(this.state.startDate)) {
-            this.setState({ errorStartDate: true, msgErrorSD: 'Start Date tidak boleh kosong' })
+            this.setState({ errorStartDate: true, msgErrorSD: 'Start Date is Required' })
         } else if (R.isNil(this.state.endDate)) {
-            this.setState({ errorEndDate: true, msgErrorED: 'End Date tidak boleh kosong' })
+            this.setState({ errorEndDate: true, msgErrorED: 'End Date is Required' })
         } else if (this.state.privileges.length < 1) {
-            this.setState({ alert: true, messageAlert: 'Hak Akses belum di pilih !!', tipeAlert: 'warning' })
+            this.setState({ alert: true, messageAlert: 'You must choose the Access Rights!!', tipeAlert: 'warning' })
         } else {
             this.addRole()
         }

src/container/Otorisasi/UserRole/EditRole.js

@@ -116,13 +116,13 @@ export default class EditRole extends Component {
 
     validasi() {
         if (R.isEmpty(this.state.tempData.role_name)) {
-            this.setState({ errorRoleName: true, msgErrorRN: 'Role Name tidak boleh kosong' })
+            this.setState({ errorRoleName: true, msgErrorRN: 'Role Name is Required' })
         } else if (R.isNil(this.state.tempData.start_date)) {
-            this.setState({ errorStartDate: true, msgErrorSD: 'Start Date tidak boleh kosong' })
+            this.setState({ errorStartDate: true, msgErrorSD: 'Start Date is Required' })
         } else if (R.isNil(this.state.tempData.end_date)) {
-            this.setState({ errorEndDate: true, msgErrorED: 'End Date tidak boleh kosong' })
+            this.setState({ errorEndDate: true, msgErrorED: 'End Date is Required' })
         } else if (this.state.privileges.length < 1) {
-            this.setState({ alert: true, messageAlert: 'Hak Akses belum di pilih !!', tipeAlert: 'warning' })
+            this.setState({ alert: true, messageAlert: 'You must choose the Access Rights', tipeAlert: 'warning' })
         } else {
             this.updateRole()
         }