From b391b60ed159891205e60bfda35fec94d0f187ac Mon Sep 17 00:00:00 2001 From: Preyea Regmi Date: Fri, 17 Jan 2020 12:56:41 +0545 Subject: [PATCH] Translation setup done for kyc --- .../kycV3/presenter/KYCV3ViewModel.java | 20 ++++----- .../kycV3/view/KYCV3Activity.java | 2 +- .../view/TermsAndConditionAcitivity.java | 2 +- .../layout/fragment_kyc_auto_debit_prompt.xml | 2 +- .../layout/fragment_kyc_customer_detail.xml | 38 ++++++++--------- .../layout/fragment_terms_and_condition.xml | 18 ++++---- app/src/main/res/layout/kyc_header.xml | 18 ++++---- app/src/main/res/values-si/strings.xml | 2 +- app/src/main/res/values/strings.xml | 41 +++++++++++++++++++ 9 files changed, 92 insertions(+), 51 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/presenter/KYCV3ViewModel.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/presenter/KYCV3ViewModel.java index 2689c64a..f1c12bb8 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/presenter/KYCV3ViewModel.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/presenter/KYCV3ViewModel.java @@ -956,7 +956,7 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter view.getCustomerDetailViewContract().enableAlternateIdFocusChangeAndImeOptionListener(false); result = false; } else if (alternateIdNumber.length() != ID_CARD_VALID_LENGTH) { - customerDetailErrorLiveDataDTO.setValueToAnotherIdNoError("Invalid National Id Card"); + customerDetailErrorLiveDataDTO.setValueToAnotherIdNoError(getStringfromStringId(R.string.national_id_number_error_text)); view.getCustomerDetailViewContract().enableAlternateIdFocusChangeAndImeOptionListener(false); result = false; } else { @@ -978,7 +978,7 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter view.getCustomerDetailViewContract().enableAlternateIdFocusChangeAndImeOptionListener(false); result = false; } else if (alternateIdNumber.length() != ID_CARD_VALID_LENGTH) { - customerDetailErrorLiveDataDTO.setValueToAnotherIdNoError("Invalid Alien Id Card"); + customerDetailErrorLiveDataDTO.setValueToAnotherIdNoError(getStringfromStringId(R.string.alien_id_number_error_text)); view.getCustomerDetailViewContract().enableAlternateIdFocusChangeAndImeOptionListener(false); result = false; } else { @@ -1000,7 +1000,7 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter result = false; } else if (alternateIdNumber.length() != ID_CARD_VALID_LENGTH) { view.getCustomerDetailViewContract().enableAlternateIdFocusChangeAndImeOptionListener(false); - customerDetailErrorLiveDataDTO.setValueToAnotherIdNoError("Invalid Driving License Card"); + customerDetailErrorLiveDataDTO.setValueToAnotherIdNoError(getStringfromStringId(R.string.driving_id_number_error_text)); result = false; } else { view.getCustomerDetailViewContract().enableAlternateIdFocusChangeAndImeOptionListener(true); @@ -1031,7 +1031,7 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter kycRelatedDataDTO.setPrimaryInformation(new PrimaryInformationDTO()); if (val == null) { - customerDetailErrorLiveDataDTO.setValueToAnotherIdTypeError("Select different ID Type"); + customerDetailErrorLiveDataDTO.setValueToAnotherIdTypeError(getStringfromStringId(R.string.select_different_id_type)); kycRelatedDataDTO.getPrimaryInformation().setAnotherIDType(""); } else if (val.getId() == null || val.getId().length() == 0) { //This code executes when clear button is pressed. @@ -1077,7 +1077,7 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter } result = validateAlternateIDRelatedFieldData(); } else { - customerDetailErrorLiveDataDTO.setValueToAnotherIdTypeError("Select different ID Type"); + customerDetailErrorLiveDataDTO.setValueToAnotherIdTypeError(getStringfromStringId(R.string.select_different_id_type)); } @@ -1192,7 +1192,7 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter this.enteredPennyTestReference = reference + ""; boolean result = reference == null || reference.length() != 4; if (result) - penntestReferenceErrorMessageLiveData.setValue("Refrence code must be 4 digit"); + penntestReferenceErrorMessageLiveData.setValue(getStringfromStringId(R.string.penny_test_code_error_text)); else penntestReferenceErrorMessageLiveData.setValue(null); @@ -1208,11 +1208,11 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter return ""; String formattedEnglishLabel = englishLabel.toLowerCase(); if (formattedEnglishLabel.contains("alien")) - return "Alien Registration Card"; + return getStringfromStringId(R.string.alien_id_text); else if (formattedEnglishLabel.contains("national")) - return "National ID Card"; + return getStringfromStringId(R.string.national_id_text); else if (formattedEnglishLabel.contains("driving")) - return "Driving License Card"; + return getStringfromStringId(R.string.driving_id_text); else return englishLabel; @@ -1289,7 +1289,7 @@ public class KYCV3ViewModel extends BaseViewModel implements KYCV3PresenterInter if (formSubmissionType.equalsIgnoreCase("2")) { //Sender ID may be changed after kyc submission success so need to update locally. gateway.saveSenderId(t.getExtra()); - view.showPopUpMessage(t.getMsg(), CustomAlertDialog.AlertType.SUCCESS, alertType -> { + view.showPopUpMessage(getStringfromStringId(R.string.registration_success_message_text), CustomAlertDialog.AlertType.SUCCESS, alertType -> { if (task != null) task.run(); }); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/view/KYCV3Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/view/KYCV3Activity.java index 3b538c78..a645099c 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/view/KYCV3Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV3/view/KYCV3Activity.java @@ -86,7 +86,7 @@ public class KYCV3Activity extends BaseActivity implements KYCV3PresenterInterfa } private void initialize() { - toolbarTitle.setText(getString(R.string.penny_test_pending_text)); + toolbarTitle.setText(getString(R.string.new_registration_title_text)); KYCV3ViewModelFactory kycv3ViewModelFactory = new KYCV3ViewModelFactory(this, getIntent().getBooleanExtra(SHOULD_REDIRECT_TO_PENNY_TEST_BUNDLE_KEY, false)); viewModel = ViewModelProviders.of(this, kycv3ViewModelFactory).get(KYCV3ViewModel.class); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/termsandcondition/view/TermsAndConditionAcitivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/termsandcondition/view/TermsAndConditionAcitivity.java index c4238369..3e2727f6 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/termsandcondition/view/TermsAndConditionAcitivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/termsandcondition/view/TermsAndConditionAcitivity.java @@ -62,7 +62,7 @@ public class TermsAndConditionAcitivity extends BaseActivity implements WebBrows } private void initialize() { - toolbar_title.setText("Terms And Condition"); + toolbar_title.setText(getString(R.string.terms_and_conditions_text)); TermsAndConditionViewModelFactory termsAndConditionViewModelFactory=new TermsAndConditionViewModelFactory(this,new TermsAndConditionGateway()); viewModel= ViewModelProviders.of(this,termsAndConditionViewModelFactory).get(TermsAndConditionViewModel.class); viewModel.getRelatedData(); diff --git a/app/src/main/res/layout/fragment_kyc_auto_debit_prompt.xml b/app/src/main/res/layout/fragment_kyc_auto_debit_prompt.xml index 19821682..4bc65ae5 100644 --- a/app/src/main/res/layout/fragment_kyc_auto_debit_prompt.xml +++ b/app/src/main/res/layout/fragment_kyc_auto_debit_prompt.xml @@ -42,7 +42,7 @@ android:paddingTop="10dp" android:paddingEnd="15dp" android:paddingBottom="15dp" - android:text="Do you have a phone number registered with Alien Registration Card under your name?" + android:text="@string/step2_content_text" android:textSize="17sp" app:layout_constraintBottom_toTopOf="@+id/btn_submit" app:layout_constraintTop_toBottomOf="@+id/imageView" diff --git a/app/src/main/res/layout/fragment_kyc_customer_detail.xml b/app/src/main/res/layout/fragment_kyc_customer_detail.xml index e5a5bde4..2e4cc25d 100644 --- a/app/src/main/res/layout/fragment_kyc_customer_detail.xml +++ b/app/src/main/res/layout/fragment_kyc_customer_detail.xml @@ -33,7 +33,7 @@ android:drawablePadding="@dimen/_5sdp" android:gravity="bottom" - android:text="Personal Information" + android:text="@string/personal_information_text" android:textColor="@android:color/black" android:textSize="@dimen/_12ssp" app:drawableStartCompat="@drawable/vd_account" @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_12sdp" - android:hint="@string/full_name_text" + android:hint="@string/fullname_placeholder_text" android:textColorHint="@color/darkgray" app:errorEnabled="true"> @@ -176,7 +176,7 @@ android:id="@+id/cityWrapper" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/city_text" + android:hint="@string/select_city_text" android:paddingTop="1dp" android:paddingBottom="1dp" android:textColorHint="@color/darkgray" @@ -253,7 +253,7 @@ android:background="@drawable/ic_rounded_background_red_coloured" android:enabled="false" android:minWidth="200dp" - android:text="@string/save_and_continue_text" + android:text="@string/save_and_next_text" android:textAllCaps="false" android:textColor="@color/white" android:textSize="16sp" /> @@ -279,7 +279,7 @@ android:layout_marginBottom="@dimen/_10sdp" android:drawablePadding="@dimen/_5sdp" android:gravity="bottom" - android:text="Korean Bank Information" + android:text="@string/korea_bank_infornation_text" android:textColor="@android:color/black" android:textSize="@dimen/_12ssp" app:drawableStartCompat="@drawable/vd_bank_account" @@ -297,7 +297,7 @@ android:id="@+id/primaryBankListWrapper" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/primary_bank_placeholder_text" + android:hint="@string/korea_bank_placeholder_text" android:textColorHint="@color/darkgray" app:errorEnabled="true"> @@ -328,7 +328,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/kycTextUpperMargin" - android:hint="@string/primary_account_number_text" + android:hint="@string/account_number_text" android:textColorHint="@color/darkgray" app:errorEnabled="true"> @@ -351,7 +351,7 @@ android:layout_marginBottom="@dimen/_10sdp" android:drawablePadding="@dimen/_5sdp" android:gravity="bottom" - android:text="Passport Information" + android:text="@string/passport_information_text" android:textColor="@android:color/black" android:textSize="@dimen/_12ssp" app:drawableStartCompat="@drawable/vd_book" @@ -362,7 +362,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/kycTextUpperMargin" - android:hint="@string/passport_text" + android:hint="@string/passport_number_text" android:textColorHint="@color/darkgray" app:errorEnabled="true"> @@ -388,7 +388,7 @@ android:id="@+id/passportIdIssueDateWrapper" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/select_issue_date_text" + android:hint="@string/passport_issue_date_text" android:textColorHint="@color/darkgray" app:errorEnabled="true"> @@ -428,7 +428,7 @@ android:id="@+id/passportIdExpiryDateWrapper" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/select_expiry_date_text" + android:hint="@string/passport_expiry_date_text" android:textColorHint="@color/darkgray" app:errorEnabled="true"> @@ -466,7 +466,7 @@ android:layout_marginBottom="@dimen/_10sdp" android:drawablePadding="@dimen/_5sdp" android:gravity="bottom" - android:text="Another Id Information (Optional)" + android:text="@string/another_id_information_text" android:textColor="@android:color/black" android:textSize="@dimen/_12ssp" app:drawableStartCompat="@drawable/vd_book" @@ -480,7 +480,7 @@ android:layout_marginBottom="@dimen/_10sdp" android:drawablePadding="@dimen/_5sdp" android:gravity="bottom" - android:text="Clear" + android:text="@string/clear_text" android:paddingStart="@dimen/_3sdp" android:paddingEnd="@dimen/_3sdp" android:textColor="@color/colorPrimaryDark" @@ -563,7 +563,7 @@ android:id="@+id/anotherIssueDateWrapper" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/select_issue_date_text" + android:hint="@string/another_id_issue_date_text" android:textColorHint="@color/darkgray" app:errorEnabled="true"> @@ -636,7 +636,7 @@ android:layout_marginBottom="@dimen/_10sdp" android:drawablePadding="@dimen/_5sdp" android:gravity="bottom" - android:text="Additional Information" + android:text="@string/additional_information_text" android:textColor="@android:color/black" android:textSize="@dimen/_12ssp" app:drawableStartCompat="@drawable/vd_info" @@ -709,7 +709,7 @@ android:background="@drawable/ic_rounded_background_red_coloured" android:enabled="false" android:minWidth="200dp" - android:text="@string/save_and_continue_text" + android:text="@string/save_and_next_text" android:textAllCaps="false" android:textColor="@color/white" android:textSize="16sp" /> @@ -735,7 +735,7 @@ android:layout_marginBottom="@dimen/_10sdp" android:drawablePadding="@dimen/_5sdp" android:gravity="bottom" - android:text="Upload Documents" + android:text="@string/upload_pictures_text" android:textColor="@android:color/black" android:textSize="@dimen/_12ssp" app:drawableStartCompat="@drawable/vd_media" @@ -883,7 +883,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:gravity="start" - android:text="Another Id(Optional)" + android:text="@string/another_id_information_text" android:paddingStart="@dimen/_10sdp" android:paddingEnd="@dimen/_10sdp" android:textColor="@color/darkgray" @@ -918,7 +918,7 @@ android:layout_marginTop="@dimen/_15sdp" android:background="@drawable/ic_rounded_background_red_coloured" android:enabled="false" - android:text="@string/save_and_continue_text" + android:text="@string/save_and_next_text" android:textAllCaps="false" android:textColor="@color/white" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/fragment_terms_and_condition.xml b/app/src/main/res/layout/fragment_terms_and_condition.xml index a44ff810..831737c6 100644 --- a/app/src/main/res/layout/fragment_terms_and_condition.xml +++ b/app/src/main/res/layout/fragment_terms_and_condition.xml @@ -23,7 +23,7 @@ android:id="@+id/txt_terms_header" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Please accept the terms and conditions." + android:text="@string/terms_and_conditions_title_text" android:textColor="@color/dark_gray" android:textSize="@dimen/h6" app:layout_constraintEnd_toEndOf="parent" @@ -36,7 +36,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/_8sdp" - android:text="In order to use GME's overseas remittances and domestic remittance smoothly, you need to agree to withdraw money from your account. Withdrawal transfer will be made through open banking from the account you agreed to withdraw when using services such as overseas remittance and domestic remittance." + android:text="@string/terms_and_conditions_content_text" android:textSize="@dimen/text_medium" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -62,7 +62,7 @@ android:drawablePadding="@dimen/_3sdp" android:paddingStart="@dimen/_8sdp" android:paddingEnd="@dimen/_8sdp" - android:text="Personal Information Treatment Policy" + android:text="@string/personal_information_treatment_policy" android:textColor="@color/dark_gray" android:textSize="@dimen/text_normal" /> @@ -93,7 +93,7 @@ android:drawablePadding="@dimen/_3sdp" android:paddingStart="@dimen/_8sdp" android:paddingEnd="@dimen/_8sdp" - android:text="Personal Information Collection and Usage Agreement" + android:text="@string/personal_info_usesage_text" android:textColor="@color/dark_gray" android:textSize="@dimen/text_normal" /> @@ -124,7 +124,7 @@ android:drawablePadding="@dimen/_3sdp" android:paddingStart="@dimen/_8sdp" android:paddingEnd="@dimen/_8sdp" - android:text="Agreement of Legal Name Confirmation for Prohibiting Manipulation of the Law and Illegal Business" + android:text="@string/agreement_legal_text" android:textColor="@color/dark_gray" android:textSize="@dimen/text_normal" @@ -157,7 +157,7 @@ android:drawablePadding="@dimen/_3sdp" android:paddingStart="@dimen/_8sdp" android:paddingEnd="@dimen/_8sdp" - android:text="Terms of Use for Small Scale Amount Remittance" + android:text="@string/small_scale_amount_text" android:textColor="@color/dark_gray" android:textSize="@dimen/text_normal" @@ -190,7 +190,7 @@ android:drawablePadding="@dimen/_3sdp" android:paddingStart="@dimen/_8sdp" android:paddingEnd="@dimen/_8sdp" - android:text="Terms of Use for Open-Banking Service" + android:text="@string/openbanking_service_text" android:textColor="@color/dark_gray" android:textSize="@dimen/text_normal" /> @@ -221,7 +221,7 @@ android:drawablePadding="@dimen/_3sdp" android:paddingStart="@dimen/_8sdp" android:paddingEnd="@dimen/_8sdp" - android:text="Terms of Use for Electronic Finance Transaction" + android:text="@string/eletronic_finance_text" android:textColor="@color/dark_gray" android:textSize="@dimen/text_normal" /> @@ -244,7 +244,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="8dp" android:background="@drawable/ic_rounded_background_red_coloured" - android:text="Agree" + android:text="@string/agree_text" android:textAllCaps="false" android:textColor="@color/white" android:textSize="@dimen/_14ssp" diff --git a/app/src/main/res/layout/kyc_header.xml b/app/src/main/res/layout/kyc_header.xml index 9c47cc62..630fa5ed 100644 --- a/app/src/main/res/layout/kyc_header.xml +++ b/app/src/main/res/layout/kyc_header.xml @@ -15,7 +15,7 @@ android:gravity="center" android:text="1" android:textColor="@color/white" - android:textSize="12sp" + android:textSize="@dimen/text_small" app:layout_constraintBottom_toTopOf="@+id/page2TitleTxtView" app:layout_constraintStart_toStartOf="@+id/guideline" app:layout_constraintTop_toTopOf="@+id/page2TxtView" @@ -28,9 +28,9 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingTop="3dp" - android:text="Personal Information" + android:text="@string/step1_sub_title_text" android:textColor="@color/dark_gray" - android:textSize="11sp" + android:textSize="@dimen/text_small" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/page1TxtView" app:layout_constraintStart_toStartOf="@+id/page1TxtView" @@ -68,7 +68,7 @@ android:gravity="center" android:text="2" android:textColor="@color/dark_gray" - android:textSize="12sp" + android:textSize="@dimen/text_small" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -82,9 +82,9 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingTop="3dp" - android:text="Auto Debit" + android:text="@string/step2_sub_title_text" android:textColor="@color/dark_gray" - android:textSize="11sp" + android:textSize="@dimen/text_small" app:layout_constraintEnd_toEndOf="@+id/page2TxtView" app:layout_constraintStart_toStartOf="@+id/page2TxtView" app:layout_constraintTop_toBottomOf="@+id/page2TxtView" /> @@ -98,7 +98,7 @@ android:gravity="center" android:text="3" android:textColor="@color/dark_gray" - android:textSize="12sp" + android:textSize="@dimen/text_small" app:layout_constraintBottom_toTopOf="@+id/page2TitleTxtView" app:layout_constraintEnd_toStartOf="@+id/guideline3" app:layout_constraintTop_toTopOf="@+id/page2TxtView" @@ -110,9 +110,9 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingTop="3dp" - android:text="Penny Test" + android:text="@string/step3_sub_title_text" android:textColor="@color/dark_gray" - android:textSize="11sp" + android:textSize="@dimen/text_small" app:layout_constraintEnd_toEndOf="@+id/page3TxtView" app:layout_constraintStart_toStartOf="@+id/page3TxtView" app:layout_constraintTop_toBottomOf="@+id/page3TxtView" /> diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index 30e9cc6e..7ae66188 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -36,7 +36,7 @@ කරුණාකර නිවැරදි උපන් දිනයක් ඇතුලත් කරන්න ඔබගේ මුරපදය සඳහා උදවු අවශ්‍යද? - නැවත පෙර තත්වයට + රීසෙට් කරන්න ඔබගේ ගිණුම ස්තීර කරන්න ස්තීර කිරීමේ ක්‍රියාවලිය ලියාපදිංචි වීමේ ක්‍රියාවලිය දිගටම පවත්වාගෙන යන්න diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ecff35b2..d60388ee 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -719,5 +719,46 @@ It will deduct ooo KRW (Amount + ServiceFee) Recharge History + + Terms And Conditions + Please accept the terms and conditions. + In order to use GME\'s overseas remittances and domestic remittances smoothly, you need to agree to withdraw money from your account. Withdrawal transfer will be made through open banking from the account you agreed to withdraw when using services such as overseas remittance and domestic remittance. + Personal Information Treatment Policy + Personal Information Collection and Usage Agreement + Agreement of Legal Name Confirmation for Prohibiting Manipulation of the Law and Illegal Behavior + Terms of Use for Small Scale Amount Remittance + Terms of Use for Open-Banking Service + Terms of Use for Electronic Finance Transaction + Agree + Registration Process + Personal Information + Personal Information + Full Name (Shown in your id card) + Register Auto Debit + Try to Penny Test + Select City + Korean Bank Information + Korea Bank + Passport Information + Passport Number + Passport Issued Date + Passport Expiry Date + Another ID (Optional) + ID Issued Date + Clear + Alien Registration Card + National ID Card + Driving License Card + Invalid Driving License number + Invalid Alien Registration number + Invalid National ID number + Select different ID Type + Additional Information + Upload Pictures + Save and Next + Reference code must be of 4 digit + Do you have a phone number registered with Alien Registration Card under your name? + Thank you for registering for GME. We are verifying your information. Once approved, you will receive SMS. +