From f8341c064b20b923da2fa896c77b36a5671500bf Mon Sep 17 00:00:00 2001 From: james Date: Tue, 21 May 2019 11:02:28 +0900 Subject: [PATCH] ready for multi language --- .../View/DetailOrderViewController.swift | 16 ++--- .../View/OrderHistoryViewController.swift | 10 +-- .../View/RedeemViewController.swift | 18 ++--- .../View/RewardViewController.swift | 8 +-- .../View/RewardGroupViewController.swift | 2 +- en.lproj/Localizable.strings | 66 +++++++++---------- 6 files changed, 60 insertions(+), 60 deletions(-) diff --git a/GMERemittance/Module/RewardModules/DetailOrder/User Interface/View/DetailOrderViewController.swift b/GMERemittance/Module/RewardModules/DetailOrder/User Interface/View/DetailOrderViewController.swift index 220e2e6d..61c82d11 100644 --- a/GMERemittance/Module/RewardModules/DetailOrder/User Interface/View/DetailOrderViewController.swift +++ b/GMERemittance/Module/RewardModules/DetailOrder/User Interface/View/DetailOrderViewController.swift @@ -81,7 +81,7 @@ class DetailOrderViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - title = "detail_order_title".localized() + title = "detail_order_title_text".localized() } override func viewWillDisappear(_ animated: Bool) { @@ -113,13 +113,13 @@ extension DetailOrderViewController { private func setMultiLanguage(){ receiverNameTitleLabel.text = "receiver_text".localized() mobileNumberTitleLabel.text = "mobile_number_text".localized() - pickupBranchTitleLabel.text = "pickup_banch".localized() - productNameTitleLabel.text = "product_name".localized() - productPointTitleLabel.text = "product_point".localized() - orderIDNumberTitleLabel.text = "order_no".localized() - orderDateTitleLabel.text = "order_date".localized() - orderReceiveDateTitleLabel.text = "order_receive_date".localized() - orderTypeTitleLabel.text = "order_type".localized() + pickupBranchTitleLabel.text = "pickup_banch_text".localized() + productNameTitleLabel.text = "product_name_text".localized() + productPointTitleLabel.text = "product_point_text".localized() + orderIDNumberTitleLabel.text = "order_no_text".localized() + orderDateTitleLabel.text = "order_date_text".localized() + orderReceiveDateTitleLabel.text = "order_receive_date_text".localized() + orderTypeTitleLabel.text = "order_type_text".localized() } } diff --git a/GMERemittance/Module/RewardModules/OrderHistory/User Interface/View/OrderHistoryViewController.swift b/GMERemittance/Module/RewardModules/OrderHistory/User Interface/View/OrderHistoryViewController.swift index e2c021a9..3e94f502 100644 --- a/GMERemittance/Module/RewardModules/OrderHistory/User Interface/View/OrderHistoryViewController.swift +++ b/GMERemittance/Module/RewardModules/OrderHistory/User Interface/View/OrderHistoryViewController.swift @@ -161,10 +161,10 @@ extension OrderHistoryViewController { private func setMultiLanguage(){ searchBar.placeholder = "search_text".localized() - orderedColorLabel.text = "ordered".localized() - receivedColorLabel.text = "received".localized() - canceledColorLabel.text = "canceled".localized() - noOrderHistoryLabel.text = "no_orders_message".localized() + orderedColorLabel.text = "ordered_text".localized() + receivedColorLabel.text = "received_text".localized() + canceledColorLabel.text = "canceled_text".localized() + noOrderHistoryLabel.text = "no_orders_message_text".localized() } private func initDelegate(){ @@ -215,7 +215,7 @@ extension OrderHistoryViewController { // MARK: - XLPagerTabStrip'`s IndicatorInfoProvider extension OrderHistoryViewController: IndicatorInfoProvider { func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo { - return IndicatorInfo.init(title: "orders".localized()) + return IndicatorInfo.init(title: "orders_group_title_text".localized()) } } diff --git a/GMERemittance/Module/RewardModules/Redeem/User Interface/View/RedeemViewController.swift b/GMERemittance/Module/RewardModules/Redeem/User Interface/View/RedeemViewController.swift index dd64a8a6..2ee2f53c 100644 --- a/GMERemittance/Module/RewardModules/Redeem/User Interface/View/RedeemViewController.swift +++ b/GMERemittance/Module/RewardModules/Redeem/User Interface/View/RedeemViewController.swift @@ -183,7 +183,7 @@ class RedeemViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - title = "reward_group_title".localized() + title = "reward_group_title_text".localized() } override func viewWillDisappear(_ animated: Bool) { @@ -266,8 +266,8 @@ extension RedeemViewController: RedeemViewInterface { func submitSuccess(){ alert( - message: "order_completed_message".localized(), - title: "order_completed_message_title".localized() + message: "order_completed_message_text".localized(), + title: "order_completed_message_title_text".localized() ){[weak self] in guard let `self` = self else {return} @@ -399,16 +399,16 @@ extension RedeemViewController { } private func setMultiLanguage(){ - redeemTitleLabel.text = "redeem".localized() - pointsWillBeDeductedLabel.text = "points_deducted".localized() - fromTourRewardPointLabel.text = "from_your_reward_point".localized() + redeemTitleLabel.text = "redeem_text".localized() + pointsWillBeDeductedLabel.text = "points_deducted_text".localized() + fromTourRewardPointLabel.text = "from_your_reward_point_text".localized() receiverTitleLabel.text = "receiver_text".localized() phoneNumberTitleLabel.text = "mobile_number_text".localized() - selectAddressInfoLabel.text = "select_branch_for_redeem_your_reward".localized() - branchTextField.placeholder = "select_branch".localized() - branchInfotmationTitleLabel.text = "you_visit_nearest_gme_branch_to_redeem".localized() + selectAddressInfoLabel.text = "select_branch_for_redeem_your_reward_text".localized() + branchTextField.placeholder = "select_branch_text".localized() + branchInfotmationTitleLabel.text = "you_visit_nearest_gme_branch_to_redeem_text".localized() submitButton.setTitle("submit_text".localized(), for: .normal) diff --git a/GMERemittance/Module/RewardModules/Reward/User Interface/View/RewardViewController.swift b/GMERemittance/Module/RewardModules/Reward/User Interface/View/RewardViewController.swift index 197b1fcc..f097b3a3 100644 --- a/GMERemittance/Module/RewardModules/Reward/User Interface/View/RewardViewController.swift +++ b/GMERemittance/Module/RewardModules/Reward/User Interface/View/RewardViewController.swift @@ -47,7 +47,7 @@ class RewardViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - title = "reward_group_title".localized() + title = "reward_group_title_text".localized() presenter?.viewIsReady() rewardPoint = UserDefaults.standard.string(forKey: UserKeys.rewardPoint) } @@ -78,8 +78,8 @@ class RewardViewController: UIViewController { } private func setMultiLanguage() { - rewardPointTitleLabel.text = "reward_points".localized() - rewardNoteLabel.text = "reward_note".localized() + rewardPointTitleLabel.text = "reward_points_text".localized() + rewardNoteLabel.text = "reward_note_text".localized() } private func setCollectionViewLayout() { @@ -189,6 +189,6 @@ extension RewardViewController: UICollectionViewDataSource { // MARK: - XLPagerTabStrip's IndicatorInfoProvider extension RewardViewController: IndicatorInfoProvider { func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo { - return IndicatorInfo.init(title: "products".localized()) + return IndicatorInfo.init(title: "products_text".localized()) } } diff --git a/GMERemittance/Module/RewardModules/RewardGroup/User Interface/View/RewardGroupViewController.swift b/GMERemittance/Module/RewardModules/RewardGroup/User Interface/View/RewardGroupViewController.swift index 80223170..8e2c0bb8 100644 --- a/GMERemittance/Module/RewardModules/RewardGroup/User Interface/View/RewardGroupViewController.swift +++ b/GMERemittance/Module/RewardModules/RewardGroup/User Interface/View/RewardGroupViewController.swift @@ -33,7 +33,7 @@ class RewardGroupViewController: ButtonBarPagerTabStripViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - title = "reward_group_title".localized() + title = "reward_group_title_text".localized() } override func viewWillDisappear(_ animated: Bool) { diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index 3b7f8ee5..675d5049 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -419,50 +419,50 @@ "bio_login_intro" = "Please enter authentication information for login"; // RewardGroup -"reward_group_title" = "Reward"; +"reward_group_title_text" = "Reward"; // RedeemViewContoller -"redeem" = "Redeem"; -"points_deducted" = "Points will be deducted"; -"from_your_reward_point" = "from your reward point"; -"receiver" = "Receiver"; -"select_branch_for_redeem_your_reward" = "Select branch for redeem your reward."; -"select_branch" = "Select branch"; -"you_visit_nearest_gme_branch_to_redeem" = "You visit nearest GME branch to redeem your reward directly."; -"order_completed_message" = "Your order has been completed.\nTake it from the branch of your choice."; -"order_completed_message_title" = "Congratulation"; +"redeem_text" = "Redeem"; +"points_deducted_text" = "Points will be deducted"; +"from_your_reward_point_text" = "from your reward point"; +"receiver_text" = "Receiver"; +"select_branch_for_redeem_your_reward_text" = "Select branch for redeem your reward."; +"select_branch_text" = "Select branch"; +"you_visit_nearest_gme_branch_to_redeem_text" = "You visit nearest GME branch to redeem your reward directly."; +"order_completed_message_text" = "Your order has been completed.\nTake it from the branch of your choice."; +"order_completed_message_title_text" = "Congratulation"; // RewardViewController -"products" = "Products"; -"reward_points" = "Reward Points"; -"reward_note" = "Note: The reward point is valid for a year only."; +"products_text" = "Products"; +"reward_points_text" = "Reward Points"; +"reward_note_text" = "Note: The reward point is valid for a year only."; // RewardItemClollectionViewCell -"points" = "Points"; +"points_text" = "Points"; // DetailOrderViewController -"detail_order_title" = "Detail Order Information"; -"pickup_banch" = "Pickup Branch"; -"product_name" = "Product Name"; -"product_point" = "Product Point"; -"order_no" = "Order No."; -"order_date" = "Order Date"; -"order_receive_date" = "Order Receive Date"; -"order_type" = "Order Type"; -"pickup_from_branch" = "Pickup from branch"; +"detail_order_title_text" = "Detail Order Information"; +"pickup_banch_text" = "Pickup Branch"; +"product_name_text" = "Product Name"; +"product_point_text" = "Product Point"; +"order_no_text" = "Order No."; +"order_date_text" = "Order Date"; +"order_receive_date_text" = "Order Receive Date"; +"order_type_text" = "Order Type"; +"pickup_from_branch_text" = "Pickup from branch"; // OrderHistoryViewController -"orders" = "Orders"; -"ordered" = "ORDERED"; -"received" = "RECEIVED"; -"canceled" = "CANCELED"; -"no_search_orders_message" = "There are no result for search."; -"no_orders_message" = "There are no orders for last a week."; +"orders_group_title_text" = "Orders"; +"ordered_text" = "ORDERED"; +"received_text" = "RECEIVED"; +"canceled_text" = "CANCELED"; +"no_search_orders_message_text" = "There are no result for search."; +"no_orders_message_text" = "There are no orders for last a week."; // OrderCell -"your_order_canceled" = "Your order canceled"; -"your_order_completed" = "Your order completed"; -"you_received_reward" = "You have received the reward"; +"your_order_canceled_text" = "Your order canceled"; +"your_order_completed_text" = "Your order completed"; +"you_received_reward_text" = "You have received the reward"; // ConfirmViewControllerConfiguration -"confirm_viewconroller_default_title" = "Is this information correct?"; +"confirm_viewconroller_default_title_text" = "Is this information correct?";