Commit 89d5c561 authored by Jose Blaya's avatar Jose Blaya
Browse files

Merge branch '127-add-apple-subscription-terms-and-conditions-in-buy-view' into 'release/2.1.0'

Resolve "Add Apple subscription terms and conditions in BUY view"

See merge request ios/client-library-apple!183
parents 6d96fddf fd4ad65b
Pod::Spec.new do |s|
s.name = "PIALibrary"
s.version = "2.0.0"
s.version = "2.1.0"
s.summary = "PIA client library in Swift."
s.homepage = "https://www.privateinternetaccess.com/"
......
......@@ -26,9 +26,39 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
codeCoverageEnabled = "YES"
onlyGenerateCoverageForSpecifiedTargets = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
<CodeCoverageTargets>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0EBFFFD41F693F800009D4F4"
BuildableName = "PIALibrary.framework"
BlueprintName = "PIALibrary-iOS"
ReferencedContainer = "container:PIALibrary.xcodeproj">
</BuildableReference>
</CodeCoverageTargets>
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0EE78AFC1F818A20002E4CDD"
BuildableName = "PIALibraryTests-iOS.xctest"
BlueprintName = "PIALibraryTests-iOS"
ReferencedContainer = "container:PIALibrary.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0EBFFFD41F693F800009D4F4"
BuildableName = "PIALibrary.framework"
BlueprintName = "PIALibrary-iOS"
ReferencedContainer = "container:PIALibrary.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.0.0</string>
<string>2.1.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
......
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="VHM-bG-giz">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="VHM-bG-giz">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......
......@@ -57,7 +57,7 @@
"iap.error.message.unavailable" = "Apple servers currently unavailable. Please try again later.";
"iap.error.title" = "Error";
"agreement.message" = "Signing up constitutes acceptance of the $1 and the $2.";
"agreement.message" = "Payment will be charged to your Apple ID account at the confirmation of purchase. Subscription automatically renews unless it is canceled at least 24 hours before the end of the current period. Your account will be charged for renewal within 24 hours prior to the end of the current period. You can manage and cancel your subscriptions by going to your account settings on the App Store after purchase.\n\nSigning up constitutes acceptance of the $1 and the $2.";
"agreement.message.tos" = "Terms of Service";
"agreement.message.privacy" = "Privacy Policy";
......
......@@ -24,7 +24,6 @@ internal enum StoryboardSegue {
case loginAccountSegue = "LoginAccountSegue"
case presentGDPRTermsSegue = "PresentGDPRTermsSegue"
case purchaseVPNPlanSegue = "PurchaseVPNPlanSegue"
case redeemGiftCardSegue = "RedeemGiftCardSegue"
case restorePurchaseSegue = "RestorePurchaseSegue"
case signupQRCameraScannerSegue = "SignupQRCameraScannerSegue"
case signupViaPurchaseSegue = "SignupViaPurchaseSegue"
......
......@@ -47,6 +47,12 @@ internal enum L10n {
}
}
internal enum Purchase {
internal enum Subscription {
internal enum Apple {
/// Payment will be charged to your Apple ID account at the confirmation of purchase. Subscription automatically renews unless it is canceled at least 24 hours before the end of the current period. Your account will be charged for renewal within 24 hours prior to the end of the current period. You can manage and cancel your subscriptions by going to your account settings on the App Store after purchase.
internal static let terms = L10n.tr("Signup", "purchase.subscription.apple.terms")
}
}
internal enum Uncredited {
internal enum Alert {
/// You have uncredited transactions. Do you want to recover your account details?
......@@ -113,7 +119,7 @@ internal enum L10n {
}
internal enum Welcome {
internal enum Agreement {
/// Signing up constitutes acceptance of the $1 and the $2.
/// Payment will be charged to your Apple ID account at the confirmation of purchase. Subscription automatically renews unless it is canceled at least 24 hours before the end of the current period. Your account will be charged for renewal within 24 hours prior to the end of the current period. You can manage and cancel your subscriptions by going to your account settings on the App Store after purchase.\n\nSigning up constitutes acceptance of the $1 and the $2.
internal static let message = L10n.tr("Welcome", "agreement.message")
internal enum Message {
/// Privacy Policy
......@@ -238,7 +244,7 @@ internal enum L10n {
/// Select a VPN plan
internal static let title = L10n.tr("Welcome", "purchase.title")
internal enum Confirm {
/// Your are purchasing the %@ plan
/// You are purchasing the %@ plan
internal static func plan(_ p1: String) -> String {
return L10n.tr("Welcome", "purchase.confirm.plan", p1)
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment