Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-01-06 21:42:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: utilize null coalescing

Browse Source
This commit is contained in:
Rainer Killinger
2020-10-30 16:34:28 +01:00
parent 15ae5e0873
commit 4865f911d1
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/translator.ts
View File

@@ -224,9 +224,7 @@ export class SCThingTranslator {
*/
public translatedPropertyNames<T extends SCThing>(type: SCThingType,
language?: keyof SCTranslations<T>): T | undefined {
const targetLanguage = (typeof language !== 'undefined') ? language : this.language;
return this.getAllMetaFieldTranslations(type, targetLanguage) as T;
return this.getAllMetaFieldTranslations(type, language ?? this.language) as T;
}
/**
@@ -246,7 +244,7 @@ export class SCThingTranslator {
language?: keyof SCTranslations<T>): string | undefined {
const fieldTranslation = this.getMetaClassInstance(type).fieldValueTranslations[language ?? this.language]?.[field];
return fieldTranslation?.[key ?? ''] ?? fieldTranslation ?? key;
return fieldTranslation?.[key ?? ''] ?? key ?? fieldTranslation;
}
/**