Skip to content

Commit 00dc554

Browse files
committed
Move code to composable - refs BT#22255
1 parent 8bed158 commit 00dc554

File tree

2 files changed

+25
-11
lines changed

2 files changed

+25
-11
lines changed

assets/vue/composables/language.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
export function useLanguage() {
2+
const defaultLanguage = { originalName: "English", isocode: "en" }
3+
4+
/**
5+
* @type {{originalName: string, isocode: string}[]}
6+
*/
7+
const languageList = window.languages || [defaultLanguage]
8+
9+
/**
10+
* @param {string} isoCode
11+
* @returns {{originalName: string, isocode: string}|undefined}
12+
*/
13+
function findByIsoCode(isoCode) {
14+
return languageList.find((language) => isoCode === language.isocode)
15+
}
16+
17+
return {
18+
defaultLanguage,
19+
languageList,
20+
findByIsoCode,
21+
}
22+
}

assets/vue/views/course/CatalogueCourses.vue

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,10 @@ import courseService from "../../services/courseService"
207207
import * as trackCourseRanking from "../../services/trackCourseRankingService"
208208
209209
import { useNotification } from "../../composables/notification"
210+
import { useLanguage } from "../../composables/language"
210211
211212
const { showErrorNotification } = useNotification()
213+
const { findByIsoCode: findLanguageByIsoCode } = useLanguage()
212214
213215
const securityStore = useSecurityStore()
214216
const status = ref(false)
@@ -227,7 +229,7 @@ async function load() {
227229
228230
courses.value = items.map((course) => ({
229231
...course,
230-
courseLanguage: getOriginalLanguageName(course.courseLanguage),
232+
courseLanguage: findLanguageByIsoCode(course.courseLanguage)?.originalName,
231233
}))
232234
} catch (error) {
233235
showErrorNotification(error)
@@ -294,16 +296,6 @@ const initFilters = function () {
294296
}
295297
}
296298
297-
const getOriginalLanguageName = function (courseLanguage) {
298-
const languages = window.languages
299-
let language = languages.find((element) => element.isocode === courseLanguage)
300-
if (language) {
301-
return language.originalName
302-
} else {
303-
return ""
304-
}
305-
}
306-
307299
const onRatingChange = function (event, trackCourseRanking, courseId) {
308300
let { value } = event
309301
if (value > 0) {

0 commit comments

Comments
 (0)