Skip to content

Commit 5e273a8

Browse files
committed
feat: support for ngx-translate@17 and ngx-float-ui@20
1 parent 0a35959 commit 5e273a8

File tree

4 files changed

+21
-8
lines changed

4 files changed

+21
-8
lines changed

.github/workflows/workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
branches:
55
- master
6-
- next
6+
- support-ngx-translate-17
77
pull_request:
88
branches:
99
- master

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"branches": [
5151
"master",
5252
{
53-
"name": "next",
53+
"name": "support-ngx-translate-17",
5454
"prerelease": "next",
5555
"channel": "next"
5656
}

projects/stream-chat-angular/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@angular/common": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
2121
"@angular/core": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
2222
"@breezystack/lamejs": "^1.2.7",
23-
"@ngx-translate/core": "^14.0.0 || ^15.0.0 || ^16.0.0",
23+
"@ngx-translate/core": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
2424
"rxjs": "^7.4.0",
2525
"stream-chat": "^9.0.0"
2626
},
@@ -36,7 +36,7 @@
3636
"dayjs": "^1.11.10",
3737
"emoji-regex": "^10.3.0",
3838
"fix-webm-duration": "^1.0.6",
39-
"ngx-float-ui": "^15.0.0|| ^16.0.0 || ^17.0.0 || ^18.0.0 || ^18.0.1-rc.0 || ^19.0.0",
39+
"ngx-float-ui": "^15.0.0|| ^16.0.0 || ^17.0.0 || ^18.0.0 || ^18.0.1-rc.0 || ^19.0.0 || ^12.0.0",
4040
"pretty-bytes": "^6.1.1",
4141
"tslib": "^2.3.0",
4242
"uuid": "^9.0.1"

projects/stream-chat-angular/src/lib/stream-i18n.service.ts

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,31 @@ import { en } from '../assets/i18n/en';
99
providedIn: 'root',
1010
})
1111
export class StreamI18nService {
12-
constructor(private translteService: TranslateService) {}
12+
constructor(private translateService: TranslateService) {}
1313

1414
/**
1515
* Registers the translation to the [ngx-translate](https://github.com/ngx-translate/core) TranslateService.
1616
* @param lang The language key to register the translation to
1717
* @param overrides An object which keys are translation keys, and the values are custom translations
1818
*/
1919
setTranslation(lang = 'en', overrides?: { [key: string]: string }) {
20-
if (!this.translteService.defaultLang) {
21-
this.translteService.defaultLang = lang;
20+
const translateService = this.translateService as TranslateService & {
21+
getFallbackLang?: () => string;
22+
setDefaultLang?: (lang: string) => void;
23+
};
24+
25+
const defaultLang =
26+
'getFallbackLang' in translateService
27+
? translateService.getFallbackLang?.()
28+
: translateService.defaultLang;
29+
if (!defaultLang) {
30+
if (typeof translateService.setDefaultLang !== 'undefined') {
31+
translateService.setDefaultLang(lang);
32+
} else {
33+
translateService.defaultLang = lang;
34+
}
2235
}
23-
this.translteService.setTranslation(
36+
this.translateService.setTranslation(
2437
lang,
2538
{ streamChat: { ...en.streamChat, ...overrides } },
2639
true

0 commit comments

Comments
 (0)