Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Unified Diff: ios/chrome/browser/payments/payment_request_view_controller.mm

Issue 2716413002: [Payment Request] Replacing more iOS strings with components strings (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/payments/payment_request_view_controller.mm
diff --git a/ios/chrome/browser/payments/payment_request_view_controller.mm b/ios/chrome/browser/payments/payment_request_view_controller.mm
index 17bc6d6e440bb4d237650d5673da968f8d71c230..4a86a5dbe804e33e3591d325e93cc6cd0b64e235 100644
--- a/ios/chrome/browser/payments/payment_request_view_controller.mm
+++ b/ios/chrome/browser/payments/payment_request_view_controller.mm
@@ -113,7 +113,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
- (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]
@@ -131,9 +131,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
// 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]];
@@ -289,7 +288,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
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];
@@ -307,7 +306,7 @@ typedef NS_ENUM(NSInteger, ItemType) {
[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;
@@ -402,17 +401,17 @@ typedef NS_ENUM(NSInteger, ItemType) {
- (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

Powered by Google App Engine
This is Rietveld 408576698