- return this.http.get(ServerService.BASE_VIDEO_URL + attributeName)
- .subscribe(data => {
- Object.keys(data)
- .forEach(dataKey => {
- hashToPopulate.push({
- id: dataKey,
- label: data[dataKey]
- })
- })
-
- if (sort === true) {
- hashToPopulate.sort((a, b) => {
- if (a.label < b.label) return -1
- if (a.label === b.label) return 0
- return 1
- })
- }
-
- notifier.next(true)
- })
+ return this.getServerLocale()
+ .pipe(
+ switchMap(translations => {
+ return this.http.get<{ [ id: string ]: string }>(baseUrl + attributeName)
+ .pipe(map(data => ({ data, translations })))
+ }),
+ map(({ data, translations }) => {
+ const hashToPopulate: VideoConstant<T>[] = []
+
+ Object.keys(data)
+ .forEach(dataKey => {
+ const label = data[ dataKey ]
+
+ hashToPopulate.push({
+ id: (attributeName === 'languages' ? dataKey : parseInt(dataKey, 10)) as T,
+ label: peertubeTranslate(label, translations)
+ })
+ })
+
+ if (sort === true) sortBy(hashToPopulate, 'label')
+
+ return hashToPopulate
+ }),
+ shareReplay()
+ )