Browse Source

done adding multi-language

pull/1/head
Jeongbae Kong 5 years ago
parent
commit
4b8fe32e1f
  1. 1
      GME Remit/Modules/PowerCallModules/InternationalTopup/Application Logic/Service/InternationalTopupServiceType.swift
  2. 8
      GME Remit/Modules/Profile/ChangePersonalInformation/User Interface/View/ChangePersonalInformation.storyboard
  3. 29
      GME Remit/Modules/Profile/ChangePersonalInformation/User Interface/View/ChangePersonalInformationViewController.swift
  4. 1
      GME Remit/Modules/Profile/PersonalInformation/User Interface/View/PersonalInformation.storyboard
  5. 14
      GME Remit/Modules/Profile/PersonalInformation/User Interface/View/PersonalInformationViewController.swift
  6. 1
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyCode/User Interface/Presenter/SendMoneyCodePresenter.swift
  7. 6
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewController.swift
  8. 4
      GME Remit/Utilities/CustomUI/GMEAlert/GMEAlertViewController.xib

1
GME Remit/Modules/PowerCallModules/InternationalTopup/Application Logic/Service/InternationalTopupServiceType.swift

@ -7,4 +7,5 @@
// //
protocol InternationalTopupServiceType: class, PhoneCardRechargeServiceType { protocol InternationalTopupServiceType: class, PhoneCardRechargeServiceType {
} }

8
GME Remit/Modules/Profile/ChangePersonalInformation/User Interface/View/ChangePersonalInformation.storyboard

@ -26,13 +26,13 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To change your phone number, fill in the blank below" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Mn-mo-EK2"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To change your phone number, fill in the blank below" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Mn-mo-EK2">
<rect key="frame" x="10" y="74" width="394" height="18"/>
<rect key="frame" x="10" y="74" width="394" height="17.666666666666671"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="15"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="15"/>
<color key="textColor" name="ThemeText"/> <color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eBN-Pn-EFP"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eBN-Pn-EFP">
<rect key="frame" x="10" y="112" width="394" height="186"/>
<rect key="frame" x="10" y="111.66666666666669" width="394" height="186"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Phone Number" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yl9-0f-6ou"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Phone Number" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yl9-0f-6ou">
<rect key="frame" x="8" y="0.0" width="376" height="50"/> <rect key="frame" x="8" y="0.0" width="376" height="50"/>
@ -45,14 +45,14 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7VJ-BF-94s"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7VJ-BF-94s">
<rect key="frame" x="10" y="55" width="374" height="1"/>
<rect key="frame" x="10" y="54.999999999999986" width="374" height="1"/>
<color key="backgroundColor" name="ThemeSeparate"/> <color key="backgroundColor" name="ThemeSeparate"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="1" id="1f2-Sw-wbf"/> <constraint firstAttribute="height" constant="1" id="1f2-Sw-wbf"/>
</constraints> </constraints>
</view> </view>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your New Phone Number" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Y39-L3-fiV" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target"> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your New Phone Number" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Y39-L3-fiV" customClass="ValidationTextField" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="10" y="71" width="374" height="50"/>
<rect key="frame" x="10" y="70.999999999999986" width="374" height="50"/>
<constraints> <constraints>
<constraint firstAttribute="height" priority="750" constant="50" id="TUw-fd-7sX"/> <constraint firstAttribute="height" priority="750" constant="50" id="TUw-fd-7sX"/>
<constraint firstAttribute="width" secondItem="Y39-L3-fiV" secondAttribute="height" multiplier="187:25" id="gmw-gj-EXs"/> <constraint firstAttribute="width" secondItem="Y39-L3-fiV" secondAttribute="height" multiplier="187:25" id="gmw-gj-EXs"/>

29
GME Remit/Modules/Profile/ChangePersonalInformation/User Interface/View/ChangePersonalInformationViewController.swift

@ -74,9 +74,9 @@ extension ChangePersonalInformationViewController: ChangePersonalInformationView
func successProfileValidationOTP() { func successProfileValidationOTP() {
self.alertWithOk( self.alertWithOk(
type: .success, type: .success,
message: "Verification is all completed",
title: "Will change your personal information",
okTitle: "OK"
message: "verification_completed_title_text".localized(),
title: "will_change_your_personal_information_title_text".localized(),
okTitle: "ok_text".localized()
) { ) {
if let newValue = self.changeInformationTextField.text { if let newValue = self.changeInformationTextField.text {
self.presenter?.changeProfileInformation(newValue: newValue, target: self.target ?? "") self.presenter?.changeProfileInformation(newValue: newValue, target: self.target ?? "")
@ -90,9 +90,9 @@ extension ChangePersonalInformationViewController: ChangePersonalInformationView
self.alertWithOk( self.alertWithOk(
type: .success, type: .success,
message: "Will prceed to check OTP",
title: "Successfully verify password",
okTitle: "OK"
message: "will_proceed_to_check_otp_title_text".localized(),
title: "successfully_verified_password_title_text".localized(),
okTitle: "ok_text".localized()
) { ) {
if let newValue = self.changeInformationTextField.text { if let newValue = self.changeInformationTextField.text {
self.presenter?.openOTP(newValue: newValue) self.presenter?.openOTP(newValue: newValue)
@ -132,15 +132,18 @@ extension ChangePersonalInformationViewController {
switch type { switch type {
case .mobile: case .mobile:
navigationItem.title = "Change your phonenumber"
navigationItem.title = "change_your_phonenumber_title_text".localized()
changeDescriptionLabel.text = "change_your_phonenumber_instruction_text".localized()
whatToChangeLabel.text = "new_phonenumber_text".localized()
changeInformationTextField.placeholder = "enter_your_new_phonenumber_text".localized()
case .email: case .email:
changeInformationTextField.keyboardType = .emailAddress changeInformationTextField.keyboardType = .emailAddress
navigationItem.title = "Change your e-mail"
changeDescriptionLabel.text = "To change E-mail, fill in the blank below"
whatToChangeLabel.text = "New E-mail"
changeInformationTextField.placeholder = "Enter your New E-mail Address"
navigationItem.title = "change_your_email_title_text".localized()
changeDescriptionLabel.text = "change_your_email_instruction_text".localized()
whatToChangeLabel.text = "new_email_text".localized()
changeInformationTextField.placeholder = "enter_your_new_email_text".localized()
} }
} }
@ -224,8 +227,8 @@ extension ChangePersonalInformationViewController: BiometricAuthenticationViewCo
authenticationButton button: UIButton authenticationButton button: UIButton
) { ) {
// titleLabel.text = "bio_sendmoney_intro_text".localized() // titleLabel.text = "bio_sendmoney_intro_text".localized()
titleLabel.text = "Check biometricAuthentication"
titleLabel.text = "use_biometric_authentication_text".localized()
// button.setTitle("send_money_text".localized(), for: .normal) // button.setTitle("send_money_text".localized(), for: .normal)
button.setTitle("Confirm", for: .normal)
button.setTitle("verify_account_button_text".localized(), for: .normal)
} }
} }

1
GME Remit/Modules/Profile/PersonalInformation/User Interface/View/PersonalInformation.storyboard

@ -390,6 +390,7 @@
<outlet property="passwordLabel" destination="y4n-2e-7bX" id="sa3-GT-BT4"/> <outlet property="passwordLabel" destination="y4n-2e-7bX" id="sa3-GT-BT4"/>
<outlet property="passwordStackView" destination="knL-7r-WMU" id="ntM-2B-OmM"/> <outlet property="passwordStackView" destination="knL-7r-WMU" id="ntM-2B-OmM"/>
<outlet property="passwordTitleLabel" destination="Eoc-Qu-EPI" id="zVR-Ag-9a9"/> <outlet property="passwordTitleLabel" destination="Eoc-Qu-EPI" id="zVR-Ag-9a9"/>
<outlet property="personalInformationTitleLabel" destination="wlF-5N-Ryp" id="YCM-aC-S46"/>
<outlet property="phoneNumberLabel" destination="vAG-Hh-Mvs" id="DX4-VA-m0e"/> <outlet property="phoneNumberLabel" destination="vAG-Hh-Mvs" id="DX4-VA-m0e"/>
<outlet property="phoneNumberStackView" destination="cGR-BI-2bA" id="RqP-EL-ll4"/> <outlet property="phoneNumberStackView" destination="cGR-BI-2bA" id="RqP-EL-ll4"/>
<outlet property="phoneNumberTitleLabel" destination="e1S-AD-Dk9" id="itx-Eq-SdB"/> <outlet property="phoneNumberTitleLabel" destination="e1S-AD-Dk9" id="itx-Eq-SdB"/>

14
GME Remit/Modules/Profile/PersonalInformation/User Interface/View/PersonalInformationViewController.swift

@ -7,6 +7,7 @@
// //
import UIKit import UIKit
import Localize_Swift
class PersonalInformationViewController: UIViewController { class PersonalInformationViewController: UIViewController {
@ -44,6 +45,8 @@ class PersonalInformationViewController: UIViewController {
// MARK: IBOutlets // MARK: IBOutlets
@IBOutlet weak var personalInformationTitleLabel: UILabel!
@IBOutlet weak var nameStackView: UIStackView! @IBOutlet weak var nameStackView: UIStackView!
@IBOutlet weak var nationalityStackView: UIStackView! @IBOutlet weak var nationalityStackView: UIStackView!
@IBOutlet weak var birthdayStackView: UIStackView! @IBOutlet weak var birthdayStackView: UIStackView!
@ -118,7 +121,16 @@ extension PersonalInformationViewController: PersonalInformationViewInterface {
// MARK: Other Functions // MARK: Other Functions
extension PersonalInformationViewController { extension PersonalInformationViewController {
private func setup() { private func setup() {
navigationItem.title = "Personal Information"
navigationItem.title = "change_personal_information_title_text".localized()
personalInformationTitleLabel.text = "change_personal_information_title_text".localized()
nameTitleLabel.text = "name_title_text".localized()
nationalityTitleLabel.text = "nationality_title_text".localized()
birthdayTitleLabel.text = "birthday_title_text".localized()
phoneNumberTitleLabel.text = "phoneNumber_title_text".localized()
emailTitleLabel.text = "email_title_text".localized()
passwordTitleLabel.text = "password_title_text".localized()
passwordLabel.text = "change_to_new_password_text".localized()
setupTarget() setupTarget()
} }

1
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyCode/User Interface/Presenter/SendMoneyCodePresenter.swift

@ -38,7 +38,6 @@ extension SendMoneyCodePresenter: SendMoneyCodeModuleInterface {
} }
} }
func viewIsReady() { func viewIsReady() {
if otpCount < 3 { if otpCount < 3 {
self.view?.showLoading() self.view?.showLoading()

6
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyCode/User Interface/View/SendMoneyCodeViewController.swift

@ -198,9 +198,9 @@ extension SendMoneyCodeViewController: SendMoneyCodeViewInterface {
func successChangeProfileInformation() { func successChangeProfileInformation() {
self.alertWithOk( self.alertWithOk(
type: .success, type: .success,
message: "Type 4-digit OTP number",
title: "new OTP number has re-sent",
okTitle: "OK"
message: "type_4_digit_OTP_number_text".localized(),
title: "new_otp_number_has_sent_text".localized(),
okTitle: "ok_text".localized()
) )
startTimer() startTimer()
} }

4
GME Remit/Utilities/CustomUI/GMEAlert/GMEAlertViewController.xib

@ -70,13 +70,13 @@
<rect key="frame" x="20" y="10" width="260" height="139"/> <rect key="frame" x="20" y="10" width="260" height="139"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Would you like to renew your token now?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="rfn-wg-MBE"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Would you like to renew your token now?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="rfn-wg-MBE">
<rect key="frame" x="0.0" y="0.0" width="260" height="67"/>
<rect key="frame" x="0.0" y="0.0" width="260" height="52"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="18"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="18"/>
<color key="textColor" name="ThemeText"/> <color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="vZn-aC-Kup"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="vZn-aC-Kup">
<rect key="frame" x="0.0" y="72" width="260" height="67"/>
<rect key="frame" x="0.0" y="57" width="260" height="82"/>
<string key="text">Your auto debit token expires after 30 days. <string key="text">Your auto debit token expires after 30 days.
(If don't renew until 30 days then you can't use auto-debit)</string> (If don't renew until 30 days then you can't use auto-debit)</string>

Loading…
Cancel
Save