From 90b80f36ff1d25374c757a710cbacd4dd9d01a91 Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Tue, 22 Jan 2019 10:37:40 +0900 Subject: [PATCH] Translation done upto kftc --- .../AutoDebitAccountListingV2Activity.java | 12 ++--- .../kycV2/presenter/kyc/KYCV2Presenter.java | 2 +- .../kycV2/view/view1/KYCView1Fragment.java | 20 ++++---- .../kycV2/view/view2/KYCView2Fragment.java | 10 ++-- .../withdrawV2/view/WithdrawV2Activity.java | 2 +- .../main/res/layout/activity_app_update.xml | 6 +-- ...activity_auto_debit_account_listing_v2.xml | 4 +- .../main/res/layout/activity_penny_test.xml | 4 +- .../main/res/layout/activity_withdraw_v2.xml | 6 +-- .../layout/fragment_penny_test_operation.xml | 6 +-- .../res/layout/fragment_penny_test_prompt.xml | 2 +- app/src/main/res/values/strings.xml | 46 ++++++++++++++++++- 12 files changed, 80 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/autodebitaccountlisting/AutoDebitAccountListingV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/autodebitaccountlisting/AutoDebitAccountListingV2Activity.java index a74a4faf..ea741cb3 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/autodebitaccountlisting/AutoDebitAccountListingV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/autodebitV2/view/autodebitaccountlisting/AutoDebitAccountListingV2Activity.java @@ -73,7 +73,7 @@ public class AutoDebitAccountListingV2Activity extends BaseActivity implements A private void init() { iv_cancel.setVisibility(View.INVISIBLE); - toolbarTitle.setText("Manage Auto Debit Account"); + toolbarTitle.setText(getString(R.string.auto_debit_title_text)); //Setup presenter here this.presenter=new AutoDebitAccountListingV2Presenter(this); @@ -107,15 +107,15 @@ public class AutoDebitAccountListingV2Activity extends BaseActivity implements A @Override public void onAccountLongPressed(AutoDebitAccount autoDebitAccount) { AlertDialog.Builder alert = new AlertDialog.Builder(AutoDebitAccountListingV2Activity.this); - alert.setTitle("Are you sure?") - .setMessage("You want to delete Auto-Debit Account!") - .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + alert.setTitle(getString( R.string.are_you_sure_text)) + .setMessage(getString( R.string.auto_debit_delete_confirm_description)) + .setPositiveButton(getString(R.string.yes_text), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { presenter.deleteAutoDebitAccount(autoDebitAccount); } }) - .setNegativeButton("No ", new DialogInterface.OnClickListener() { + .setNegativeButton(getString(R.string.no_text), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int i) { dialogInterface.dismiss(); @@ -168,7 +168,7 @@ public class AutoDebitAccountListingV2Activity extends BaseActivity implements A intent.putExtra(WEB_BROWSWER_URL_BUNDLE_KEY,this.presenter.getWebRequestDataForAddingAccount(countryPaymentService.getKey())); startActivityForResult(intent,AUTO_DEBIT_ADD_REQUEST); }); - genericTextListingDialog.setHintAndTitle("Search Language","Select Language","No Language found"); + genericTextListingDialog.setHintAndTitle(getString(R.string.search_language_text),getString(R.string.select_language_text),getString(R.string.no_language_found_text)); genericTextListingDialog.disableSearch(true); if (!genericTextListingDialog.isAdded()) genericTextListingDialog.show(getSupportFragmentManager(), "COUNTRY CHOOSER"); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/kyc/KYCV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/kyc/KYCV2Presenter.java index 5e31f383..7b9501f3 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/kyc/KYCV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/kyc/KYCV2Presenter.java @@ -233,7 +233,7 @@ public class KYCV2Presenter extends BasePresenter implements KYCV2PresenterInter @Override public boolean validateKYCView3(KYCView3VModel data) { if (selfieFile == null || frontdocFile == null || backdocFile == null || passbookFile == null) { - view.showToastMessage("Please provide all images"); + view.showToastMessage(getStringfromStringId(R.string.please_provide_all_images_text)); return false; } return true; diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/KYCView1Fragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/KYCView1Fragment.java index 37c91391..fec2e1de 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/KYCView1Fragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/KYCView1Fragment.java @@ -111,7 +111,7 @@ public class KYCView1Fragment extends BaseFragment implements View.OnClickListen private Calendar newCalendar; CompositeDisposable compositeDisposable = null; - private List genderData; + private List nativeCountryListData; private List occupationListData; private List provinceListData; @@ -262,7 +262,7 @@ public class KYCView1Fragment extends BaseFragment implements View.OnClickListen }); - occupationListingDialog.setHintAndTitle("Search Occupation","Select Occupation","No Occupation found"); + occupationListingDialog.setHintAndTitle(getString(R.string.search_occupation_text),getString(R.string.select_occupation_text),getString(R.string.no_occupation_found_text)); occupationListingDialog.disableSearch(false); if (!occupationListingDialog.isAdded()) occupationListingDialog.show(getActivity().getSupportFragmentManager(), "OCCUPATIONCOUNTRYDIALOG"); @@ -280,7 +280,7 @@ public class KYCView1Fragment extends BaseFragment implements View.OnClickListen provinceListingDialog.dismiss(); }); - provinceListingDialog.setHintAndTitle("Search Province","Select Province","No Province found"); + provinceListingDialog.setHintAndTitle(getString(R.string.search_province_text),getString(R.string.select_province_text),getString(R.string.no_province_found_text)); provinceListingDialog.disableSearch(false); if (!provinceListingDialog.isAdded()) provinceListingDialog.show(getActivity().getSupportFragmentManager(), "PROVINCEDIALOG"); @@ -298,7 +298,7 @@ public class KYCView1Fragment extends BaseFragment implements View.OnClickListen nativeCountrylListDialog.dismiss(); }); - nativeCountrylListDialog.setHintAndTitle("Search Country","Select Country","No Country found"); + nativeCountrylListDialog.setHintAndTitle(getString(R.string.search_country_text),getString(R.string.select_country_text),getString(R.string.no_country_found_text)); nativeCountrylListDialog.disableSearch(false); if (!nativeCountrylListDialog.isAdded()) nativeCountrylListDialog.show(getActivity().getSupportFragmentManager(), "NATIVECOUNTRYDIALOG"); @@ -310,9 +310,9 @@ public class KYCView1Fragment extends BaseFragment implements View.OnClickListen hideKeyBoard(); GenericTextListingDialog genderSelectDialog =new GenericTextListingDialog<>(); List data=new ArrayList<>(); - data.add(new Gender("M","Male")); - data.add(new Gender("F","Female")); - data.add(new Gender("O","Other")); + data.add(new Gender("M",getString(R.string.male_text))); + data.add(new Gender("F",getString(R.string.female_text))); + data.add(new Gender("O",getString(R.string.other_text))); genderSelectDialog.setData(data); genderSelectDialog.setListener(selectedGender -> { @@ -321,7 +321,7 @@ public class KYCView1Fragment extends BaseFragment implements View.OnClickListen genderSelectDialog.dismiss(); }); - genderSelectDialog.setHintAndTitle("Search Gender","Select Gender","No Gender found"); + genderSelectDialog.setHintAndTitle("Search Gender",getString(R.string.select_gender_text),getString(R.string.no_gender_found_text)); genderSelectDialog.disableSearch(true); if (!genderSelectDialog.isAdded()) genderSelectDialog.show(getActivity().getSupportFragmentManager(), "GENDERCHOOSER"); @@ -388,10 +388,6 @@ public class KYCView1Fragment extends BaseFragment implements View.OnClickListen this.nativeCountryListData = nativeCountry; this.occupationListData = occupation; this.provinceListData = provinceList; - this.genderData = new ArrayList<>(); - this.genderData.add("Male"); - this.genderData.add("Female"); - this.genderData.add("Other"); KYCV2ActionListener parentView = (KYCV2ActionListener) getActivity(); if (parentView != null) { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java index 252dbd26..f04e98e8 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java @@ -246,7 +246,7 @@ public class KYCView2Fragment extends BaseFragment implements View.OnClickListen }); - sourceOfFundGenericTextListingDialog.setHintAndTitle("Search Source of Fund","Select Source of Fund","No Source of Fund found"); + sourceOfFundGenericTextListingDialog.setHintAndTitle(getString(R.string.search_source_of_fund),getString(R.string.select_source_of_fund_text),getString(R.string.no_source_of_found_text)); sourceOfFundGenericTextListingDialog.disableSearch(false); if (!sourceOfFundGenericTextListingDialog.isAdded()) sourceOfFundGenericTextListingDialog.show(getActivity().getSupportFragmentManager(), "SOURCEOFFUNDLISTINGDIALOG"); @@ -288,7 +288,7 @@ public class KYCView2Fragment extends BaseFragment implements View.OnClickListen }); - idTypeListingDialog.setHintAndTitle("Search Id Type","Select Id Type","No Id Type found"); + idTypeListingDialog.setHintAndTitle(getString(R.string.search_id_text),getString(R.string.select_id_type_text),getString(R.string.no_id_type_found_text)); idTypeListingDialog.disableSearch(true); if (!idTypeListingDialog.isAdded()) idTypeListingDialog.show(getActivity().getSupportFragmentManager(), "IDLISTINGDIALOG"); @@ -307,7 +307,7 @@ public class KYCView2Fragment extends BaseFragment implements View.OnClickListen }); - primaryBankListingDialog.setHintAndTitle("Search Primary Bank","Select Primary Bank","No Primary Bank found"); + primaryBankListingDialog.setHintAndTitle(getString(R.string.search_primary_bank_text),getString(R.string.select_primary_bank_text),getString(R.string.no_primary_bank_found_text)); primaryBankListingDialog.disableSearch(false); if (!primaryBankListingDialog.isAdded()) primaryBankListingDialog.show(getActivity().getSupportFragmentManager(), "PRIMARYBANKLISTINGDIALOG"); @@ -327,13 +327,13 @@ public class KYCView2Fragment extends BaseFragment implements View.OnClickListen if (ed.getId() == R.id.ed_issueDate) { builder.setCurrentDateAsMaxDate(); builder.defaultDate(1990, 1, 1); - builder.setTitle("Select issue date"); + builder.setTitle(getString(R.string.select_issue_date_text)); } else if (ed.getId() == R.id.ed_expiryDate) { builder.setCurrentDateAsMinDate(); builder.defaultDate(2020, 1, 1); - builder.setTitle("Select expiry date"); + builder.setTitle(getString(R.string.select_expiry_date_text)); } else { diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/view/WithdrawV2Activity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/view/WithdrawV2Activity.java index 52d99992..e99f3d3c 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/view/WithdrawV2Activity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/view/WithdrawV2Activity.java @@ -67,7 +67,7 @@ public class WithdrawV2Activity extends BaseActivity implements View.OnClickList } private void performDefaultAction(Bundle savedInstanceState) { - toolbarTitle.setText("Auto Refund"); + toolbarTitle.setText(R.string.auto_refund_title_text); presenter.getRequiredData(); } diff --git a/app/src/main/res/layout/activity_app_update.xml b/app/src/main/res/layout/activity_app_update.xml index c8226516..76c29f6d 100644 --- a/app/src/main/res/layout/activity_app_update.xml +++ b/app/src/main/res/layout/activity_app_update.xml @@ -41,7 +41,7 @@ android:gravity="center" android:paddingTop="35dp" android:paddingBottom="15dp" - android:text="New update is available" + android:text="@string/new_update_is_available_text" android:textColor="@color/colorPrimary" android:textSize="21sp" @@ -81,7 +81,7 @@ android:layout_marginTop="25dp" android:layout_marginBottom="8dp" android:background="@drawable/ic_blue_button_with_white_border" - android:text="Update" + android:text="@string/update_text" android:textAllCaps="false" android:textColor="@color/white" /> @@ -101,7 +101,7 @@ android:gravity="center" android:paddingTop="10dp" android:paddingBottom="10dp" - android:text="Not now" + android:text="@string/not_now_text" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/activity_auto_debit_account_listing_v2.xml b/app/src/main/res/layout/activity_auto_debit_account_listing_v2.xml index 0a2b3af0..16eaec98 100644 --- a/app/src/main/res/layout/activity_auto_debit_account_listing_v2.xml +++ b/app/src/main/res/layout/activity_auto_debit_account_listing_v2.xml @@ -38,7 +38,7 @@ android:layout_marginLeft="10dp" android:layout_toRightOf="@id/iv_front_image" android:padding="2dp" - android:text="Add Auto Debit Account" + android:text="@string/add_auto_debit_account_text" android:textColor="@color/darkgray" android:textSize="17sp" /> @@ -53,7 +53,7 @@ android:background="@null" android:enabled="false" android:gravity="center" - android:hint="Hold to "Delete" the account" + android:hint="@string/delete_auto_debit_account_hint_text" android:imeActionLabel="Done" android:inputType="text" android:textSize="14sp" diff --git a/app/src/main/res/layout/activity_penny_test.xml b/app/src/main/res/layout/activity_penny_test.xml index 086580d4..112dc570 100644 --- a/app/src/main/res/layout/activity_penny_test.xml +++ b/app/src/main/res/layout/activity_penny_test.xml @@ -50,7 +50,7 @@ android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:background="@drawable/red_morph_button_bg" - android:text="Proceed" + android:text="@string/proceed_text" android:textAllCaps="false" android:textColor="@color/white" android:textSize="18sp" /> @@ -73,7 +73,7 @@ android:gravity="center" android:paddingTop="10dp" android:paddingBottom="10dp" - android:text="Not now" + android:text="@string/not_now_text" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_withdraw_v2.xml b/app/src/main/res/layout/activity_withdraw_v2.xml index 6b929946..4299e73e 100644 --- a/app/src/main/res/layout/activity_withdraw_v2.xml +++ b/app/src/main/res/layout/activity_withdraw_v2.xml @@ -40,7 +40,7 @@ android:layout_marginBottom="24dp" android:gravity="center" android:singleLine="false" - android:text="How much would you like to refund?" + android:text="@string/how_much_would_you_like_to_refund" android:textColor="@color/darkgray" android:textSize="21sp" app:layout_constraintBottom_toTopOf="@+id/withdrawAvailableTxt" @@ -110,7 +110,7 @@ android:paddingStart="3dp" android:paddingLeft="3dp" android:paddingTop="3dp" - android:text="You Refund" + android:text="@string/you_refund_text" android:textColor="@color/darkgray" android:textSize="16sp" /> @@ -178,7 +178,7 @@ android:layout_marginEnd="8dp" android:layout_marginBottom="50dp" android:background="@drawable/ic_rounded_background_coloured" - android:text="Refund" + android:text="@string/refund_text" android:textAllCaps="false" android:textColor="@color/white" android:textSize="18sp" diff --git a/app/src/main/res/layout/fragment_penny_test_operation.xml b/app/src/main/res/layout/fragment_penny_test_operation.xml index 573dcd62..e33fdcb4 100644 --- a/app/src/main/res/layout/fragment_penny_test_operation.xml +++ b/app/src/main/res/layout/fragment_penny_test_operation.xml @@ -31,7 +31,7 @@ android:layout_marginTop="24dp" android:layout_marginEnd="8dp" android:layout_marginBottom="4dp" - android:hint="Deposit Reference" + android:hint="@string/deposit_reference_text" android:textColorHint="@color/darkgray" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/image_example" @@ -61,7 +61,7 @@ android:layout_marginEnd="8dp" android:gravity="center" android:padding="10dp" - android:text="View Sample" + android:text="@string/view_sample_text" android:textColor="#007aff" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="@+id/accountWrapper" @@ -80,7 +80,7 @@ android:layout_marginEnd="8dp" android:gravity="center" android:padding="10dp" - android:text="@string/resend_request" + android:text="@string/resend_request_text" android:textColor="@color/colorPrimary" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_penny_test_prompt.xml b/app/src/main/res/layout/fragment_penny_test_prompt.xml index 57ae2a25..d7c23295 100644 --- a/app/src/main/res/layout/fragment_penny_test_prompt.xml +++ b/app/src/main/res/layout/fragment_penny_test_prompt.xml @@ -14,7 +14,7 @@ android:paddingStart="15dp" android:paddingEnd="15dp" android:paddingBottom="15dp" - android:text="Your bank account verification is required inorder to complete the registration. Do you want to verify it now?" + android:text="@string/penny_test_promt_description_text" android:textSize="17sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ad9cd4d1..e7638ac5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -40,7 +40,6 @@ Your verification is still in progress. - Resend Request @@ -237,6 +236,51 @@ Add a photo Camera Gallery + Male + Female + Other + Select Gender + No Gender found + Search Country + Select Country + No Country found + Search Province + Select Province + No Province found + Search Occupation + Select Occupation + No Occupation found + Search Source of Fund + Select Source of Fund + No Source of Fund found + Search Id Type + Select Id Type + No Id Type found + Search Primary Bank + Select Primary Bank + No Primary Bank found + Select issue date + Select expiry date + Please provide all images + Auto Refund + How much would you like to refund? + Refund + You Refund + Proceed + Not now + Your bank account verification is required inorder to complete the registration. Do you want to verify it now? + Deposit Reference + Resend Request + New update is available + Update + Manage Auto Debit Account + You want to delete Auto-Debit Account! + Are you sure? + Search Language + Select Language + No Language found + Add Auto Debit Account + Hold to \"Delete\" the account