ios/chrome/browser/payments/payment_items_display_view_controller.mm - Issue 2716413002: [Payment Request] Replacing more iOS strings with components strings

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/chrome/browser/payments/payment_items_display_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

« no previous file with comments | « ios/chrome/app/strings/ios_strings.grd ('k') | ios/chrome/browser/payments/payment_items_display_view_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/payments/payment_items_display_view_controller.mm

diff --git a/ios/chrome/browser/payments/payment_items_display_view_controller.mm b/ios/chrome/browser/payments/payment_items_display_view_controller.mm

index 9cb4bee58a325e594064f03f6f4ed8a16766f6f8..ec8fcedc15be8d5bd713b3105735f224de000810 100644

--- a/ios/chrome/browser/payments/payment_items_display_view_controller.mm

+++ b/ios/chrome/browser/payments/payment_items_display_view_controller.mm

@@ -65,8 +65,7 @@ typedef NS_ENUM(NSInteger, ItemType) {

payButtonEnabled:(BOOL)payButtonEnabled {

DCHECK(paymentRequest);

if ((self = [super initWithStyle:CollectionViewControllerStyleAppBar])) {

- [self setTitle:l10n_util::GetNSString(

- IDS_IOS_PAYMENT_REQUEST_PAYMENT_ITEMS_TITLE)];

+ [self setTitle:l10n_util::GetNSString(IDS_PAYMENTS_ORDER_SUMMARY_LABEL)];

// Set up leading (return) button.

UIBarButtonItem* returnButton =

@@ -79,9 +78,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]];

@@ -146,7 +144,7 @@ typedef NS_ENUM(NSInteger, ItemType) {

payments::CurrencyFormatter* currencyFormatter =

_paymentRequest->GetOrCreateCurrencyFormatter();

totalItem.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(

_paymentRequest->payment_details().total.amount.value))));