Skip to content

Commit a2aa3e0

Browse files
committed
1.0.2
changed visibility added unkonw languages
1 parent b0aa7c7 commit a2aa3e0

File tree

5 files changed

+25
-18
lines changed

5 files changed

+25
-18
lines changed

ISO639.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'ISO639'
3-
s.version = '1.0.1'
3+
s.version = '1.0.2'
44
s.summary = 'Defining languages based on ISO639-1.'
55
s.homepage = 'https://github.com/smuellner/ISO639-for-swift'
66
s.license = { type: 'Apache', file: 'LICENSE' }

Sources/ISO639/Alphabet+Extensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import Foundation
99

1010
extension Alphabet {
11-
func randomCharacters(count :Int) -> [Character] {
11+
public func randomCharacters(count :Int) -> [Character] {
1212
return Array(self.characters.shuffled().prefix(count))
1313
}
1414
}

Sources/ISO639/Alphabet.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public enum Alphabet: String, CaseIterable {
7171
case persian
7272
case farsi
7373

74-
var characters: [Character] {
74+
public var characters: [Character] {
7575
switch self {
7676
case .latin:
7777
return ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"]

Sources/ISO639/Language+Extensions.swift

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,29 @@
88
import Foundation
99

1010
extension Language {
11-
static var preferredLanguages: Array<Language> {
11+
public static var preferredLanguage: Language? {
12+
let preferredLocalization = Bundle.main.preferredLocalizations.first
13+
return Language.all.first { (language) -> Bool in
14+
let alpha2 = language.alpha2.rawValue
15+
return alpha2 == preferredLocalization
16+
}
17+
}
18+
19+
public static var preferredLanguages: Array<Language> {
1220
return Language.all.filter { (language) -> Bool in
1321
let alpha2 = language.alpha2.rawValue
1422
return Bundle.main.preferredLocalizations.contains(alpha2)
1523
}
1624
}
17-
18-
static var preferredLanguage: Language? {
19-
let preferredLocalization = Bundle.main.preferredLocalizations.first
20-
return Language.all.first { (language) -> Bool in
25+
26+
public static var unknownLanguages: Array<Language> {
27+
return Language.all.filter { (language) -> Bool in
2128
let alpha2 = language.alpha2.rawValue
22-
return alpha2 == preferredLocalization
29+
return !Bundle.main.preferredLocalizations.contains(alpha2)
2330
}
2431
}
2532

26-
func randomCharactersFromAlphabet(count :Int) -> [Character] {
33+
public func randomCharactersFromAlphabet(count :Int) -> [Character] {
2734
guard let alphabet = self.alphabet else {
2835
return []
2936
}

Sources/ISO639/Language.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
// MARK: Language
99

1010
public struct Language {
11-
var name: String // language name in english
12-
var official: String // official language name
13-
var alpha1: ISO639Alpha1
14-
var alpha2: ISO639Alpha2
15-
var alpha2T: String
16-
var alpha2B: String
17-
var alpha3: String
18-
var alphabet: Alphabet?
11+
public var name: String // language name in english
12+
public var official: String // official language name
13+
public var alpha1: ISO639Alpha1
14+
public var alpha2: ISO639Alpha2
15+
public var alpha2T: String
16+
public var alpha2B: String
17+
public var alpha3: String
18+
public var alphabet: Alphabet?
1919
}
2020

2121
// MARK: ISO639 Official Languages

0 commit comments

Comments
 (0)