From 1f93a2e8c83e592ec26831b9c36bdbb75f960da8 Mon Sep 17 00:00:00 2001
From: gme_2 <sis.ccr@gmail.com>
Date: Thu, 7 Mar 2019 14:43:28 +0900
Subject: [PATCH] language updated

---
 GMERemittance/AppDelegate.swift                        |  2 +-
 .../Exchange Rate/ExchangeRateViewController.swift     |  7 +++++++
 .../View/AddReciepientViewController.swift             |  4 ++--
 .../View/ExchangeRatesViewController.swift             | 10 +++++-----
 .../View/SendMoneyPaymentModeViewController.swift      |  5 +++++
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/GMERemittance/AppDelegate.swift b/GMERemittance/AppDelegate.swift
index 0ab2b7a1..1913a224 100644
--- a/GMERemittance/AppDelegate.swift
+++ b/GMERemittance/AppDelegate.swift
@@ -20,7 +20,7 @@ import IQKeyboardManagerSwift
 import LGSideMenuController
 import Localize_Swift
    
-let server: Server = .stagging
+let server: Server = .uat
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate, MessagingDelegate {
diff --git a/GMERemittance/Exchange Rate/ExchangeRateViewController.swift b/GMERemittance/Exchange Rate/ExchangeRateViewController.swift
index 0ab658e9..8e639286 100644
--- a/GMERemittance/Exchange Rate/ExchangeRateViewController.swift	
+++ b/GMERemittance/Exchange Rate/ExchangeRateViewController.swift	
@@ -29,6 +29,9 @@ class ExchangeRateViewController: UIViewController {
     
     var transferLimit: Double?
     
+    
+    
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setUpNavBar(id: 201, title: "Today's Rate")
@@ -65,6 +68,8 @@ class ExchangeRateViewController: UIViewController {
         }
         
         
+        
+        
         /**
          Check internet connection
          */
@@ -77,6 +82,8 @@ class ExchangeRateViewController: UIViewController {
             self.popUpMessage(value: 15)
         }
         
+        
+        
         /**
          Request an api to calculate conversion amount.
          */
diff --git a/GMERemittance/Module/AddReciepient/User Interface/View/AddReciepientViewController.swift b/GMERemittance/Module/AddReciepient/User Interface/View/AddReciepientViewController.swift
index 1865a5a9..51d67e6a 100644
--- a/GMERemittance/Module/AddReciepient/User Interface/View/AddReciepientViewController.swift	
+++ b/GMERemittance/Module/AddReciepient/User Interface/View/AddReciepientViewController.swift	
@@ -26,8 +26,8 @@ class AddReciepientViewController: UIViewController {
         let addRecipientTitle = "add_recipient_text".localized()
         // placeholder
         let firstnamePlaceholder = "placeholder_enter_receiver_firstname_text".localized()
-        let lastnamePlaceholder = "placeholder_enter_receiver_middle_text".localized()
-        let middlenamePlaceholder = "placeholder_enter_receiver_lastname_text".localized()
+        let lastnamePlaceholder = "placeholder_enter_receiver_lastname_text".localized()
+        let middlenamePlaceholder = "placeholder_enter_receiver_middle_text".localized()
         let countryPlaceholder = "placeholder_select_country_text".localized()
         let statePlaceholder = "state_placeholder_text".localized()
         let districtPlaceholder = "district_placeholder_text".localized()
diff --git a/GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift b/GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
index bc5917ac..ebd14ac1 100644
--- a/GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift	
+++ b/GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift	
@@ -23,10 +23,10 @@ enum PaymentMode: String {
 class ExchangeRatesViewController: UIViewController {
     
     struct Constants {
-        static let transferFeeDetailText = StringConstants().transferFeeDetailText
-        static let currentExchangeRateText =  StringConstants().currentExchangeRateText
-        static let paymentModeHeightConstant: CGFloat = 154
-        static let title = StringConstants().title
+         let transferFeeDetailText = StringConstants().transferFeeDetailText
+         let currentExchangeRateText =  StringConstants().currentExchangeRateText
+         let paymentModeHeightConstant: CGFloat = 154
+         let title = StringConstants().title
     }
     
     struct StringConstants {
@@ -154,7 +154,7 @@ class ExchangeRatesViewController: UIViewController {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        self.title = Constants.title
+        self.title = Constants().title
     }
     
     
diff --git a/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift b/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift
index 4e4da080..a441e620 100644
--- a/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift	
+++ b/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift	
@@ -140,6 +140,11 @@ class SendMoneyPaymentModeViewController: UIViewController {
     }
     
     
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        self.navigationItem.title = "send_money_title_text".localized()
+    }
+    
     func configureLanguage() {
         self.titleLabel.text = "pick_money_text".localized()
         self.bankTextField.placeholder = StringConstants().bankPlaceholder