[Payment Request] Replacing more iOS strings with components strings

ios/chrome/browser/payments/payment_request_view_controller.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/payments/payment_request_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 95 matching lines @@
 
 @synthesize pageFavicon = _pageFavicon;
 @synthesize pageTitle = _pageTitle;
 @synthesize pageHost = _pageHost;
 @synthesize pending = _pending;
 @synthesize delegate = _delegate;
 
 - (instancetype)initWithPaymentRequest:(PaymentRequest*)paymentRequest {
   DCHECK(paymentRequest);
   if ((self = [super initWithStyle:CollectionViewControllerStyleAppBar])) {
-    [self setTitle:l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_TITLE)];
+    [self setTitle:l10n_util::GetNSString(IDS_PAYMENTS_TITLE)];
 
     // Set up leading (cancel) button.
     _cancelButton = [[UIBarButtonItem alloc]
         initWithTitle:l10n_util::GetNSString(IDS_CANCEL)
                 style:UIBarButtonItemStylePlain
                target:nil
                action:@selector(onCancel)];
     [_cancelButton setTitleTextAttributes:@{
       NSForegroundColorAttributeName : [UIColor lightGrayColor]
     }
                                  forState:UIControlStateDisabled];
     [_cancelButton
         setAccessibilityLabel:l10n_util::GetNSString(IDS_ACCNAME_CANCEL)];
     [self navigationItem].leftBarButtonItem = _cancelButton;
 
     // Set up trailing (pay) button.
     _payButton = [[MDCFlatButton alloc] init];
-    [_payButton
-        setTitle:l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_PAY_BUTTON)
-        forState:UIControlStateNormal];
+    [_payButton setTitle:l10n_util::GetNSString(IDS_PAYMENTS_PAY_BUTTON)
+                forState:UIControlStateNormal];
     [_payButton setBackgroundColor:[[MDCPalette cr_bluePalette] tint500]
                           forState:UIControlStateNormal];
     [_payButton setInkColor:[UIColor colorWithWhite:1 alpha:0.2]];
     [_payButton setBackgroundColor:[UIColor grayColor]
                           forState:UIControlStateDisabled];
     [_payButton addTarget:nil
                    action:@selector(onConfirm)
          forControlEvents:UIControlEventTouchUpInside];
     [_payButton sizeToFit];
     [_payButton setEnabled:(paymentRequest->selected_credit_card() != nil)];
@@ skipping 135 matching lines @@
       toSectionWithIdentifier:SectionIdentifierShipping];
 
   // Payment method section.
   [model addSectionWithIdentifier:SectionIdentifierPayment];
 
   CollectionViewItem* paymentMethodItem = nil;
   if (_paymentRequest->selected_credit_card()) {
     CollectionViewTextItem* paymentTitle =
         [[CollectionViewTextItem alloc] initWithType:ItemTypePaymentTitle];
     paymentTitle.text =
-        l10n_util::GetNSString(IDS_PAYMENTS_METHOD_OF_PAYMENT_LABEL);
+        l10n_util::GetNSString(IDS_PAYMENT_REQUEST_PAYMENT_METHOD_SECTION_NAME);
     [model setHeader:paymentTitle
         forSectionWithIdentifier:SectionIdentifierPayment];
 
     PaymentMethodItem* selectedPaymentMethodItem =
         [[PaymentMethodItem alloc] initWithType:ItemTypePaymentMethod];
     paymentMethodItem = selectedPaymentMethodItem;
     _selectedPaymentMethodItem = selectedPaymentMethodItem;
     [self fillPaymentMethodItem:selectedPaymentMethodItem
                  withCreditCard:_paymentRequest->selected_credit_card()];
     selectedPaymentMethodItem.accessoryType =
         MDCCollectionViewCellAccessoryDisclosureIndicator;
     selectedPaymentMethodItem.accessibilityTraits |= UIAccessibilityTraitButton;
   } else {
     CollectionViewDetailItem* addPaymentMethodItem = [
         [CollectionViewDetailItem alloc] initWithType:ItemTypeAddPaymentMethod];
     paymentMethodItem = addPaymentMethodItem;
     addPaymentMethodItem.text =
-        l10n_util::GetNSString(IDS_PAYMENTS_METHOD_OF_PAYMENT_LABEL);
+        l10n_util::GetNSString(IDS_PAYMENT_REQUEST_PAYMENT_METHOD_SECTION_NAME);
     addPaymentMethodItem.detailText = [l10n_util::GetNSString(IDS_ADD)
         uppercaseStringWithLocale:[NSLocale currentLocale]];
     addPaymentMethodItem.accessibilityTraits |= UIAccessibilityTraitButton;
   }
   [model addItem:paymentMethodItem
       toSectionWithIdentifier:SectionIdentifierPayment];
 
   // Contact Info section.
   [model addSectionWithIdentifier:SectionIdentifierContactInfo];
 
@@ skipping 74 matching lines @@
       [self.collectionViewModel indexPathForItem:_selectedPaymentMethodItem
                          inSectionWithIdentifier:SectionIdentifierPayment];
   [self.collectionView reloadItemsAtIndexPaths:@[ indexPath ]];
 }
 
 #pragma mark - Helper methods
 
 - (void)fillPaymentSummaryItem:(PriceItem*)item
                withPaymentItem:(web::PaymentItem)paymentItem
          withTotalValueChanged:(BOOL)totalValueChanged {
-  item.item = l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_TOTAL_HEADER);
+  item.item =
+      base::SysUTF16ToNSString(_paymentRequest->payment_details().total.label);
   payments::CurrencyFormatter* currencyFormatter =
       _paymentRequest->GetOrCreateCurrencyFormatter();
   item.price = SysUTF16ToNSString(l10n_util::GetStringFUTF16(
-      IDS_IOS_PAYMENT_REQUEST_PAYMENT_ITEMS_TOTAL_FORMAT,
+      IDS_PAYMENT_REQUEST_ORDER_SUMMARY_SHEET_TOTAL_FORMAT,
       base::UTF8ToUTF16(currencyFormatter->formatted_currency_code()),
       currencyFormatter->Format(base::UTF16ToASCII(paymentItem.amount.value))));
-  item.notification =
-      totalValueChanged
-          ? l10n_util::GetNSString(IDS_IOS_PAYMENT_REQUEST_TOTAL_UPDATED_LABEL)
-          : nil;
+  item.notification = totalValueChanged
+                          ? l10n_util::GetNSString(IDS_PAYMENTS_UPDATED_LABEL)
+                          : nil;
 }
 
 - (void)fillShippingAddressItem:(AutofillProfileItem*)item
             withAutofillProfile:(autofill::AutofillProfile*)profile {
   item.name = GetNameLabelFromAutofillProfile(profile);
   item.address = GetAddressLabelFromAutofillProfile(profile);
   item.phoneNumber = GetPhoneNumberLabelFromAutofillProfile(profile);
 }
 
 - (void)fillShippingOptionItem:(CollectionViewTextItem*)item
@@ skipping 131 matching lines @@
   NSInteger type = [self.collectionViewModel itemTypeForIndexPath:indexPath];
   if (type == ItemTypeSummaryTotal &&
       _paymentRequest->payment_details().display_items.empty()) {
     return YES;
   } else {
     return NO;
   }
 }
 
 @end