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

Localize "Default" string

This commit is contained in:
Davide De Rosa 2021-01-03 17:37:36 +01:00
parent bcffd9fd4a
commit 4575d660b1
21 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Passepartout/App/iOS/Global/SwiftGen+Strings.swift
View File

@ -551,6 +551,8 @@ internal enum L10n {
internal enum Values { internal enum Values {
/// Automatic /// Automatic
internal static let automatic = L10n.tr("Core", "global.values.automatic") internal static let automatic = L10n.tr("Core", "global.values.automatic")
/// Default
internal static let `default` = L10n.tr("Core", "global.values.default")
/// Disabled /// Disabled
internal static let disabled = L10n.tr("Core", "global.values.disabled") internal static let disabled = L10n.tr("Core", "global.values.disabled")
/// Enabled /// Enabled

4
Passepartout/App/iOS/Scenes/NetworkSettingsViewController.swift
View File

@ -514,7 +514,7 @@ extension NetworkSettingsViewController {
case .mtuBytes: case .mtuBytes:
let cell = Cells.setting.dequeue(from: tableView, for: indexPath) let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
cell.leftText = L10n.Core.NetworkSettings.Mtu.Cells.Bytes.caption cell.leftText = L10n.Core.NetworkSettings.Mtu.Cells.Bytes.caption
cell.rightText = networkSettings.mtuBytes?.description ?? "Default" cell.rightText = networkSettings.mtuBytes?.description ?? L10n.Core.Global.Values.default
return cell return cell
} }
} }
@ -616,7 +616,7 @@ extension NetworkSettingsViewController {
vc.options = ProfileNetworkSettings.mtuOptions vc.options = ProfileNetworkSettings.mtuOptions
vc.descriptionBlock = { vc.descriptionBlock = {
guard $0 != 0 else { guard $0 != 0 else {
return "Default" return L10n.Core.Global.Values.default
} }
return $0.description return $0.description
} }

2
Passepartout/App/iOS/Scenes/ProviderPoolViewController.swift
View File

@ -232,7 +232,7 @@ extension ProviderPoolViewController: UITableViewDataSource, UITableViewDelegate
vc.title = group.localizedCountry vc.title = group.localizedCountry
vc.options = group.pools.sortedPools() vc.options = group.pools.sortedPools()
vc.selectedOption = currentPool vc.selectedOption = currentPool
vc.descriptionBlock = { !$0.secondaryId.isEmpty ? $0.secondaryId : "Default" } vc.descriptionBlock = { !$0.secondaryId.isEmpty ? $0.secondaryId : L10n.Core.Global.Values.default }
vc.selectionBlock = { vc.selectionBlock = {
self.currentPool = $0 self.currentPool = $0
self.delegate?.providerPoolController(self, didSelectPool: $0) self.delegate?.providerPoolController(self, didSelectPool: $0)

8
Passepartout/App/macOS/Global/SwiftGen+Strings.swift
View File

@ -35,12 +35,6 @@ internal enum L10n {
internal static let `protocol` = L10n.tr("App", "endpoint.cells.protocol") internal static let `protocol` = L10n.tr("App", "endpoint.cells.protocol")
} }
} }
internal enum Global {
internal enum Values {
/// Default
internal static let `default` = L10n.tr("App", "global.values.default")
}
}
internal enum Menu { internal enum Menu {
internal enum ActiveProfile { internal enum ActiveProfile {
internal enum Items { internal enum Items {
@ -547,6 +541,8 @@ internal enum L10n {
internal enum Values { internal enum Values {
/// Automatic /// Automatic
internal static let automatic = L10n.tr("Core", "global.values.automatic") internal static let automatic = L10n.tr("Core", "global.values.automatic")
/// Default
internal static let `default` = L10n.tr("Core", "global.values.default")
/// Disabled /// Disabled
internal static let disabled = L10n.tr("Core", "global.values.disabled") internal static let disabled = L10n.tr("Core", "global.values.disabled")
/// Enabled /// Enabled

4
Passepartout/App/macOS/Menu/StatusMenu.swift
View File

@ -306,7 +306,7 @@ class StatusMenu: NSObject {
let infrastructure = providerProfile.infrastructure let infrastructure = providerProfile.infrastructure
for category in infrastructure.categories { for category in infrastructure.categories {
let title = category.name.isEmpty ? L10n.App.Global.Values.default : category.name.capitalized let title = category.name.isEmpty ? L10n.Core.Global.Values.default : category.name.capitalized
let submenu = NSMenu() let submenu = NSMenu()
let item = NSMenuItem(title: title, action: nil, keyEquivalent: "") let item = NSMenuItem(title: title, action: nil, keyEquivalent: "")
item.indentationLevel = 1 item.indentationLevel = 1
@ -325,7 +325,7 @@ class StatusMenu: NSObject {
itemGroup.state = .on itemGroup.state = .on
} }
let title = !pool.secondaryId.isEmpty ? pool.secondaryId : "Default" let title = !pool.secondaryId.isEmpty ? pool.secondaryId : L10n.Core.Global.Values.default
let item = NSMenuItem(title: title, action: #selector(connectToPool(_:)), keyEquivalent: "") let item = NSMenuItem(title: title, action: #selector(connectToPool(_:)), keyEquivalent: "")
if let extraCountry = pool.extraCountries?.first { if let extraCountry = pool.extraCountries?.first {
item.image = extraCountry.image item.image = extraCountry.image

2
Passepartout/App/macOS/Scenes/Service/Customization/ConfigurationViewController.swift
View File

@ -131,7 +131,7 @@ class ConfigurationViewController: NSViewController, ProfileCustomization {
popupCompressionFraming.isEnabled = false popupCompressionFraming.isEnabled = false
popupCompressionAlgorithm.isEnabled = false popupCompressionAlgorithm.isEnabled = false
} else { } else {
popupPreset.addItem(withTitle: L10n.App.Global.Values.default) popupPreset.addItem(withTitle: L10n.Core.Global.Values.default)
popupPreset.isEnabled = false popupPreset.isEnabled = false
} }

4
Passepartout/App/macOS/Scenes/Service/Customization/MTUViewController.swift
View File

@ -67,7 +67,7 @@ class MTUViewController: NSViewController, ProfileCustomization {
labelMTUCaption.stringValue = L10n.Core.NetworkSettings.Mtu.Cells.Bytes.caption.asCaption labelMTUCaption.stringValue = L10n.Core.NetworkSettings.Mtu.Cells.Bytes.caption.asCaption
popupMTU.removeAllItems() popupMTU.removeAllItems()
for opt in ProfileNetworkSettings.mtuOptions { for opt in ProfileNetworkSettings.mtuOptions {
popupMTU.addItem(withTitle: (opt != 0) ? opt.description : "Default") popupMTU.addItem(withTitle: (opt != 0) ? opt.description : L10n.Core.Global.Values.default)
} }
loadSettings(from: currentChoice ?? ProfileNetworkChoices.defaultChoice) loadSettings(from: currentChoice ?? ProfileNetworkChoices.defaultChoice)
} }
@ -115,7 +115,7 @@ class MTUViewController: NSViewController, ProfileCustomization {
popupMTU.isEnabled = (currentChoice == .manual) popupMTU.isEnabled = (currentChoice == .manual)
for (i, opt) in popupMTU.itemTitles.enumerated() { for (i, opt) in popupMTU.itemTitles.enumerated() {
if opt == "Default" { if opt == L10n.Core.Global.Values.default {
if bytes == nil { if bytes == nil {
popupMTU.selectItem(at: i) popupMTU.selectItem(at: i)
break break

4
Passepartout/App/macOS/Scenes/Service/ProviderServiceView.swift
View File

@ -153,7 +153,7 @@ class ProviderServiceView: NSView {
categories.forEach { categories.forEach {
let categoryTitle: String let categoryTitle: String
if $0.name.isEmpty { if $0.name.isEmpty {
categoryTitle = L10n.App.Global.Values.default categoryTitle = L10n.Core.Global.Values.default
} else { } else {
categoryTitle = $0.name.capitalized categoryTitle = $0.name.capitalized
} }
@ -228,7 +228,7 @@ class ProviderServiceView: NSView {
guard !$0.secondaryId.isEmpty || currentSortedPools.count > 1 else { guard !$0.secondaryId.isEmpty || currentSortedPools.count > 1 else {
return return
} }
let title = !$0.secondaryId.isEmpty ? $0.secondaryId : "Default" let title = !$0.secondaryId.isEmpty ? $0.secondaryId : L10n.Core.Global.Values.default
let item = NSMenuItem(title: title, action: nil, keyEquivalent: "") let item = NSMenuItem(title: title, action: nil, keyEquivalent: "")
if let extraCountry = $0.extraCountries?.first { if let extraCountry = $0.extraCountries?.first {
item.image = extraCountry.image item.image = extraCountry.image

2
Passepartout/App/macOS/en.lproj/App.strings
View File

@ -23,8 +23,6 @@
// along with Passepartout. If not, see <http://www.gnu.org/licenses/>. // along with Passepartout. If not, see <http://www.gnu.org/licenses/>.
// //
"global.values.default" = "Default";
"vpn.unused" = "Off"; "vpn.unused" = "Off";
"organizer.title" = "%@"; "organizer.title" = "%@";

1
Passepartout/Core/Resources/de.lproj/Core.strings
View File

@ -238,3 +238,4 @@
"service.cells.use_profile.caption" = "Dieses Profil verwenden"; "service.cells.use_profile.caption" = "Dieses Profil verwenden";
"network_settings.mtu.title" = "MTU"; "network_settings.mtu.title" = "MTU";
"network_settings.mtu.cells.bytes.caption" = "Bytes"; "network_settings.mtu.cells.bytes.caption" = "Bytes";
"global.values.default" = "Default";

1
Passepartout/Core/Resources/el.lproj/Core.strings
View File

@ -238,3 +238,4 @@
"service.cells.use_profile.caption" = "Χρησιμοποιήστε αυτό το προφίλ"; "service.cells.use_profile.caption" = "Χρησιμοποιήστε αυτό το προφίλ";
"network_settings.mtu.title" = "MTU"; "network_settings.mtu.title" = "MTU";
"network_settings.mtu.cells.bytes.caption" = "Bytes"; "network_settings.mtu.cells.bytes.caption" = "Bytes";
"global.values.default" = "Default";

1
Passepartout/Core/Resources/en.lproj/Core.strings
View File

@ -30,6 +30,7 @@
"global.host.title_input.message" = "Acceptable characters are alphanumerics plus dash \"-\", underscore \"_\" and dot \".\"."; "global.host.title_input.message" = "Acceptable characters are alphanumerics plus dash \"-\", underscore \"_\" and dot \".\".";
"global.host.title_input.placeholder" = "My profile"; "global.host.title_input.placeholder" = "My profile";
"global.email_not_configured" = "No e-mail account is configured."; "global.email_not_configured" = "No e-mail account is configured.";
"global.values.default" = "Default";
"global.captions.address" = "Address"; "global.captions.address" = "Address";
"global.captions.port" = "Port"; "global.captions.port" = "Port";

1
Passepartout/Core/Resources/es.lproj/Core.strings
View File

@ -238,3 +238,4 @@
"service.cells.use_profile.caption" = "Usar este perfil"; "service.cells.use_profile.caption" = "Usar este perfil";
"network_settings.mtu.title" = "MTU"; "network_settings.mtu.title" = "MTU";
"network_settings.mtu.cells.bytes.caption" = "Bytes"; "network_settings.mtu.cells.bytes.caption" = "Bytes";
"global.values.default" = "Default";

1
Passepartout/Core/Resources/fr.lproj/Core.strings
View File

@ -238,3 +238,4 @@
"service.cells.use_profile.caption" = "Utiliser ce profile"; "service.cells.use_profile.caption" = "Utiliser ce profile";
"network_settings.mtu.title" = "MTU"; "network_settings.mtu.title" = "MTU";
"network_settings.mtu.cells.bytes.caption" = "Bytes"; "network_settings.mtu.cells.bytes.caption" = "Bytes";
"global.values.default" = "Default";

1
Passepartout/Core/Resources/it.lproj/Core.strings
View File

@ -238,3 +238,4 @@
"service.cells.use_profile.caption" = "Usa questo profilo"; "service.cells.use_profile.caption" = "Usa questo profilo";
"network_settings.mtu.title" = "MTU"; "network_settings.mtu.title" = "MTU";
"network_settings.mtu.cells.bytes.caption" = "Bytes"; "network_settings.mtu.cells.bytes.caption" = "Bytes";
"global.values.default" = "Default";

1
Passepartout/Core/Resources/nl.lproj/Core.strings
View File

@ -238,3 +238,4 @@
"service.cells.use_profile.caption" = "Gebruik dit profiel"; "service.cells.use_profile.caption" = "Gebruik dit profiel";
"network_settings.mtu.title" = "MTU"; "network_settings.mtu.title" = "MTU";
"network_settings.mtu.cells.bytes.caption" = "Bytes"; "network_settings.mtu.cells.bytes.caption" = "Bytes";
"global.values.default" = "Default";

1
Passepartout/Core/Resources/pl.lproj/Core.strings
View File

@ -39,6 +39,7 @@
"global.values.none" = "Brak"; "global.values.none" = "Brak";
"global.values.automatic" = "Automatycznie"; "global.values.automatic" = "Automatycznie";
"global.values.manual" = "Ręcznie"; "global.values.manual" = "Ręcznie";
"global.values.default" = "Default";
"reddit.title" = "Reddit"; "reddit.title" = "Reddit";
"reddit.message" = "Wiedziałeś/łaś, że Passepartout ma swój subreddit? Subskrybuj dla aktualizacji, dyskusji o funkcjonalności, nowych platformach lub o czymkolwiek zechcesz.\n\nTo również świetny sposób na okazanie zainteresowania projektem."; "reddit.message" = "Wiedziałeś/łaś, że Passepartout ma swój subreddit? Subskrybuj dla aktualizacji, dyskusji o funkcjonalności, nowych platformach lub o czymkolwiek zechcesz.\n\nTo również świetny sposób na okazanie zainteresowania projektem.";

1
Passepartout/Core/Resources/pt.lproj/Core.strings
View File

@ -238,3 +238,4 @@
"service.cells.use_profile.caption" = "Usar esse perfil"; "service.cells.use_profile.caption" = "Usar esse perfil";
"network_settings.mtu.title" = "MTU"; "network_settings.mtu.title" = "MTU";
"network_settings.mtu.cells.bytes.caption" = "Bytes"; "network_settings.mtu.cells.bytes.caption" = "Bytes";
"global.values.default" = "Default";

1
Passepartout/Core/Resources/ru.lproj/Core.strings
View File

@ -238,3 +238,4 @@
"service.cells.use_profile.caption" = "Использовать это профиль."; "service.cells.use_profile.caption" = "Использовать это профиль.";
"network_settings.mtu.title" = "MTU"; "network_settings.mtu.title" = "MTU";
"network_settings.mtu.cells.bytes.caption" = "байты"; "network_settings.mtu.cells.bytes.caption" = "байты";
"global.values.default" = "По умолчанию";

1
Passepartout/Core/Resources/sv.lproj/Core.strings
View File

@ -238,3 +238,4 @@
"service.cells.use_profile.caption" = "Använd den här profilen"; "service.cells.use_profile.caption" = "Använd den här profilen";
"network_settings.mtu.title" = "MTU"; "network_settings.mtu.title" = "MTU";
"network_settings.mtu.cells.bytes.caption" = "Bytes"; "network_settings.mtu.cells.bytes.caption" = "Bytes";
"global.values.default" = "Default";

1
Passepartout/Core/Resources/zh-Hans.lproj/Core.strings
View File

@ -238,3 +238,4 @@
"service.cells.use_profile.caption" = "使用此配置"; "service.cells.use_profile.caption" = "使用此配置";
"network_settings.mtu.title" = "MTU"; "network_settings.mtu.title" = "MTU";
"network_settings.mtu.cells.bytes.caption" = "Bytes"; "network_settings.mtu.cells.bytes.caption" = "Bytes";
"global.values.default" = "默认";