Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
push:
branches:
- master
- next
- support-ngx-translate-17
pull_request:
branches:
- master
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"branches": [
"master",
{
"name": "next",
"name": "support-ngx-translate-17",
"prerelease": "next",
"channel": "next"
}
Expand Down
6 changes: 3 additions & 3 deletions projects/stream-chat-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "stream-chat-angular",
"version": "6.1.0",
"version": "6.2.0-next.1",
"description": "Angular components to create chat conversations or livestream style chat",
"author": "GetStream",
"homepage": "https://getstream.io/chat/",
Expand All @@ -20,7 +20,7 @@
"@angular/common": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
"@angular/core": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
"@breezystack/lamejs": "^1.2.7",
"@ngx-translate/core": "^14.0.0 || ^15.0.0 || ^16.0.0",
"@ngx-translate/core": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
"rxjs": "^7.4.0",
"stream-chat": "^9.0.0"
},
Expand All @@ -36,7 +36,7 @@
"dayjs": "^1.11.10",
"emoji-regex": "^10.3.0",
"fix-webm-duration": "^1.0.6",
"ngx-float-ui": "^15.0.0|| ^16.0.0 || ^17.0.0 || ^18.0.0 || ^18.0.1-rc.0 || ^19.0.0",
"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",
"pretty-bytes": "^6.1.1",
"tslib": "^2.3.0",
"uuid": "^9.0.1"
Expand Down
2 changes: 1 addition & 1 deletion projects/stream-chat-angular/src/assets/version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const version = '6.1.0';
export const version = '6.2.0-next.1';
21 changes: 17 additions & 4 deletions projects/stream-chat-angular/src/lib/stream-i18n.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,31 @@ import { en } from '../assets/i18n/en';
providedIn: 'root',
})
export class StreamI18nService {
constructor(private translteService: TranslateService) {}
constructor(private translateService: TranslateService) {}

/**
* Registers the translation to the [ngx-translate](https://github.com/ngx-translate/core) TranslateService.
* @param lang The language key to register the translation to
* @param overrides An object which keys are translation keys, and the values are custom translations
*/
setTranslation(lang = 'en', overrides?: { [key: string]: string }) {
if (!this.translteService.defaultLang) {
this.translteService.defaultLang = lang;
const translateService = this.translateService as TranslateService & {
getFallbackLang?: () => string;
setDefaultLang?: (lang: string) => void;
};

const defaultLang =
'getFallbackLang' in translateService
? translateService.getFallbackLang?.()
: translateService.defaultLang;
if (!defaultLang) {
if (typeof translateService.setDefaultLang !== 'undefined') {
translateService.setDefaultLang(lang);
} else {
translateService.defaultLang = lang;
}
}
this.translteService.setTranslation(
this.translateService.setTranslation(
lang,
{ streamChat: { ...en.streamChat, ...overrides } },
true
Expand Down