diff --git a/CHANGELOG.md b/CHANGELOG.md index f5a67b39..02378685 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ 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). -## 1.0 beta 1083 (2018-10-24) +## 1.0 beta 1084 (2018-10-24) ### Fixed diff --git a/Passepartout-iOS/Scenes/Organizer/AboutViewController.swift b/Passepartout-iOS/Scenes/Organizer/AboutViewController.swift index c43664ff..88a045d3 100644 --- a/Passepartout-iOS/Scenes/Organizer/AboutViewController.swift +++ b/Passepartout-iOS/Scenes/Organizer/AboutViewController.swift @@ -42,7 +42,7 @@ class AboutViewController: UITableViewController, TableModelHost { model.set([.version, .credits, .disclaimer, .website], in: .info) model.set([.sourcePassepartout, .sourceTunnelKit], in: .source) model.set([.shareTwitter, .shareGeneric], in: .share) - model.set([.requestSupport, .writeReview], in: .feedback) + model.set([.joinCommunity, .writeReview], in: .feedback) return model }() @@ -162,7 +162,7 @@ extension AboutViewController { case shareGeneric - case requestSupport + case joinCommunity case writeReview } @@ -226,9 +226,9 @@ extension AboutViewController { cell.leftText = L10n.About.Cells.ShareGeneric.caption return cell - case .requestSupport: + case .joinCommunity: let cell = Cells.setting.dequeue(from: tableView, for: indexPath) - cell.leftText = L10n.About.Cells.RequestSupport.caption + cell.leftText = L10n.About.Cells.JoinCommunity.caption return cell case .writeReview: @@ -264,7 +264,7 @@ extension AboutViewController { case .shareGeneric: inviteFriend(sender: tableView.cellForRow(at: indexPath)) - case .requestSupport: + case .joinCommunity: postSupportRequest() case .writeReview: diff --git a/Passepartout-iOS/Scenes/ServiceViewController.swift b/Passepartout-iOS/Scenes/ServiceViewController.swift index faa38871..4463fb3c 100644 --- a/Passepartout-iOS/Scenes/ServiceViewController.swift +++ b/Passepartout-iOS/Scenes/ServiceViewController.swift @@ -442,7 +442,7 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog case debugLog - case requestSupport + case joinCommunity case reportIssue } @@ -660,9 +660,9 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog // feedback - case .requestSupport: + case .joinCommunity: let cell = Cells.setting.dequeue(from: tableView, for: indexPath) - cell.leftText = L10n.About.Cells.RequestSupport.caption + cell.leftText = L10n.About.Cells.JoinCommunity.caption return cell case .reportIssue: @@ -763,7 +763,7 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog perform(segue: StoryboardSegue.Main.debugLogSegueIdentifier, sender: cell) return true - case .requestSupport: + case .joinCommunity: postSupportRequest() case .reportIssue: @@ -891,7 +891,7 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog model.set([.vpnSurvivesSleep], in: .vpnSurvivesSleep) model.set([.trustedPolicy], in: .trustedPolicy) model.set([.testConnectivity, .dataCount, .debugLog], in: .diagnostics) - model.set([.requestSupport, .reportIssue], in: .feedback) + model.set([.joinCommunity, .reportIssue], in: .feedback) } trustedNetworks.delegate = self diff --git a/Passepartout/Resources/en.lproj/Localizable.strings b/Passepartout/Resources/en.lproj/Localizable.strings index 252de860..e5128af8 100644 --- a/Passepartout/Resources/en.lproj/Localizable.strings +++ b/Passepartout/Resources/en.lproj/Localizable.strings @@ -187,7 +187,7 @@ "about.cells.website.caption" = "Visit website"; "about.cells.share_twitter.caption" = "Tweet about it!"; "about.cells.share_generic.caption" = "Invite a friend"; -"about.cells.request_support.caption" = "Request support"; +"about.cells.join_community.caption" = "Join community"; "about.cells.write_review.caption" = "Write a review"; "share.message" = "Passepartout is an user-friendly, open source OpenVPN client for iOS and macOS"; diff --git a/Passepartout/Sources/SwiftGen+Strings.swift b/Passepartout/Sources/SwiftGen+Strings.swift index 5de61c9a..60095d57 100644 --- a/Passepartout/Sources/SwiftGen+Strings.swift +++ b/Passepartout/Sources/SwiftGen+Strings.swift @@ -14,9 +14,9 @@ internal enum L10n { internal enum Cells { - internal enum RequestSupport { - /// Request support - internal static let caption = L10n.tr("Localizable", "about.cells.request_support.caption") + internal enum JoinCommunity { + /// Join community + internal static let caption = L10n.tr("Localizable", "about.cells.join_community.caption") } internal enum ShareGeneric {