Edited teams members, fixed localizations

cesko-digital · Sep 13, 2022 · fa324ba · fa324ba
1 parent 999ca92
commit fa324ba
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 23 deletions.
diff --git a/Shared/Assets.xcassets/data/team.dataset/team.json b/Shared/Assets.xcassets/data/team.dataset/team.json
@@ -1,21 +1,36 @@
 {
   "sections": [
     {
-      "name": "Vývoj Apple aplikace",
+      "name": {
+        "cs": "Vývoj Apple aplikace",
+        "pl": "Tworzenie aplikacji Apple",
+        "uk": "Розробка додатку для Apple",
+        "sk": "Vývoj Apple aplikácie",
+        "en": "iOS development"
+      },
       "members": [
         {
           "name": "Martin Kluska"
         },
         {
-          "name": "Daryna Polevyk"
+          "name": "Jakub Růžička"
+        },
+        {
+          "name": "Daryna Meliš"
         },
         {
           "name": "Radek Pištělák"
         }
       ]
     },
     {
-      "name": "Vývoj Android aplikace",
+      "name": {
+        "cs": "Vývoj Android aplikace",
+        "pl": "Rozwój aplikacji na Androida",
+        "uk": "Розробка додатку для Android",
+        "sk": "Vývoj Android aplikácie",
+        "en": "Android development"
+      },
       "members": [
         {
           "name": "Václav Chlumský"
@@ -26,7 +41,13 @@
       ]
     },
     {
-      "name": "Vývoj webu",
+      "name": {
+        "cs": "Vývoj webu",
+        "pl": "Tworzenie stron internetowych",
+        "uk": "Веб-розробка",
+        "sk": "Vývoj webu",
+        "en": "Web development"
+      },
       "members": [
         {
           "name": "Oleg Antonyak"
@@ -49,7 +70,13 @@
       ]
     },
     {
-      "name": "Vedení projektu",
+      "name": {
+        "cs": "Vedení projektu",
+        "pl": "Zarządzanie projektem",
+        "uk": "Управління проектом",
+        "sk": "Vedenie projektu",
+        "en": "Leadership"
+      },
       "members": [
         {
           "name": "Martin Hassman"
@@ -63,7 +90,13 @@
       ]
     },
     {
-      "name": "Marketing",
+      "name": {
+        "cs": "Marketing",
+        "pl": "Marketing",
+        "uk": "Маркетинг",
+        "sk": "Marketing",
+        "en": "Marketing"
+      },
       "members": [
         {
           "name": "Kateřina Strakošová"
@@ -76,11 +109,20 @@
         },
         {
           "name": "Lenka Kolisnyk"
+        },
+        {
+          "name": "Monika Fabryová"
         }
       ]
     },
     {
-      "name": "Tvorba obsahu",
+      "name": {
+        "cs": "Tvorba obsahu",
+        "pl": "Tworzenie treści",
+        "uk": "Створення контенту",
+        "sk": "Tvorba obsahu",
+        "en": "Content creation"
+      },
       "members": [
         {
           "name": "Tereza Javornická"
@@ -112,7 +154,13 @@
       ]
     },
     {
-      "name": "UX tým",
+      "name": {
+        "cs": "UX tým",
+        "pl": "Zespół UX",
+        "uk": "Команда UX",
+        "sk": "UX tím",
+        "en": "UX team"
+      },
       "members": [
         {
           "name": "Valeriia Kuna"
@@ -123,7 +171,13 @@
       ]
     },
     {
-      "name": "Testování",
+      "name": {
+        "cs": "Testování",
+        "pl": "Testowanie",
+        "uk": "Тестування",
+        "sk": "Testovanie",
+        "en": "Testing"
+      },
       "members": [
         {
           "name": "Anna Popelková"
@@ -140,7 +194,13 @@
       ]
     },
     {
-      "name": "Děkujeme týmu z České spořitelny",
+      "name": {
+        "cs": "Děkujeme týmu z České spořitelny",
+        "pl": "Podziękowania dla zespołu Česká spořitelna",
+        "uk": "Дякуємо команді банку Česká spořitelna",
+        "sk": "Ďakujeme tímu z Českej sporiteľne",
+        "en": "Thank you to the team from Česká spořitelna"
+      },
       "members": [
         {
           "name": "Ema Dolejšková"

diff --git a/Shared/Dictionary/DictionaryView.swift b/Shared/Dictionary/DictionaryView.swift
@@ -57,7 +57,7 @@ struct DictionaryView: View {
     }
 
     var errorOrLoadView: some View {
-        // Allign middle
+        // Align middle
         VStack {
             Spacer()
             if let error = dataStore.error{

diff --git a/Shared/Menu/MenuView.swift b/Shared/Menu/MenuView.swift
@@ -106,7 +106,7 @@ struct MenuView<ViewModel: MenuViewModeling>: View {
             openLinkButton("movapp.cz", url: "https://movapp.cz")
 
             NavigationLink("about_team") {
-                TeamView()
+                TeamView(selectedLanguage: viewModel.selectedLanguage)
                     .navigationTitle("about_team")
             }
 

diff --git a/Shared/Menu/MenuViewModel.swift b/Shared/Menu/MenuViewModel.swift
@@ -16,6 +16,8 @@ protocol MenuViewModeling: ObservableObject {
     var nativePicker: PickerState { get set }
     var toLearnPicker: PickerState { get set }
 
+    var selectedLanguage: SetLanguage { get }
+
     func nativeLanguageChanged()
     func toLearnLanguageChanged()
 }
@@ -24,6 +26,10 @@ class MenuViewModel: MenuViewModeling {
     @Published var nativePicker: PickerState
     @Published var toLearnPicker: PickerState
 
+    var selectedLanguage: SetLanguage {
+        languageStore.currentLanguage
+    }
+
     let languageStore: LanguageStore
 
     init(selectedLanguage: SetLanguage, languageStore: LanguageStore) {

diff --git a/Shared/Menu/TeamView.swift b/Shared/Menu/TeamView.swift
@@ -11,7 +11,13 @@ struct TeamView: View {
 
     @EnvironmentObject var dataStore: TeamDataStore
     @EnvironmentObject var onBoardingDataStore: OnBoardingStore
-
+
+    private let languageKey: String
+
+    init(selectedLanguage: SetLanguage) {
+        self.languageKey = selectedLanguage.language.main.rawValue
+    }
+
     var body: some View {
 
         if let team = dataStore.team {
@@ -22,7 +28,7 @@ struct TeamView: View {
                             Text(member.name)
                         }
                     } header: {
-                        Text(section.name)
+                        Text(section.name[languageKey] ?? "Default value")
                     }
                 }
             }
@@ -33,7 +39,7 @@ struct TeamView: View {
     }
 
     var errorOrLoadView: some View {
-        // Allign middle
+        // Align middle
         VStack {
             Spacer()
             if let error = dataStore.error {
@@ -53,9 +59,9 @@ struct TeamView: View {
 struct TeamView_Previews: PreviewProvider {
     static let dataStore = TeamDataStore()
     static let onBoardingStore = OnBoardingStore(userDefaultsStore: UserDefaultsStore())
-    
+
     static var previews: some View {
-        TeamView()
+        TeamView(selectedLanguage: .csUk)
             .environmentObject(dataStore)
             .environmentObject(onBoardingStore)
     }

diff --git a/Shared/Models/Team.swift b/Shared/Models/Team.swift
@@ -28,7 +28,7 @@ struct Team: Decodable {
         }
 
         var id = UUID()
-        let name: String
+        let name: [String: String]
         let members: [Member]
     }
 

diff --git a/Shared/Resources/sk.lproj/Localizable.strings b/Shared/Resources/sk.lproj/Localizable.strings
@@ -14,19 +14,19 @@
 "about_version" = "Verzia: %@ (%@)";
 "country_flag" = "vlajka";
 "play_transcription" = "prehrať zvuk";
-"i_want_learn" = "Chcem sa naučiť";
+"i_want_learn" = "Chcem sa naučiť po";
 "settings" = "Nastavenia";
 "ukrainian" = "ukrajinčina";
 "czech" = "čeština";
 "alphabet_ukrainian" = "Ukrajinská abeceda";
 "alphabet_czech" = "Česká abeceda";
 "search_word" = "Hľadať slovíčko";
 "title_settings" = "Nastavenia";
-"on_boarding_welcome" = "Vítajte v MOVAPP!";
+"on_boarding_welcome" = "Vitajte v MOVAPP!";
 "on_boarding_exit" = "Začať sa učiť";
-"on_boarding_choice" = "Vyberte jazyk, ktorý se chcete naučit";
+"on_boarding_choice" = "Vyberte jazyk, ktorý sa chcete naučiť";
 "on_boarding_info_1_title" = "Slovníček";
-"on_boarding_info_1_description" = "Naučte sa stovky základných slovíčok a frází čitaním i počúvaním. Slovíčka triedime  podľa životných situacií.";
+"on_boarding_info_1_description" = "Naučte sa stovky základných slovíčok a fráz čitaním i počúvaním. Slovíčka triedime  podľa životných situacií.";
 "on_boarding_info_2_title" = "Abeceda";
 "on_boarding_info_2_description" = "Naučte sa všetky znaky ukrajinskej cyriliky. Pomôžu  vám ukážkové slová.";
 "on_boarding_info_3_title" = "Pre deti";
@@ -39,7 +39,7 @@
 "alphabet_polish" = "Poľská abeceda";
 "i_know" = "Rodný jazyk";
 "on_boarding_info_0_title" = "Výborne!";
-"on_boarding_info_0_description" = "Poďme sa učiť po %@. Aplikáciu môžete používať aj offline pokiaľ nie ste pripojený k internetu.";
+"on_boarding_info_0_description" = "Poďme sa učiť po %@. Aplikáciu môžete používať aj offline, pokiaľ nie ste pripojený k internetu.";
 "on_boarding_skip" = "Preskočiť";
 "on_boarding_back" = "Späť";
 "on_boarding_choice_native" = "Vyberte jazyk, ktorým hovoríte";