passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'group-web-pages'

This commit is contained in:
Davide De Rosa 2018-10-30 20:47:08 +01:00
parent 0706d552be 6cb85a952d
commit 5434e1abf0
3 changed files with 13 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Passepartout-iOS/Scenes/Organizer/AboutViewController.swift
View File

@ -32,15 +32,14 @@ class AboutViewController: UITableViewController, TableModelHost {
let model: TableModel<SectionType, RowType> = {
let model: TableModel<SectionType, RowType> = TableModel()
model.add(.info)
model.add(.source)
model.add(.web)
model.add(.share)
model.add(.feedback)
model.setHeader(L10n.About.Sections.Info.header, for: .info)
model.setHeader(L10n.About.Sections.Source.header, for: .source)
model.setHeader(L10n.About.Sections.Web.header, for: .web)
model.setHeader(L10n.About.Sections.Share.header, for: .share)
model.setHeader(L10n.About.Sections.Feedback.header, for: .feedback)
model.set([.version, .website, .disclaimer, .privacyPolicy], in: .info)
model.set([.sourcePassepartout, .sourceTunnelKit], in: .source)
model.set([.version], in: .info)
model.set([.website, .disclaimer, .privacyPolicy], in: .web)
model.set([.shareTwitter, .shareGeneric], in: .share)
model.set([.joinCommunity, .writeReview], in: .feedback)
return model
@ -116,7 +115,7 @@ extension AboutViewController {
enum SectionType: Int {
case info
case source
case web
case share
@ -132,10 +131,6 @@ extension AboutViewController {
case privacyPolicy
case sourcePassepartout
case sourceTunnelKit
case shareTwitter
case shareGeneric
@ -184,16 +179,6 @@ extension AboutViewController {
cell.leftText = L10n.About.Cells.PrivacyPolicy.caption
return cell
case .sourcePassepartout:
let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
cell.leftText = GroupConstants.App.name
return cell
case .sourceTunnelKit:
let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
cell.leftText = GroupConstants.App.tunnelKitName
return cell
case .shareTwitter:
let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
cell.leftText = L10n.About.Cells.ShareTwitter.caption
@ -230,12 +215,6 @@ extension AboutViewController {
case .privacyPolicy:
visitPrivacyPolicy()
case .sourcePassepartout:
visitRepository(AppConstants.Repos.passepartout)
case .sourceTunnelKit:
visitRepository(AppConstants.Repos.tunnelKit)
case .shareTwitter:
tweetAboutApp()

7
Passepartout/Resources/en.lproj/Localizable.strings
View File

@ -185,11 +185,10 @@
"issue_reporter.email.description" = "description of the issue:";
"about.title" = "About";
"about.sections.info.header" = "General";
"about.sections.source.header" = "Source code";
"about.sections.web.header" = "Web";
"about.sections.share.header" = "Share";
"about.sections.feedback.header" = "Feedback";
"about.cells.website.caption" = "Visit website";
"about.cells.website.caption" = "Home page";
"about.cells.disclaimer.caption" = "Disclaimer";
"about.cells.privacy_policy.caption" = "Privacy policy";
"about.cells.share_twitter.caption" = "Tweet about it!";
@ -200,7 +199,7 @@
"share.message" = "Passepartout is an user-friendly, open source OpenVPN client for iOS and macOS";
"version.title" = "Version";
"version.labels.intro" = "Passepartout and TunnelKit are written and maintained by Davide De Rosa (keeshux).\n\nSource code for Passepartout and TunnelKit is publicly available on GitHub under the GPLv3.\n\nPassepartout is a non-official client and is in no way affiliated with OpenVPN Inc.";
"version.labels.intro" = "Passepartout and TunnelKit are written and maintained by Davide De Rosa (keeshux).\n\nSource code for Passepartout and TunnelKit is publicly available on GitHub under the GPLv3, you can find links in the home page.\n\nPassepartout is a non-official client and is in no way affiliated with OpenVPN Inc.";
"version.buttons.changelog" = "CHANGELOG";
"version.buttons.credits" = "CREDITS";

14
Passepartout/Sources/SwiftGen+Strings.swift
View File

@ -37,7 +37,7 @@ internal enum L10n {
internal static let caption = L10n.tr("Localizable", "about.cells.share_twitter.caption")
}
internal enum Website {
/// Visit website
/// Home page
internal static let caption = L10n.tr("Localizable", "about.cells.website.caption")
}
internal enum WriteReview {
@ -50,17 +50,13 @@ internal enum L10n {
/// Feedback
internal static let header = L10n.tr("Localizable", "about.sections.feedback.header")
}
internal enum Info {
/// General
internal static let header = L10n.tr("Localizable", "about.sections.info.header")
}
internal enum Share {
/// Share
internal static let header = L10n.tr("Localizable", "about.sections.share.header")
}
internal enum Source {
/// Source code
internal static let header = L10n.tr("Localizable", "about.sections.source.header")
internal enum Web {
/// Web
internal static let header = L10n.tr("Localizable", "about.sections.web.header")
}
}
}
@ -615,7 +611,7 @@ internal enum L10n {
internal static let credits = L10n.tr("Localizable", "version.buttons.credits")
}
internal enum Labels {
/// Passepartout and TunnelKit are written and maintained by Davide De Rosa (keeshux).\n\nSource code for Passepartout and TunnelKit is publicly available on GitHub under the GPLv3.\n\nPassepartout is a non-official client and is in no way affiliated with OpenVPN Inc.
/// Passepartout and TunnelKit are written and maintained by Davide De Rosa (keeshux).\n\nSource code for Passepartout and TunnelKit is publicly available on GitHub under the GPLv3, you can find links in the home page.\n\nPassepartout is a non-official client and is in no way affiliated with OpenVPN Inc.
internal static let intro = L10n.tr("Localizable", "version.labels.intro")
}
}