6fa42ba7-aaa6-41f2-87d3-be3e6cbe04c2

Committed 18 Nov 2024 01:42AM UTC coverage: 90.353% (+0.001%) from 90.352%

Build # 6fa42ba7-aaa6-41f2-87d3-be3e6cbe04c2

Build Type

Pull #3241

circleci

Committed by

minlovehua

Commit Message

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

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

Run Details

5521 of 6758 branches covered (81.7%)

Branch coverage included in aggregate %.

27 of 29 new or added lines in 10 files covered. (93.1%)

19 existing lines in 2 files now uncovered.

13192 of 13953 relevant lines covered (94.55%)

996.71 hits per line

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

75.0

/src/i18n/i18n.service.ts

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

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';

    /**
     * 当前语言包
     */
    locale: ThyI18nLocale = this.locales[this.defaultLocaleId];

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

1	import { inject, Injectable } from '@angular/core';
2	import { THY_I18N_EN_US, THY_I18N_LOCALE_ID, THY_I18N_ZH_CN, ThyI18nLocale, zhCnLocale, enUsLocale } from '.';
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
15	};
16
17	private defaultLocaleId: string = normalizeLocale(inject(THY_I18N_LOCALE_ID, { optional: true })) \|\| 'zh-cn';	241✔
18
19	/**
20	* 当前语言包
21	*/
22	locale: ThyI18nLocale = this.locales[this.defaultLocaleId];
23
NEW 24	/**	×
NEW 25	* 设置语言	×
26	* @param id 可以传入 zh-cn(或zh-CN)、 en-us(或en-US)
27	*/
28	setLocale(id: string) {	1✔
29	const localeId = normalizeLocale(id);
30	this.locale = this.locales[localeId] \|\| this.locales[this.defaultLocaleId];
31	}
32	}

atinc / ngx-tethys / 6fa42ba7-aaa6-41f2-87d3-be3e6cbe04c2

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