Canceled -> Cancelled

jack-stripe · jack-stripe · commit b540779ea08b · 2015-01-16T18:34:08.000-05:00
diff --git a/Example/Stripe iOS Example (Custom)/ViewController.m b/Example/Stripe iOS Example (Custom)/ViewController.m
@@ -187,7 +187,7 @@ - (void)checkoutController:(STPCheckoutViewController *)controller didFinishWith
     case STPPaymentStatusError:
         [self presentError:error];
         break;
-    case STPPaymentStatusUserCanceled:
+    case STPPaymentStatusUserCancelled:
         // do nothing
         break;
     }
diff --git a/Example/Stripe iOS Example (Simple)/ViewController.swift b/Example/Stripe iOS Example (Simple)/ViewController.swift
@@ -66,7 +66,7 @@ class ViewController: UIViewController, STPPaymentPresenterDelegate {
     func paymentPresenter(presenter: STPPaymentPresenter!, didFinishWithStatus status: STPPaymentStatus, error: NSError!) {
         
         self.dismissViewControllerAnimated(true, completion: { () -> Void in
-            if (status == STPPaymentStatus.UserCanceled) {
+            if (status == STPPaymentStatus.UserCancelled) {
                 return
             }
             let alert = UIAlertController(title: nil, message: nil, preferredStyle: UIAlertControllerStyle.Alert)
diff --git a/Stripe/ApplePay/STPPaymentPresenter.m b/Stripe/ApplePay/STPPaymentPresenter.m
@@ -145,7 +145,7 @@ - (void)paymentAuthorizationViewControllerDidFinish:(__unused PKPaymentAuthoriza
     } else if (self.hasAuthorizedPayment) {
         status = STPPaymentStatusSuccess;
     } else {
-        status = STPPaymentStatusUserCanceled;
+        status = STPPaymentStatusUserCancelled;
     }
     [self finishWithStatus:status error:self.error];
 }
diff --git a/Stripe/Checkout/STPCheckoutInternalUIWebViewController.m b/Stripe/Checkout/STPCheckoutInternalUIWebViewController.m
@@ -135,7 +135,7 @@ - (void)viewDidLoad {
 }
 
 - (void)cancel:(__unused id)sender {
-    [self.delegate checkoutController:self.checkoutController didFinishWithStatus:STPPaymentStatusUserCanceled error:nil];
+    [self.delegate checkoutController:self.checkoutController didFinishWithStatus:STPPaymentStatusUserCancelled error:nil];
     [self cleanup];
 }
 
@@ -210,7 +210,7 @@ - (void)checkoutAdapter:(id<STPCheckoutWebViewAdapter>)adapter didTriggerEvent:(
         }
         [self cleanup];
     } else if ([event isEqualToString:STPCheckoutEventCancel]) {
-        [self.delegate checkoutController:self.checkoutController didFinishWithStatus:STPPaymentStatusUserCanceled error:nil];
+        [self.delegate checkoutController:self.checkoutController didFinishWithStatus:STPPaymentStatusUserCancelled error:nil];
         [self cleanup];
     } else if ([event isEqualToString:STPCheckoutEventError]) {
         NSError *error = [[NSError alloc] initWithDomain:StripeDomain code:STPCheckoutError userInfo:payload];
diff --git a/Stripe/Checkout/STPCheckoutViewController.m b/Stripe/Checkout/STPCheckoutViewController.m
@@ -166,7 +166,7 @@ - (void)checkoutAdapter:(id<STPCheckoutWebViewAdapter>)adapter didTriggerEvent:(
             [self.checkoutDelegate checkoutController:self didFinishWithStatus:STPPaymentStatusError error:self.backendChargeError];
         }
     } else if ([event isEqualToString:STPCheckoutEventCancel]) {
-        [self.checkoutDelegate checkoutController:self didFinishWithStatus:STPPaymentStatusUserCanceled error:nil];
+        [self.checkoutDelegate checkoutController:self didFinishWithStatus:STPPaymentStatusUserCancelled error:nil];
     } else if ([event isEqualToString:STPCheckoutEventError]) {
         NSError *error = [[NSError alloc] initWithDomain:StripeDomain code:STPCheckoutError userInfo:payload];
         [self.checkoutDelegate checkoutController:self didFinishWithStatus:STPPaymentStatusError error:error];
diff --git a/Stripe/PublicHeaders/ApplePay/STPPaymentPresenter.h b/Stripe/PublicHeaders/ApplePay/STPPaymentPresenter.h
@@ -84,7 +84,7 @@
 
  *
  *  @param presenter The payment presenter that has finished.
- *  @param status    This will be one of STPPaymentStatusSuccess, STPPaymentStatusError, or STPPaymentStatusUserCanceled depending on what happened with the
+ *  @param status    This will be one of STPPaymentStatusSuccess, STPPaymentStatusError, or STPPaymentStatusUserCancelled depending on what happened with the
  user's transaction.
  *  @param error     This will only be set if status == STPPaymentStatusError. If you returned STPBackendChargeResultFailure from your API call above, this will
  be the error you (optionally) included there. If not, see StripeError.h for the possible values it may contain.
diff --git a/Stripe/PublicHeaders/Checkout/STPCheckoutViewController.h b/Stripe/PublicHeaders/Checkout/STPCheckoutViewController.h
@@ -16,7 +16,7 @@
 typedef NS_ENUM(NSInteger, STPPaymentStatus) {
     STPPaymentStatusSuccess,      // The transaction was a success.
     STPPaymentStatusError,        // The transaction failed.
-    STPPaymentStatusUserCanceled, // The user canceled the payment sheet.
+    STPPaymentStatusUserCancelled, // The user Cancelled the payment sheet.
 };
 
 @class STPCheckoutOptions, STPToken;

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ - (void)checkoutController:(STPCheckoutViewController *)controller didFinishWith`
`187`	`187`	`case STPPaymentStatusError:`
`188`	`188`	`[self presentError:error];`
`189`	`189`	`break;`
`190`		`- case STPPaymentStatusUserCanceled:`
	`190`	`+ case STPPaymentStatusUserCancelled:`
`191`	`191`	`// do nothing`
`192`	`192`	`break;`
`193`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ class ViewController: UIViewController, STPPaymentPresenterDelegate {`
`66`	`66`	`func paymentPresenter(presenter: STPPaymentPresenter!, didFinishWithStatus status: STPPaymentStatus, error: NSError!) {`
`67`	`67`
`68`	`68`	`self.dismissViewControllerAnimated(true, completion: { () -> Void in`
`69`		`- if (status == STPPaymentStatus.UserCanceled) {`
	`69`	`+ if (status == STPPaymentStatus.UserCancelled) {`
`70`	`70`	`return`
`71`	`71`	`}`
`72`	`72`	`let alert = UIAlertController(title: nil, message: nil, preferredStyle: UIAlertControllerStyle.Alert)`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ - (void)paymentAuthorizationViewControllerDidFinish:(__unused PKPaymentAuthoriza`
`145`	`145`	`} else if (self.hasAuthorizedPayment) {`
`146`	`146`	`status = STPPaymentStatusSuccess;`
`147`	`147`	`} else {`
`148`		`- status = STPPaymentStatusUserCanceled;`
	`148`	`+ status = STPPaymentStatusUserCancelled;`
`149`	`149`	`}`
`150`	`150`	`[self finishWithStatus:status error:self.error];`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ - (void)viewDidLoad {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`- (void)cancel:(__unused id)sender {`
`138`		`- [self.delegate checkoutController:self.checkoutController didFinishWithStatus:STPPaymentStatusUserCanceled error:nil];`
	`138`	`+ [self.delegate checkoutController:self.checkoutController didFinishWithStatus:STPPaymentStatusUserCancelled error:nil];`
`139`	`139`	`[self cleanup];`
`140`	`140`	`}`
`141`	`141`
`@@ -210,7 +210,7 @@ - (void)checkoutAdapter:(id<STPCheckoutWebViewAdapter>)adapter didTriggerEvent:(`
`210`	`210`	`}`
`211`	`211`	`[self cleanup];`
`212`	`212`	`} else if ([event isEqualToString:STPCheckoutEventCancel]) {`
`213`		`- [self.delegate checkoutController:self.checkoutController didFinishWithStatus:STPPaymentStatusUserCanceled error:nil];`
	`213`	`+ [self.delegate checkoutController:self.checkoutController didFinishWithStatus:STPPaymentStatusUserCancelled error:nil];`
`214`	`214`	`[self cleanup];`
`215`	`215`	`} else if ([event isEqualToString:STPCheckoutEventError]) {`
`216`	`216`	`NSError *error = [[NSError alloc] initWithDomain:StripeDomain code:STPCheckoutError userInfo:payload];`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ - (void)checkoutAdapter:(id<STPCheckoutWebViewAdapter>)adapter didTriggerEvent:(`
`166`	`166`	`[self.checkoutDelegate checkoutController:self didFinishWithStatus:STPPaymentStatusError error:self.backendChargeError];`
`167`	`167`	`}`
`168`	`168`	`} else if ([event isEqualToString:STPCheckoutEventCancel]) {`
`169`		`- [self.checkoutDelegate checkoutController:self didFinishWithStatus:STPPaymentStatusUserCanceled error:nil];`
	`169`	`+ [self.checkoutDelegate checkoutController:self didFinishWithStatus:STPPaymentStatusUserCancelled error:nil];`
`170`	`170`	`} else if ([event isEqualToString:STPCheckoutEventError]) {`
`171`	`171`	`NSError *error = [[NSError alloc] initWithDomain:StripeDomain code:STPCheckoutError userInfo:payload];`
`172`	`172`	`[self.checkoutDelegate checkoutController:self didFinishWithStatus:STPPaymentStatusError error:error];`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@`
`84`	`84`
`85`	`85`	`*`
`86`	`86`	`* @param presenter The payment presenter that has finished.`
`87`		`- * @param status This will be one of STPPaymentStatusSuccess, STPPaymentStatusError, or STPPaymentStatusUserCanceled depending on what happened with the`
	`87`	`+ * @param status This will be one of STPPaymentStatusSuccess, STPPaymentStatusError, or STPPaymentStatusUserCancelled depending on what happened with the`
`88`	`88`	`user's transaction.`
`89`	`89`	`* @param error This will only be set if status == STPPaymentStatusError. If you returned STPBackendChargeResultFailure from your API call above, this will`
`90`	`90`	`be the error you (optionally) included there. If not, see StripeError.h for the possible values it may contain.`