GT 2407 add amharic app language

.ruby-version

@@ -1 +1 @@
-3.3.2
+3.3.3

Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.1.3.3)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -15,25 +15,25 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.937.0)
-    aws-sdk-core (3.196.1)
+    aws-partitions (1.947.0)
+    aws-sdk-core (3.198.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.82.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-kms (1.86.0)
+      aws-sdk-core (~> 3, >= 3.198.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.151.0)
-      aws-sdk-core (~> 3, >= 3.194.0)
+    aws-sdk-s3 (1.153.0)
+      aws-sdk-core (~> 3, >= 3.198.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
@@ -83,7 +83,7 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     declarative (0.0.20)
     digest-crc (0.6.5)
@@ -125,7 +125,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.220.0)
+    fastlane (2.221.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -219,14 +219,14 @@ GEM
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
     json (2.7.2)
-    jwt (2.8.1)
+    jwt (2.8.2)
       base64
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0507)
-    mini_magick (4.12.0)
+    mime-types-data (3.2024.0604)
+    mini_magick (4.13.1)
     mini_mime (1.1.5)
-    minitest (5.23.1)
+    minitest (5.24.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
@@ -253,8 +253,8 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     retriable (3.1.2)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.2.9)
+      strscan
     rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)

godtools.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "21bf5557cd80854fb30416658e2f4affd5f9a1aedfae78f9a812d457ecc91fbe",
+  "originHash" : "a3d2041bcb8f3bbbaa3e44eda084568588879e2d51501ad6396f9c0eddb6d4d9",
   "pins" : [
     {
       "identity" : "abseil-cpp-binary",

godtools/App/DependencyContainer/AppDataLayerDependencies.swift

@@ -146,12 +146,6 @@ class AppDataLayerDependencies {
         return sharedInfoPlist
     }
 
-    func getLanguageSettingsRepository() -> LanguageSettingsRepository {
-        return LanguageSettingsRepository(
-            cache: LanguageSettingsCache()
-        )
-    }
-
     func getLanguagesRepository() -> LanguagesRepository {
 
         let api = MobileContentLanguagesApi(

godtools/App/Features/AppLanguage/Data-DomainInterface/GetLanguageSettingsInterfaceStringsRepository.swift

@@ -26,33 +26,44 @@ class GetLanguageSettingsInterfaceStringsRepository: GetLanguageSettingsInterfac
 
         let localeId: String = translateInAppLanguage
 
-        let interfaceStrings = LanguageSettingsInterfaceStringsDomainModel(
-            navTitle: localizationServices.stringForLocaleElseEnglish(localeIdentifier: localeId, key: LocalizableStringKeys.languageSettingsNavTitle.key, fileType: .strings),
-            appInterfaceLanguageTitle: localizationServices.stringForLocaleElseEnglish(localeIdentifier: localeId, key: LocalizableStringKeys.languageSettingsAppInterfaceTitle.key, fileType: .strings),
-            numberOfAppLanguagesAvailable: getNumberOfAppLanguagesAvailableString(translateInAppLanguage: translateInAppLanguage),
-            setAppLanguageMessage: localizationServices.stringForLocaleElseEnglish(localeIdentifier: localeId, key: LocalizableStringKeys.languageSettingsAppInterfaceMessage.key, fileType: .strings),
-            chooseAppLanguageButtonTitle: translatedLanguageNameRepository.getLanguageName(language: translateInAppLanguage, translatedInLanguage: translateInAppLanguage),
-            toolLanguagesAvailableOfflineTitle: localizationServices.stringForLocaleElseEnglish(localeIdentifier: localeId, key: LocalizableStringKeys.languageSettingsToolLanguagesAvailableOfflineTitle.key, fileType: .strings),
-            downloadToolsForOfflineMessage: localizationServices.stringForLocaleElseEnglish(localeIdentifier: localeId, key: LocalizableStringKeys.languageSettingsToolLanguagesAvailableOfflineMessage.key, fileType: .strings),
-            editDownloadedLanguagesButtonTitle: localizationServices.stringForLocaleElseEnglish(localeIdentifier: localeId, key: LocalizableStringKeys.languageSettingsToolLanguagesAvailableOfflineEditDownloadedLanguagesButtonTitle.key, fileType: .strings)
-        )
-
-        return Just(interfaceStrings)
+        return getNumberOfAppLanguagesAvailableStringPublisher(translateInAppLanguage: translateInAppLanguage)
+            .map { (numberOfAppLanguagesInterfaceString: String) in
+
+                let interfaceStrings = LanguageSettingsInterfaceStringsDomainModel(
+                    navTitle: self.localizationServices.stringForLocaleElseEnglish(localeIdentifier: localeId, key: LocalizableStringKeys.languageSettingsNavTitle.key, fileType: .strings),
+                    appInterfaceLanguageTitle: self.localizationServices.stringForLocaleElseEnglish(localeIdentifier: localeId, key: LocalizableStringKeys.languageSettingsAppInterfaceTitle.key, fileType: .strings),
+                    numberOfAppLanguagesAvailable: numberOfAppLanguagesInterfaceString,
+                    setAppLanguageMessage: self.localizationServices.stringForLocaleElseEnglish(localeIdentifier: localeId, key: LocalizableStringKeys.languageSettingsAppInterfaceMessage.key, fileType: .strings),
+                    chooseAppLanguageButtonTitle: self.translatedLanguageNameRepository.getLanguageName(language: translateInAppLanguage, translatedInLanguage: translateInAppLanguage),
+                    toolLanguagesAvailableOfflineTitle: self.localizationServices.stringForLocaleElseEnglish(localeIdentifier: localeId, key: LocalizableStringKeys.languageSettingsToolLanguagesAvailableOfflineTitle.key, fileType: .strings),
+                    downloadToolsForOfflineMessage: self.localizationServices.stringForLocaleElseEnglish(localeIdentifier: localeId, key: LocalizableStringKeys.languageSettingsToolLanguagesAvailableOfflineMessage.key, fileType: .strings),
+                    editDownloadedLanguagesButtonTitle: self.localizationServices.stringForLocaleElseEnglish(localeIdentifier: localeId, key: LocalizableStringKeys.languageSettingsToolLanguagesAvailableOfflineEditDownloadedLanguagesButtonTitle.key, fileType: .strings)
+                )
+
+                return interfaceStrings
+            }
             .eraseToAnyPublisher()
     }
 
-    private func getNumberOfAppLanguagesAvailableString(translateInAppLanguage: AppLanguageDomainModel) -> String {
-
-        let numberOfAppLanguages: Int = appLanguagesRepository.getNumberOfCachedLanguages()
+    private func getNumberOfAppLanguagesAvailableStringPublisher(translateInAppLanguage: AppLanguageDomainModel) -> AnyPublisher<String, Never> {
 
-        let localizedNumberOfLanguagesAvailable = localizationServices.stringForLocaleElseSystemElseEnglish(
-            localeIdentifier: translateInAppLanguage,
-            key: LocalizableStringDictKeys.languageSettingsAppLanguageNumberAvailable.key,
-            fileType: .stringsdict
-        )
-
-        let stringLocaleFormat = String(format: localizedNumberOfLanguagesAvailable, locale: Locale(identifier: translateInAppLanguage), numberOfAppLanguages)
-
-        return stringLocaleFormat
+        return appLanguagesRepository.observeNumberOfAppLanguagesPublisher()
+            .map { (numberOfAppLanguages: Int) in
+
+                let localizedNumberOfLanguagesAvailable = self.localizationServices.stringForLocaleElseSystemElseEnglish(
+                    localeIdentifier: translateInAppLanguage,
+                    key: LocalizableStringDictKeys.languageSettingsAppLanguageNumberAvailable.key,
+                    fileType: .stringsdict
+                )
+
+                let stringLocaleFormat = String(
+                    format: localizedNumberOfLanguagesAvailable,
+                    locale: Locale(identifier: translateInAppLanguage),
+                    numberOfAppLanguages
+                )
+
+                return stringLocaleFormat
+            }
+            .eraseToAnyPublisher()
     }
 }

godtools/App/Features/AppLanguage/Data/AppLanguagesRepository/Api/AppLanguageCodable.swift

@@ -0,0 +1,48 @@
+//
+//  AppLanguageCodable.swift
+//  godtools
+//
+//  Created by Levi Eggert on 5/7/24.
+//  Copyright © 2024 Cru. All rights reserved.
+//
+
+import Foundation
+
+struct AppLanguageCodable: Codable {
+
+    private static let languageDirectionLeftToRight: String = "ltr"
+    private static let languageDirectionRightToLeft: String = "rtl"
+
+    let languageCode: String
+    let languageDirectionValue: String
+    let languageScriptCode: String?
+
+    enum RootKeys: String, CodingKey {
+        case languageCode = "language_code"
+        case languageDirection = "language_direction"
+        case languageScriptCode = "language_script_code"
+    }
+
+    init(languageCode: String, languageDirection: AppLanguageDataModel.Direction, languageScriptCode: String?) {
+
+        self.languageCode = languageCode
+        self.languageDirectionValue = languageDirection == .rightToLeft ? AppLanguageCodable.languageDirectionRightToLeft : AppLanguageCodable.languageDirectionLeftToRight
+        self.languageScriptCode = languageScriptCode
+    }
+
+    init(from decoder: Decoder) throws {
+
+        let container = try decoder.container(keyedBy: RootKeys.self)
+
+        languageCode = try container.decode(String.self, forKey: .languageCode)
+        languageDirectionValue = try container.decode(String.self, forKey: .languageDirection)
+        languageScriptCode = try container.decodeIfPresent(String.self, forKey: .languageScriptCode)
+    }
+}
+
+extension AppLanguageCodable: AppLanguageDataModelInterface {
+
+    var languageDirection: AppLanguageDataModel.Direction {
+        return languageDirectionValue == AppLanguageCodable.languageDirectionRightToLeft ? .rightToLeft : .leftToRight
+    }
+}

godtools/App/Features/AppLanguage/Data/AppLanguagesRepository/Api/AppLanguagesApi.swift

@@ -0,0 +1,41 @@
+//
+//  AppLanguagesApi.swift
+//  godtools
+//
+//  Created by Levi Eggert on 5/7/24.
+//  Copyright © 2024 Cru. All rights reserved.
+//
+
+import Foundation
+import Combine
+
+class AppLanguagesApi {
+
+    init() {
+
+    }
+
+    func getAppLanguagesPublisher() -> AnyPublisher<[AppLanguageCodable], Error> {
+
+        let allAppLanguages: [AppLanguageCodable] = [
+            AppLanguageCodable(languageCode: "am", languageDirection: .leftToRight, languageScriptCode: nil),
+            AppLanguageCodable(languageCode: "ar", languageDirection: .rightToLeft, languageScriptCode: nil),
+            AppLanguageCodable(languageCode: "en", languageDirection: .leftToRight, languageScriptCode: nil),
+            AppLanguageCodable(languageCode: "es", languageDirection: .leftToRight, languageScriptCode: nil),
+            AppLanguageCodable(languageCode: "pt", languageDirection: .leftToRight, languageScriptCode: nil),
+            AppLanguageCodable(languageCode: "fr", languageDirection: .leftToRight, languageScriptCode: nil),
+            AppLanguageCodable(languageCode: "id", languageDirection: .leftToRight, languageScriptCode: nil),
+            AppLanguageCodable(languageCode: "zh", languageDirection: .leftToRight, languageScriptCode: "Hans"),
+            AppLanguageCodable(languageCode: "zh", languageDirection: .leftToRight, languageScriptCode: "Hant"),
+            AppLanguageCodable(languageCode: "hi", languageDirection: .leftToRight, languageScriptCode: nil),
+            AppLanguageCodable(languageCode: "ru", languageDirection: .leftToRight, languageScriptCode: nil),
+            AppLanguageCodable(languageCode: "vi", languageDirection: .leftToRight, languageScriptCode: nil),
+            AppLanguageCodable(languageCode: "lv", languageDirection: .leftToRight, languageScriptCode: nil),
+            AppLanguageCodable(languageCode: "bn", languageDirection: .leftToRight, languageScriptCode: nil),
+            AppLanguageCodable(languageCode: "ur", languageDirection: .rightToLeft, languageScriptCode: nil)
+        ]
+
+        return Just(allAppLanguages).setFailureType(to: Error.self)
+            .eraseToAnyPublisher()
+    }
+}

godtools/App/Features/AppLanguage/Data/AppLanguagesRepository/AppLanguageDataModel.swift

@@ -8,19 +8,24 @@
 
 import Foundation
 
-struct AppLanguageDataModel {
+struct AppLanguageDataModel: AppLanguageDataModelInterface {
 
     let languageCode: String
     let languageDirection: AppLanguageDataModel.Direction
     let languageScriptCode: String?
 
-    var languageId: BCP47LanguageIdentifier {
+    init(languageCode: String, languageDirection: AppLanguageDataModel.Direction, languageScriptCode: String?) {
 
-        if let languageScriptCode = languageScriptCode, !languageScriptCode.isEmpty {
-            return languageCode + "-" + languageScriptCode
-        }
+        self.languageCode = languageCode
+        self.languageDirection = languageDirection
+        self.languageScriptCode = languageScriptCode
+    }
+
+    init(dataModel: AppLanguageDataModelInterface) {
 
-        return languageCode
+        self.languageCode = dataModel.languageCode
+        self.languageDirection = dataModel.languageDirection
+        self.languageScriptCode = dataModel.languageScriptCode
     }
 }
 

godtools/App/Features/AppLanguage/Data/AppLanguagesRepository/AppLanguageDataModelInterface.swift

@@ -0,0 +1,28 @@
+//
+//  AppLanguageDataModelInterface.swift
+//  godtools
+//
+//  Created by Levi Eggert on 5/7/24.
+//  Copyright © 2024 Cru. All rights reserved.
+//
+
+import Foundation
+
+protocol AppLanguageDataModelInterface {
+
+    var languageCode: String { get }
+    var languageDirection: AppLanguageDataModel.Direction { get }
+    var languageScriptCode: String? { get }
+}
+
+extension AppLanguageDataModelInterface {
+
+    var languageId: BCP47LanguageIdentifier {
+
+        if let languageScriptCode = languageScriptCode, !languageScriptCode.isEmpty {
+            return languageCode + "-" + languageScriptCode
+        }
+
+        return languageCode
+    }
+}