From b7c8e39fccc8b753c32ae3dfe6bfbd9ae9a116fe Mon Sep 17 00:00:00 2001 From: Max Bothe Date: Wed, 6 Oct 2021 09:16:11 +0200 Subject: [PATCH] Fix search filter for topics on openHPI --- Common/Base.lproj/Localizable.strings | 5 +---- Common/Branding/CourseClassifierSearchFilters.swift | 5 +---- Common/de.lproj/Localizable.strings | 5 +---- .../BrandConfiguration.dataset/BrandConfiguration.plist | 4 ++-- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Common/Base.lproj/Localizable.strings b/Common/Base.lproj/Localizable.strings index 01f3fcfaf..ff7399435 100644 --- a/Common/Base.lproj/Localizable.strings +++ b/Common/Base.lproj/Localizable.strings @@ -26,12 +26,9 @@ /* Title for target audience filter (sap) */ "course-list.search.filter.title.target audience" = "Target Audience"; -/* Title for topic filter (sap) */ +/* Title for topic filter (hpi + sap) */ "course-list.search.filter.title.topic" = "Topic"; -/* Title for track filter (hpi) */ -"course-list.search.filter.title.track" = "Track"; - /* explanation how to achieve the certificate */ "course.certificates.explanation.confirmationOfParticipation" = "A confirmation of participation is issued to those who have completed at least %d%% of the course material."; diff --git a/Common/Branding/CourseClassifierSearchFilters.swift b/Common/Branding/CourseClassifierSearchFilters.swift index 236b77f71..91b4bdf64 100644 --- a/Common/Branding/CourseClassifierSearchFilters.swift +++ b/Common/Branding/CourseClassifierSearchFilters.swift @@ -11,21 +11,18 @@ public struct CourseClassifierSearchFilters: Decodable { } public enum CourseClassifierSearchFilterType: String, Decodable { - case track case targetAudience case proficiencyLevel case topic public var displayName: String { switch self { - case .track: - return CommonLocalizedString("course-list.search.filter.title.track", comment: "Title for track filter (hpi)") case .targetAudience: return CommonLocalizedString("course-list.search.filter.title.target audience", comment: "Title for target audience filter (sap)") case .proficiencyLevel: return CommonLocalizedString("course-list.search.filter.title.proficiency level", comment: "Title for proficiency level filter (who)") case .topic: - return CommonLocalizedString("course-list.search.filter.title.topic", comment: "Title for topic filter (sap)") + return CommonLocalizedString("course-list.search.filter.title.topic", comment: "Title for topic filter (hpi + sap)") } } } diff --git a/Common/de.lproj/Localizable.strings b/Common/de.lproj/Localizable.strings index 228641f2a..b76ea05f4 100644 --- a/Common/de.lproj/Localizable.strings +++ b/Common/de.lproj/Localizable.strings @@ -26,12 +26,9 @@ /* Title for target audience filter (sap) */ "course-list.search.filter.title.target audience" = "Zielgruppe"; -/* Title for topic filter (sap) */ +/* Title for topic filter (hpi + sap) */ "course-list.search.filter.title.topic" = "Thema"; -/* Title for track filter (hpi) */ -"course-list.search.filter.title.track" = "Kategorie"; - /* explanation how to achieve the certificate */ "course.certificates.explanation.confirmationOfParticipation" = "Die Teilnahmebestätigung erhält, wer auf zumindest %d%% der Kursunterlagen zugegriffen hat."; diff --git a/iOS/Branding/openHPI/assets-ios-brand.xcassets/BrandConfiguration.dataset/BrandConfiguration.plist b/iOS/Branding/openHPI/assets-ios-brand.xcassets/BrandConfiguration.dataset/BrandConfiguration.plist index 896ca054e..28cd6044b 100644 --- a/iOS/Branding/openHPI/assets-ios-brand.xcassets/BrandConfiguration.dataset/BrandConfiguration.plist +++ b/iOS/Branding/openHPI/assets-ios-brand.xcassets/BrandConfiguration.dataset/BrandConfiguration.plist @@ -53,8 +53,8 @@ courseClassifierSearchFilters - category - track + topic + topic additionalLearningMaterial