ececf5e0-58f2-4355-b4ec-d21a042dd568

Committed 18 Nov 2024 05:40AM UTC coverage: 90.347% (-0.005%) from 90.352%

Build # ececf5e0-58f2-4355-b4ec-d21a042dd568

Build Type

Pull #3242

circleci

Committed by

minlovehua

Commit Message

feat(i18n): i18n design and review #TINFR-916

Pull Request Pull Request #3242: feat(i18n): i18n design and review #TINFR-916

Run Details

5522 of 6760 branches covered (81.69%)

Branch coverage included in aggregate %.

32 of 35 new or added lines in 10 files covered. (91.43%)

20 existing lines in 3 files now uncovered.

13196 of 13958 relevant lines covered (94.54%)

996.5 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

76.47

/src/i18n/i18n.service.ts

import { inject, Injectable, signal, Signal, WritableSignal } from '@angular/core';
import { THY_I18N_EN_US, THY_I18N_LOCALE_ID, THY_I18N_ZH_CN, ThyI18nLocale, zhCnLocale, enUsLocale } from './index';

function normalizeLocale(localeId: string): string {
    return localeId?.toLowerCase().replace(/_/g, '-');
}

@Injectable({
    providedIn: 'root'
})
export class ThyI18nService {
    private locales: { [id: string]: ThyI18nLocale } = {
        'zh-cn': inject(THY_I18N_ZH_CN, { optional: true }) || zhCnLocale,
        'en-us': inject(THY_I18N_EN_US, { optional: true }) || enUsLocale
    };

    private defaultLocaleId: string = normalizeLocale(inject(THY_I18N_LOCALE_ID, { optional: true })) || 'zh-cn';

    private locale: WritableSignal<ThyI18nLocale> = signal(this.locales[this.defaultLocaleId]);

    /**
     * 设置语言，支持传入 zh-cn(或zh-CN)、 en-us(或en-US)
     * @param id
     */
    setLocale(id: string) {
        const localeId = normalizeLocale(id);
        this.locale.set(this.locales[localeId] || this.locales[this.defaultLocaleId]);
    }

    /**
     * 获取当前语言
     */
    getLocale(): Signal<ThyI18nLocale> {
        return this.locale;
    }
}

1	import { inject, Injectable, signal, Signal, WritableSignal } from '@angular/core';
2	import { THY_I18N_EN_US, THY_I18N_LOCALE_ID, THY_I18N_ZH_CN, ThyI18nLocale, zhCnLocale, enUsLocale } from './index';
3
4	function normalizeLocale(localeId: string): string {
5	return localeId?.toLowerCase().replace(/_/g, '-');	241✔
6	}
7		1✔
8	@Injectable({
9	providedIn: 'root'	241✔
10	})	482✔
11	export class ThyI18nService {	482✔
12	private locales: { [id: string]: ThyI18nLocale } = {
13	'zh-cn': inject(THY_I18N_ZH_CN, { optional: true }) \|\| zhCnLocale,	241✔
14	'en-us': inject(THY_I18N_EN_US, { optional: true }) \|\| enUsLocale	241✔
15	};
16
17	private defaultLocaleId: string = normalizeLocale(inject(THY_I18N_LOCALE_ID, { optional: true })) \|\| 'zh-cn';
18
19	private locale: WritableSignal<ThyI18nLocale> = signal(this.locales[this.defaultLocaleId]);
20
NEW 21	/**	×
NEW 22	* 设置语言，支持传入 zh-cn(或zh-CN)、 en-us(或en-US)	×
23	* @param id
24	*/
25	setLocale(id: string) {
26	const localeId = normalizeLocale(id);
27	this.locale.set(this.locales[localeId] \|\| this.locales[this.defaultLocaleId]);
28	}	935✔
29
30	/**
31	* 获取当前语言	1✔
32	*/
33	getLocale(): Signal<ThyI18nLocale> {
34	return this.locale;
35	}
36	}

atinc / ngx-tethys / ececf5e0-58f2-4355-b4ec-d21a042dd568

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous