diff --git a/app/components/public/stream/side-panel.hbs b/app/components/public/stream/side-panel.hbs index 4f69d01352e..582416ee737 100644 --- a/app/components/public/stream/side-panel.hbs +++ b/app/components/public/stream/side-panel.hbs @@ -59,7 +59,7 @@
- {{#each this.streams as |stream|}} + {{#each this.streamList as |stream|}} {{truncate (uppercase stream.name) 1 false}} {{stream.name}} diff --git a/app/components/public/stream/side-panel.ts b/app/components/public/stream/side-panel.ts index 6c593fb1681..271b14a93d8 100644 --- a/app/components/public/stream/side-panel.ts +++ b/app/components/public/stream/side-panel.ts @@ -46,6 +46,7 @@ export default class PublicStreamSidePanel extends Component { @tracked showChat = false; @tracked showRoomChat = false; @tracked showVideoRoom = false; + @tracked languageList: any = []; @tracked translationChannels = [{ id : '0', @@ -147,14 +148,22 @@ export default class PublicStreamSidePanel extends Component { isGlobalEventRoom : rooms.data.filter((room: any) => room.relationships['video-stream'].data ? room.relationships['video-stream'].data.id === stream.id : null).map((room: any) => room.attributes['is-global-event-room'])[0], chatRoomName : rooms.data.filter((room: any) => room.relationships['video-stream'].data ? room.relationships['video-stream'].data.id === stream.id : null).map((room: any) => room.attributes['chat-room-name'])[0], microlocationId : rooms.data.filter((room: any) => room.relationships['video-stream'].data ? room.relationships['video-stream'].data.id === stream.id : null).map((room: any) => room.id)[0], - hash : stringHashCode(stream.attributes.name + stream.id) - })).forEach(async(stream: any) => { + hash : stringHashCode(stream.attributes.name + stream.id), + translations : [] + })).forEach((stream: any) => { this.addStream(stream) }); - this.streams.forEach(async(stream: any) => { - const res = await this.fetchTranslationChannels(stream.id) - stream.translations = res - }); + const languageLists: any = []; + Promise.all(this.streams.map(async(stream: any) => { + const res = await this.fetchTranslationChannels(stream.id); + const item = { + streamId: stream.id + } + languageLists.push(item); + stream.translations = res; + })).then(() => { + this.languageList = languageLists; + }) } catch (e) { console.error('Error while loading rooms in video stream', e); } @@ -174,4 +183,9 @@ export default class PublicStreamSidePanel extends Component { this.loading = false; this.streams = [...this.streams]; } + + @computed('languageList.@each.streamId') + get streamList() { + return this.streams; + } } diff --git a/app/models/video-stream.ts b/app/models/video-stream.ts index 9376f6c1714..423845e7f9f 100644 --- a/app/models/video-stream.ts +++ b/app/models/video-stream.ts @@ -35,6 +35,7 @@ export default class VideoStream extends ModelBase.extend() { @attr() additionalInformation!: string; @attr() extra!: Extra; @attr() chatRoomName?: string; + @attr() translations?: any[]; @hasMany('microlocation') rooms!: Microlocation[]; @hasMany('video-recording') videoRecordings!: VideoRecording[]; diff --git a/package.json b/package.json index c1ae23637f4..4c390149a69 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "ember-resolver": "^8.0.3", "ember-route-action-helper": "^2.0.8", "ember-router-scroll": "^3.3.7", - "ember-simple-auth": "^4.2.2", + "ember-simple-auth": "^6.0.0", "ember-simple-auth-token": "^5.3.0", "ember-source": "3.20.3", "ember-spectrum-color-picker": "^0.10.1", diff --git a/translations/sv.po b/translations/sv.po index 5cdcc7c7ccd..b6a806a327c 100644 --- a/translations/sv.po +++ b/translations/sv.po @@ -6,14 +6,16 @@ # Kristoffer Grundström , 2021, 2023. # tygyh , 2022, 2023. # Hong Phuc Dang , 2023. +# Mario Behling , 2023. msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: open-event@googlegroups.com\n" "POT-Creation-Date: 2019-01-31 16:31+0800\n" -"PO-Revision-Date: 2023-07-04 04:51+0000\n" -"Last-Translator: Anonymous \n" -"Language-Team: Swedish \n" +"PO-Revision-Date: 2023-08-17 17:53+0000\n" +"Last-Translator: Mario Behling \n" +"Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -8508,7 +8510,7 @@ msgstr "Utställningsglas" #: app/templates/components/public/featured-speaker-list.hbs:1:18 msgid "Featured Speakers" -msgstr "Utvalda högtalare" +msgstr "Utvalda talare" #: app/templates/components/public/featured-speaker-list.hbs:10:66 msgid "More Speakers" diff --git a/yarn.lock b/yarn.lock index 0d99d0c2a82..faf81f5a113 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2269,6 +2269,25 @@ ember-cli-version-checker "^5.1.1" semver "^7.3.2" +"@ember/test-waiters@^3": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.0.2.tgz#5b950c580a1891ed1d4ee64f9c6bacf49a15ea6f" + integrity sha512-H8Q3Xy9rlqhDKnQpwt2pzAYDouww4TZIGSI1pZJhM7mQIGufQKuB0ijzn/yugA6Z+bNdjYp1HioP8Y4hn2zazQ== + dependencies: + calculate-cache-key-for-tree "^2.0.0" + ember-cli-babel "^7.26.6" + ember-cli-version-checker "^5.1.2" + semver "^7.3.5" + +"@embroider/addon-shim@^1.0.0", "@embroider/addon-shim@^1.7.1": + version "1.8.6" + resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.8.6.tgz#b676991b4fa32c3a98dc7db7dc6cd655029c3f09" + integrity sha512-siC9kP78uucEbpDcVyxjkwa76pcs5rVzDVpWO4PDc9EAXRX+pzmUuSTLAK3GztUwx7/PWhz1BenAivqdSvSgfg== + dependencies: + "@embroider/shared-internals" "^2.2.3" + broccoli-funnel "^3.0.8" + semver "^7.3.8" + "@embroider/compat@^0.47.0": version "0.47.2" resolved "https://registry.yarnpkg.com/@embroider/compat/-/compat-0.47.2.tgz#1f5710ee0f2cea62cd28fdab6844cca5e43c74e0" @@ -2523,6 +2542,21 @@ semver "^7.3.5" typescript-memoize "^1.0.1" +"@embroider/shared-internals@^2.2.3": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.4.0.tgz#0e9fdb0b2df9bad45fab8c54cbb70d8a2cbf01fc" + integrity sha512-pFE05ebenWMC9XAPRjadYCXXb6VmqjkhYN5uqkhPo+VUmMHnx7sZYYxqGjxfVuhC/ghS/BNlOffOCXDOoE7k7g== + dependencies: + babel-import-util "^2.0.0" + debug "^4.3.2" + ember-rfc176-data "^0.3.17" + fs-extra "^9.1.0" + js-string-escape "^1.0.1" + lodash "^4.17.21" + resolve-package-path "^4.0.1" + semver "^7.3.5" + typescript-memoize "^1.0.1" + "@embroider/util@^0.39.1 || ^0.40.0 || ^0.41.0": version "0.41.0" resolved "https://registry.yarnpkg.com/@embroider/util/-/util-0.41.0.tgz#5324cb4742aa4ed8d613c4f88a466f73e4e6acc1" @@ -4552,6 +4586,11 @@ babel-import-util@^1.2.0, babel-import-util@^1.3.0: resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.3.0.tgz#dc9251ea39a7747bd586c1c13b8d785a42797f8e" integrity sha512-PPzUT17eAI18zn6ek1R3sB4Krc/MbnmT1MkZQFmyhjoaEGBVwNABhfVU9+EKcDSKrrOm9OIpGhjxukx1GCiy1g== +babel-import-util@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-2.0.0.tgz#99a2e7424bcde01898bc61bb19700ff4c74379a3" + integrity sha512-pkWynbLwru0RZmA9iKeQL63+CkkW0RCP3kL5njCtudd6YPUKb5Pa0kL4fb3bmuKn2QDBFwY5mvvhEK/+jv2Ynw== + babel-loader@^8.0.6: version "8.0.6" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb" @@ -8687,6 +8726,13 @@ ember-cookies@^0.5.0, ember-cookies@^0.5.2: ember-cli-babel "^7.1.0" ember-getowner-polyfill "^1.1.0 || ^2.0.0" +ember-cookies@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/ember-cookies/-/ember-cookies-1.0.0.tgz#a48445313ea827ac417b65001aa665f5ff848a47" + integrity sha512-/kugyQInCkELQAdWMX9ud5AGiQrmkDGV16kOBSCRN3I8jCsaU2uzh8bGFyjyTSFc1cTdIO0Rwm9+ImbgHMzjpA== + dependencies: + "@embroider/addon-shim" "^1.7.1" + ember-copy@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-copy/-/ember-copy-1.0.0.tgz#426554ba6cf65920f31d24d0a3ca2cb1be16e4aa" @@ -9212,7 +9258,7 @@ ember-simple-auth-token@^5.3.0: ember-fetch "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0" ember-simple-auth "^1.6.0 || ^2.0.0 || ^3.0.0 || ^4.0.0" -"ember-simple-auth@^1.6.0 || ^2.0.0 || ^3.0.0 || ^4.0.0", ember-simple-auth@^4.2.2: +"ember-simple-auth@^1.6.0 || ^2.0.0 || ^3.0.0 || ^4.0.0": version "4.2.2" resolved "https://registry.yarnpkg.com/ember-simple-auth/-/ember-simple-auth-4.2.2.tgz#5c1de1bb13a75e519e512fb82cba7cc1e277b07c" integrity sha512-D7W6OREUvf5OzeB0ePptSNBilccchRYukH4f7mkbL6WT+z6VEqRRAIaQuBZdFM6lrcSFGmzctINLZJwsIpI3wg== @@ -9226,6 +9272,18 @@ ember-simple-auth-token@^5.3.0: ember-cookies "^0.5.0" silent-error "^1.0.0" +ember-simple-auth@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/ember-simple-auth/-/ember-simple-auth-6.0.0.tgz#7c3e4d0885de3f58c0568056eba03a6434f34084" + integrity sha512-9SzSFApxZ74CD4UxIeTV+poIPeXcRLXWM60cMvC1SwTYjoc/p9DeQF0pVm6m1XV6uA3kPUzEsEn4/GeHc2YX1w== + dependencies: + "@ember/test-waiters" "^3" + "@embroider/addon-shim" "^1.0.0" + "@embroider/macros" "^1.0.0" + ember-cli-is-package-missing "^1.0.0" + ember-cookies "^1.0.0" + silent-error "^1.0.0" + ember-source@3.20.3: version "3.20.3" resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.20.3.tgz#fdc0e8d9a402985783a2c53729f75abbb7b2ac95" @@ -16684,6 +16742,13 @@ semver@^7.0.0, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semve dependencies: lru-cache "^6.0.0" +semver@^7.3.8: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + dependencies: + lru-cache "^6.0.0" + semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"