IME-LONDON
/
LONDON-IOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

multi language applied

pull/1/head
Jeongbae Kong 5 years ago
parent
c8c54ea508
commit
6323976a18
4 changed files with 22 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
  2. 25
      GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRecharge.storyboard
  3. 6
      GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRechargeViewController.swift
  4. 3
      GME Remit/Modules/SplashScreen/User Interface/View/SplashScreenViewController.swift

3
GME Remit/Modules/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
View File

@ -162,7 +162,8 @@ class ExchangeRatesViewController: UIViewController {
let calculatedForUnit = (1/intExchangeRate) let calculatedForUnit = (1/intExchangeRate)
let roundedForUnit = round((calculatedForUnit) * 10) / 10 let roundedForUnit = round((calculatedForUnit) * 10) / 10
forUnitToKoreanLabel.text = "Current Exchange Rate : 1 \(selectedExchangeRateModel?.currency ?? "") = \(roundedForUnit) KRW"
let translated = "current_exchange_rate_text".localized()
forUnitToKoreanLabel.text = "\(translated) : 1 \(selectedExchangeRateModel?.currency ?? "") = \(roundedForUnit) KRW"
forUnitToKoreanLabel.layer.cornerRadius = 5 forUnitToKoreanLabel.layer.cornerRadius = 5
forUnitToKoreanLabel.layer.borderWidth = 1 forUnitToKoreanLabel.layer.borderWidth = 1
forUnitToKoreanLabel.layer.borderColor = UIColor.themeSubBackground.cgColor forUnitToKoreanLabel.layer.borderColor = UIColor.themeSubBackground.cgColor

25
GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRecharge.storyboard
View File

@ -595,7 +595,7 @@
<rect key="frame" x="0.0" y="0.0" width="305" height="25"/> <rect key="frame" x="0.0" y="0.0" width="305" height="25"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Cell Phone" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ATr-GR-fdE"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Cell Phone" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ATr-GR-fdE">
<rect key="frame" x="0.0" y="0.0" width="63.666666666666664" height="25"/>
<rect key="frame" x="0.0" y="0.0" width="68" height="25"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="25" id="DmQ-fW-QTA"/> <constraint firstAttribute="height" constant="25" id="DmQ-fW-QTA"/>
</constraints> </constraints>
@ -604,7 +604,7 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="01052850125" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="F3s-hq-mVr"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="01052850125" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="F3s-hq-mVr">
<rect key="frame" x="63.666666666666671" y="0.0" width="241.33333333333331" height="25"/>
<rect key="frame" x="68" y="0.0" width="237" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/> <color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
@ -615,13 +615,13 @@
<rect key="frame" x="0.0" y="29" width="305" height="25"/> <rect key="frame" x="0.0" y="29" width="305" height="25"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Charge Type" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="592-jP-xgS"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Charge Type" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="592-jP-xgS">
<rect key="frame" x="0.0" y="0.0" width="74.333333333333329" height="25"/>
<rect key="frame" x="0.0" y="0.0" width="78.666666666666671" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<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="251" text="mediaLog 11G(50,600)" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="CiS-wv-umW"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="mediaLog 11G(50,600)" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="CiS-wv-umW">
<rect key="frame" x="74.333333333333329" y="0.0" width="230.66666666666669" height="25"/>
<rect key="frame" x="78.666666666666671" y="0.0" width="226.33333333333331" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/> <color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
@ -632,13 +632,13 @@
<rect key="frame" x="0.0" y="58" width="305" height="25"/> <rect key="frame" x="0.0" y="58" width="305" height="25"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Data" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="798-HQ-YHW"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Data" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="798-HQ-YHW">
<rect key="frame" x="0.0" y="0.0" width="27.666666666666668" height="25"/>
<rect key="frame" x="0.0" y="0.0" width="29.333333333333332" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<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="251" text="11GB + 3M Unlimited" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="VyR-26-utb"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="11GB + 3M Unlimited" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="VyR-26-utb">
<rect key="frame" x="27.666666666666657" y="0.0" width="277.33333333333337" height="25"/>
<rect key="frame" x="29.333333333333343" y="0.0" width="275.66666666666663" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/> <color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
@ -649,13 +649,13 @@
<rect key="frame" x="0.0" y="87" width="305" height="25"/> <rect key="frame" x="0.0" y="87" width="305" height="25"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Voice" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P5S-MB-7Q1"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Voice" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P5S-MB-7Q1">
<rect key="frame" x="0.0" y="0.0" width="33" height="25"/>
<rect key="frame" x="0.0" y="0.0" width="34" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<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="251" text="Unlimited" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="EL5-jZ-vOn"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unlimited" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="EL5-jZ-vOn">
<rect key="frame" x="33" y="0.0" width="272" height="25"/>
<rect key="frame" x="34" y="0.0" width="271" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/> <color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
@ -666,13 +666,13 @@
<rect key="frame" x="0.0" y="116" width="305" height="25"/> <rect key="frame" x="0.0" y="116" width="305" height="25"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="SMS" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ozC-cy-dC6"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="SMS" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ozC-cy-dC6">
<rect key="frame" x="0.0" y="0.0" width="26.666666666666668" height="25"/>
<rect key="frame" x="0.0" y="0.0" width="30.666666666666668" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<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="251" text="Unlimited" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="OnW-ui-fSi"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unlimited" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="OnW-ui-fSi">
<rect key="frame" x="26.666666666666657" y="0.0" width="278.33333333333337" height="25"/>
<rect key="frame" x="30.666666666666657" y="0.0" width="274.33333333333337" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/> <color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
@ -685,13 +685,13 @@
<rect key="frame" x="0.0" y="145" width="305" height="25"/> <rect key="frame" x="0.0" y="145" width="305" height="25"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Payment Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wtY-Oq-MdK"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Payment Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wtY-Oq-MdK">
<rect key="frame" x="0.0" y="0.0" width="106" height="25"/>
<rect key="frame" x="0.0" y="0.0" width="108.33333333333333" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeRed"/> <color key="textColor" name="ThemeRed"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￦ 50,100" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="XLT-1R-BKf"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￦ 50,100" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="XLT-1R-BKf">
<rect key="frame" x="106" y="0.0" width="199" height="25"/>
<rect key="frame" x="108.33333333333336" y="0.0" width="196.66666666666663" height="25"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/> <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeRed"/> <color key="textColor" name="ThemeRed"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
@ -996,6 +996,7 @@
<outlet property="amountButton6" destination="0NT-dR-BSe" id="I0s-Vf-Qkw"/> <outlet property="amountButton6" destination="0NT-dR-BSe" id="I0s-Vf-Qkw"/>
<outlet property="balanceCheckButton" destination="HzE-op-beR" id="ORw-Wi-O65"/> <outlet property="balanceCheckButton" destination="HzE-op-beR" id="ORw-Wi-O65"/>
<outlet property="balanceStackView" destination="Dua-8R-eEg" id="imh-wd-A5K"/> <outlet property="balanceStackView" destination="Dua-8R-eEg" id="imh-wd-A5K"/>
<outlet property="balanceTitleLabel" destination="uBn-YF-GFl" id="7jY-aq-shY"/>
<outlet property="carrierPlanDetailView" destination="LIi-3m-pgI" id="Pg8-ih-UkC"/> <outlet property="carrierPlanDetailView" destination="LIi-3m-pgI" id="Pg8-ih-UkC"/>
<outlet property="carrierPlanTextField" destination="12I-NP-LBC" id="ik6-hV-eZ0"/> <outlet property="carrierPlanTextField" destination="12I-NP-LBC" id="ik6-hV-eZ0"/>
<outlet property="carrierTypeTextField" destination="O2g-I1-ksu" id="ayr-JH-N5h"/> <outlet property="carrierTypeTextField" destination="O2g-I1-ksu" id="ayr-JH-N5h"/>

6
GME Remit/Modules/PowerCallModules/LocalTopup/PhoneCardRecharge/User Interface/View/PhoneCardRechargeViewController.swift
View File

@ -43,7 +43,9 @@ class PhoneCardRechargeViewController: UIViewController {
@IBOutlet private weak var wonCurrencyLabel: UILabel! @IBOutlet private weak var wonCurrencyLabel: UILabel!
@IBOutlet private weak var mycashAmountLabel: UILabel! @IBOutlet private weak var mycashAmountLabel: UILabel!
@IBOutlet weak var realBalanceLabel: UILabel!
@IBOutlet private weak var balanceTitleLabel: UILabel!
@IBOutlet private weak var realBalanceLabel: UILabel!
@IBOutlet private weak var typeSegment: UISegmentedControl! @IBOutlet private weak var typeSegment: UISegmentedControl!
@IBOutlet private weak var mainContainerView: UIView! @IBOutlet private weak var mainContainerView: UIView!
@ -183,6 +185,8 @@ extension PhoneCardRechargeViewController {
] ]
mobileTextField.validCondition = {!$0.isEmpty && $0.count == 11} mobileTextField.validCondition = {!$0.isEmpty && $0.count == 11}
balanceTitleLabel.text = "domestic_available_balance_text".localized()
mobileTextField.errorMessage = "kyc_mobile_invalid_number_error".localized() mobileTextField.errorMessage = "kyc_mobile_invalid_number_error".localized()
mobileTextField.placeholder = "mobile_placeholder_text".localized() mobileTextField.placeholder = "mobile_placeholder_text".localized()

3
GME Remit/Modules/SplashScreen/User Interface/View/SplashScreenViewController.swift
View File

@ -153,7 +153,8 @@ class SplashScreenViewController: UIViewController {
let calculatedForUnit = (1/intExchangeRate) let calculatedForUnit = (1/intExchangeRate)
let roundedForUnit = round((calculatedForUnit) * 10) / 10 let roundedForUnit = round((calculatedForUnit) * 10) / 10
exchangeRateForUnitLabel.text = "Current Exchange Rate : 1 \(selectedExchangeRateModel?.currency ?? "") = \(roundedForUnit) KRW"
let translated = "current_exchange_rate_text".localized()
exchangeRateForUnitLabel.text = "\(translated) : 1 \(selectedExchangeRateModel?.currency ?? "") = \(roundedForUnit) KRW"
exchangeRateForUnitLabel.layer.cornerRadius = 5 exchangeRateForUnitLabel.layer.cornerRadius = 5
exchangeRateForUnitLabel.layer.borderWidth = 1 exchangeRateForUnitLabel.layer.borderWidth = 1
exchangeRateForUnitLabel.layer.borderColor = UIColor.themeBlack.cgColor exchangeRateForUnitLabel.layer.borderColor = UIColor.themeBlack.cgColor

Write Preview
Loading…
Cancel
Save