From 91bf602c3b7648a2b1a999132d9a7f928dcfe4a6 Mon Sep 17 00:00:00 2001 From: gme_2 Date: Fri, 22 Feb 2019 11:59:03 +0900 Subject: [PATCH] missing key added --- .../Interactor/ForgotPasswordInteractor.swift | 6 +++--- .../Application Logic/Interactor/LoginInteractor.swift | 4 ++-- en.lproj/Localizable.strings | 2 +- id.lproj/Localizable.strings | 2 +- km.lproj/Localizable.strings | 2 +- mn.lproj/Localizable.strings | 2 +- ne.lproj/Localizable.strings | 2 +- si.lproj/Localizable.strings | 1 + th.lproj/Localizable.strings | 1 + 9 files changed, 12 insertions(+), 10 deletions(-) diff --git a/GMERemittance/Module/ForgotPassword/Application Logic/Interactor/ForgotPasswordInteractor.swift b/GMERemittance/Module/ForgotPassword/Application Logic/Interactor/ForgotPasswordInteractor.swift index 10495a18..acd6e4cc 100644 --- a/GMERemittance/Module/ForgotPassword/Application Logic/Interactor/ForgotPasswordInteractor.swift +++ b/GMERemittance/Module/ForgotPassword/Application Logic/Interactor/ForgotPasswordInteractor.swift @@ -26,19 +26,19 @@ class ForgotPasswordInteractor { var error = "" var isValid = true if userName.contains("@") { - if !Utility.isValidEmail(email: userName) {error = error + "Please enter a valid email id" + if !Utility.isValidEmail(email: userName) {error = error + "email_valid_error".localized() isValid = false } }else { isValid = true if ( userName.rangeOfCharacter(from: NSCharacterSet.letters) != nil) { - error = error + "Please enter a valid email id" + error = error + "email_valid_error".localized() isValid = false } } if userName.isEmpty { - error = error + "Please enter a valid email id"; + error = error + "email_valid_error".localized(); isValid = false } let _error = NSError.init(domain: "ForgotPasswordInteractor", code: 0, userInfo: [NSLocalizedDescriptionKey : error]) diff --git a/GMERemittance/Module/Login/Application Logic/Interactor/LoginInteractor.swift b/GMERemittance/Module/Login/Application Logic/Interactor/LoginInteractor.swift index e0c5c9af..0535624e 100644 --- a/GMERemittance/Module/Login/Application Logic/Interactor/LoginInteractor.swift +++ b/GMERemittance/Module/Login/Application Logic/Interactor/LoginInteractor.swift @@ -35,11 +35,11 @@ class LoginInteractor { var error = "" var isValid = true if userName.isEmpty { - error = error + "user_id_empty_error".localized(); + error = error + "\n" + "user_id_empty_error".localized(); isValid = false } - if password.isEmpty {error = error + "password_empty_error".localized(); + if password.isEmpty {error = error + "\n" + "password_empty_error".localized(); isValid = false } let _error = NSError.init(domain: "LoginInteractor", code: 0, userInfo: [NSLocalizedDescriptionKey : error]) diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index f71e7f25..61cd4305 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -352,5 +352,5 @@ "language_text" = "Language"; "email_valid_error" = "Please enter a valid email id"; -"dob_valid_error" = "Please enter a valid email id"; +"dob_valid_error" = "Please enter a valid date of birth"; "user_id_empty_error" = "User id cannot be empty"; diff --git a/id.lproj/Localizable.strings b/id.lproj/Localizable.strings index b4683ab2..cef3dade 100644 --- a/id.lproj/Localizable.strings +++ b/id.lproj/Localizable.strings @@ -334,7 +334,7 @@ "swift_to_delete_account_text" = "Geser ke kiri untuk Edit atau Hapus akun."; "language_text" = "Bahasa"; - +"ok_text" = "Ok"; "email_valid_error" = "Please enter a valid email id"; "dob_valid_error" = "Please enter a valid email id"; diff --git a/km.lproj/Localizable.strings b/km.lproj/Localizable.strings index 65168835..36c6883e 100644 --- a/km.lproj/Localizable.strings +++ b/km.lproj/Localizable.strings @@ -353,7 +353,7 @@ "new_update_is_available_text" = "មានការអាប់ដែតថ្មី"; "update_text" = "អាប់ដែត"; - +"ok_text" = "Ok"; "auto_debit_title_text" = "គ្រប់គ្រងគណនីកាត់លុយដោយស្វយ័ប្រវត្តិ"; "are_you_sure_text" = "តើអ្នកប្រកដឬទេ?"; diff --git a/mn.lproj/Localizable.strings b/mn.lproj/Localizable.strings index d13a7433..f3b3987b 100644 --- a/mn.lproj/Localizable.strings +++ b/mn.lproj/Localizable.strings @@ -334,7 +334,7 @@ "delete_auto_debit_account_hint_text" = "Холбуулсан дансыг устгахын тулд удаан дарна уу"; "no_lanugages_available_text" = "Хэл байхгүй байна"; "swift_to_delete_account_text" = "Аккаунтыг засах болон устгах бол дэлгэцийн зүүн тийш гүйлгэнэ үү"; - +"ok_text" = "Ok"; "email_valid_error" = "Please enter a valid email id"; "dob_valid_error" = "Please enter a valid email id"; diff --git a/ne.lproj/Localizable.strings b/ne.lproj/Localizable.strings index 69e36759..ca37d42a 100644 --- a/ne.lproj/Localizable.strings +++ b/ne.lproj/Localizable.strings @@ -80,7 +80,7 @@ "who_to_send_text" = "कसलाई पैसा पठाउँदै हुनुहुन्छ ? "; "first_name_text" = "पहिलो नाम "; "placeholder_enter_receiver_firstname_text" = "पाउने व्यक्तिको पहिलो नाम रख्नुहोस "; -"enter_receiver_middlename_text"="Not Translated"; +"enter_receiver_middlename_text"="बीचको नाम (अनिवार्य छैन)"; "placeholder_enter_receiver_middle_text" = "पाउने व्यक्तिको बिचको नाम रख्नुहोस "; "last_name_text" = "अन्तिम नाम "; "placeholder_enter_receiver_lastname_text" = "पाउने व्यक्तिको अन्तिम नाम रख्नुहोस "; diff --git a/si.lproj/Localizable.strings b/si.lproj/Localizable.strings index 60d9f729..0e0b732a 100644 --- a/si.lproj/Localizable.strings +++ b/si.lproj/Localizable.strings @@ -348,6 +348,7 @@ "no_lanugages_available_text" = "No Languages Available"; "swift_to_delete_account_text" = "ගිණුමේ සංස්කරණය කිරීමට හෝ මකා දැමීමට වමට Swipe කරන්න"; "language_text" = "Language"; +"ok_text" = "Ok"; "email_valid_error" = "Please enter a valid email id"; "dob_valid_error" = "Please enter a valid email id"; diff --git a/th.lproj/Localizable.strings b/th.lproj/Localizable.strings index 21b0b70b..a615355e 100644 --- a/th.lproj/Localizable.strings +++ b/th.lproj/Localizable.strings @@ -225,6 +225,7 @@ "verification_id_back_text" = "บัตรประจำตัวด้านหลัง"; "passbook_text" = "สมุดบัญชีธนาคารเกาหลี"; "passport_text" = "dummy"; +"ok_text" = "Ok"; "submit_text" = "ส่งเอกสาร"; "kyc_document_note_text" = "*บัตรประจำตัวสามารถใช้ได้ทั้งบัตรประชาชนเกาหลี บัตรประจำตัวต่างด้าว หรือพาสปอร์ต(ด้านหน้า)ตามที่ได้ระบุไว้ในหน้าระบบความปลอดภัย"; "kyc_photo_upload_dialog_title" = "dummy";