Merge pull request #35 from passepartoutvpn/integrate-tunnel-bear

Integrate TunnelBear provider
This commit is contained in:
Davide De Rosa 2019-03-06 17:08:43 +01:00 committed by GitHub
commit 693a59d0a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 2 deletions

View File

@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## Unreleased
### Added
- TunnelBear provider.
## 1.0.3 (2019-03-06)
### Fixed

View File

@ -55,6 +55,9 @@ class AccountViewController: UIViewController, TableModelHost {
switch name {
case .pia:
guidance = V.Infrastructure.pia
case .tunnelBear:
guidance = V.Infrastructure.tunnelbear
}
if guidance != nil {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -123,6 +123,7 @@
//"account.cells.password_confirm.caption" = "Confirm";
//"account.cells.password_confirm.mismatch" = "Passwords don't match!";
"account.suggestion_footer.infrastructure.pia" = "Use your website credentials. Your username is usually numeric with a \"p\" prefix.";
"account.suggestion_footer.infrastructure.tunnelbear" = "Use your website credentials. Your username is usually your email.";
"account.suggestion_footer.referral" = "Don't have an account? Tap here to get one.";
"endpoint.sections.location_addresses.header" = "Addresses";

View File

@ -30,6 +30,8 @@ struct Infrastructure: Codable {
enum Name: String, Codable, Comparable {
case pia = "PIA"
case tunnelBear = "TunnelBear"
var webName: String {
return rawValue.lowercased()
}

View File

@ -56,7 +56,8 @@ class InfrastructureFactory {
static let shared = InfrastructureFactory()
let allNames: [Infrastructure.Name] = [
.pia
.pia,
.tunnelBear
]
private let bundle: [Infrastructure.Name: Infrastructure]

View File

@ -86,6 +86,8 @@ internal enum L10n {
internal enum Infrastructure {
/// Use your website credentials. Your username is usually numeric with a "p" prefix.
internal static let pia = L10n.tr("Localizable", "account.suggestion_footer.infrastructure.pia")
/// Use your website credentials. Your username is usually your email.
internal static let tunnelbear = L10n.tr("Localizable", "account.suggestion_footer.infrastructure.tunnelbear")
}
}
}