Merge branch 'organizer-accessory'

This commit is contained in:
Davide De Rosa 2018-10-17 23:59:05 +02:00
commit c0ebf1d0ee
3 changed files with 10 additions and 1 deletions

View File

@ -289,7 +289,7 @@ extension OrganizerViewController {
let cell = Cells.setting.dequeue(from: tableView, for: indexPath) let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
let rowProfile = profile(at: indexPath) let rowProfile = profile(at: indexPath)
cell.leftText = rowProfile.title cell.leftText = rowProfile.title
cell.applyChecked(service.isActiveProfile(rowProfile), Theme.current) cell.rightText = service.isActiveProfile(rowProfile) ? L10n.Organizer.Cells.Profile.Value.current : nil
return cell return cell
case .addProvider: case .addProvider:

View File

@ -31,6 +31,7 @@
"organizer.sections.providers.footer" = "Here you find a few public infrastructures offering preset configuration profiles."; "organizer.sections.providers.footer" = "Here you find a few public infrastructures offering preset configuration profiles.";
"organizer.sections.hosts.header" = "Hosts"; "organizer.sections.hosts.header" = "Hosts";
"organizer.sections.hosts.footer" = "Import hosts from raw .ovpn configuration files."; "organizer.sections.hosts.footer" = "Import hosts from raw .ovpn configuration files.";
"organizer.cells.profile.value.current" = "In use";
"organizer.cells.add_provider.caption" = "Add new network"; "organizer.cells.add_provider.caption" = "Add new network";
"organizer.cells.add_host.caption" = "Add new host"; "organizer.cells.add_host.caption" = "Add new host";
"organizer.cells.about.caption" = "About %@"; "organizer.cells.about.caption" = "About %@";

View File

@ -344,6 +344,14 @@ internal enum L10n {
internal static let caption = L10n.tr("Localizable", "organizer.cells.add_provider.caption") internal static let caption = L10n.tr("Localizable", "organizer.cells.add_provider.caption")
} }
internal enum Profile {
internal enum Value {
/// In use
internal static let current = L10n.tr("Localizable", "organizer.cells.profile.value.current")
}
}
internal enum Uninstall { internal enum Uninstall {
/// Delete VPN profile /// Delete VPN profile
internal static let caption = L10n.tr("Localizable", "organizer.cells.uninstall.caption") internal static let caption = L10n.tr("Localizable", "organizer.cells.uninstall.caption")