fix(ui5-li-notification-group, ui5-li-notification): fix i18n bundles usage (#3063)

fifoosid · web-flow · commit d6b6fa4095df · 2021-03-31T16:18:41.000+03:00
diff --git a/packages/fiori/src/NotificationListGroupItem.js b/packages/fiori/src/NotificationListGroupItem.js
@@ -167,32 +167,32 @@ class NotificationListGroupItem extends NotificationListItemBase {
 	}
 
 	get overflowBtnAccessibleName() {
-		return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_OVERLOW_BTN_TITLE);
+		return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_OVERLOW_BTN_TITLE);
 	}
 
 	get closeBtnAccessibleName() {
-		return this.i18nBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_CLOSE_BTN_TITLE);
+		return this.i18nFioriBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_CLOSE_BTN_TITLE);
 	}
 
 	get toggleBtnAccessibleName() {
 		if (this.collapsed) {
-			return this.i18nBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_TOGGLE_BTN_EXPAND_TITLE);
+			return this.i18nFioriBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_TOGGLE_BTN_EXPAND_TITLE);
 		}
 
-		return this.i18nBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_TOGGLE_BTN_COLLAPSE_TITLE);
+		return this.i18nFioriBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_TOGGLE_BTN_COLLAPSE_TITLE);
 	}
 
 	get priorityText() {
 		if (this.priority === Priority.High) {
-			return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_HIGH_PRIORITY_TXT);
+			return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_HIGH_PRIORITY_TXT);
 		}
 
 		if (this.priority === Priority.Medium) {
-			return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_MEDIUM_PRIORITY_TXT);
+			return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_MEDIUM_PRIORITY_TXT);
 		}
 
 		if (this.priority === Priority.Low) {
-			return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_LOW_PRIORITY_TXT);
+			return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_LOW_PRIORITY_TXT);
 		}
 
 		return "";
@@ -204,18 +204,18 @@ class NotificationListGroupItem extends NotificationListItemBase {
 
 	get readText() {
 		if (this.read) {
-			return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_READ);
+			return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_READ);
 		}
 
-		return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_UNREAD);
+		return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_UNREAD);
 	}
 
 	get groupText() {
-		return this.i18nBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_TXT);
+		return this.i18nFioriBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_TXT);
 	}
 
 	get counterText() {
-		const text = this.i18nBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_COUNTER_TXT);
+		const text = this.i18nFioriBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_COUNTER_TXT);
 		return this.showCounter ? `${text} ${this.itemsCount}` : "";
 	}
 
diff --git a/packages/fiori/src/NotificationListItem.js b/packages/fiori/src/NotificationListItem.js
@@ -222,18 +222,18 @@ class NotificationListItem extends NotificationListItemBase {
 
 	get showMoreText() {
 		if (this._showMorePressed) {
-			return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_SHOW_LESS);
+			return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_SHOW_LESS);
 		}
 
-		return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_SHOW_MORE);
+		return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_SHOW_MORE);
 	}
 
 	get overflowBtnAccessibleName() {
-		return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_OVERLOW_BTN_TITLE);
+		return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_OVERLOW_BTN_TITLE);
 	}
 
 	get closeBtnAccessibleName() {
-		return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_CLOSE_BTN_TITLE);
+		return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_CLOSE_BTN_TITLE);
 	}
 
 	get hideShowMore() {
@@ -319,23 +319,23 @@ class NotificationListItem extends NotificationListItemBase {
 
 	get priorityText() {
 		if (this.priority === Priority.High) {
-			return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_HIGH_PRIORITY_TXT);
+			return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_HIGH_PRIORITY_TXT);
 		}
 
 		if (this.priority === Priority.Medium) {
-			return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_MEDIUM_PRIORITY_TXT);
+			return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_MEDIUM_PRIORITY_TXT);
 		}
 
 		if (this.priority === Priority.Low) {
-			return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_LOW_PRIORITY_TXT);
+			return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_LOW_PRIORITY_TXT);
 		}
 
 		return "";
 	}
 
 	get accInvisibleText() {
-		const notifcationTxt = this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_TXT);
-		const readTxt = this.read ? this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_READ) : this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_UNREAD);
+		const notifcationTxt = this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_TXT);
+		const readTxt = this.read ? this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_READ) : this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_UNREAD);
 		const priorityText = this.priorityText;
 
 		return `${notifcationTxt} ${readTxt} ${priorityText}`;
diff --git a/packages/fiori/src/NotificationListItemBase.js b/packages/fiori/src/NotificationListItemBase.js
@@ -124,7 +124,7 @@ class NotificationListItemBase extends ListItemBase {
 	constructor() {
 		super();
 
-		this.i18nBundle = getI18nBundle("@ui5/webcomponents-fiori");
+		this.i18nFioriBundle = getI18nBundle("@ui5/webcomponents-fiori");
 	}
 
 	static get metadata() {

Original file line number	Diff line number	Diff line change
`@@ -167,32 +167,32 @@ class NotificationListGroupItem extends NotificationListItemBase {`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`get overflowBtnAccessibleName() {`
`170`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_OVERLOW_BTN_TITLE);`
	`170`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_OVERLOW_BTN_TITLE);`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`get closeBtnAccessibleName() {`
`174`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_CLOSE_BTN_TITLE);`
	`174`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_CLOSE_BTN_TITLE);`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`get toggleBtnAccessibleName() {`
`178`	`178`	`if (this.collapsed) {`
`179`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_TOGGLE_BTN_EXPAND_TITLE);`
	`179`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_TOGGLE_BTN_EXPAND_TITLE);`
`180`	`180`	`}`
`181`	`181`
`182`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_TOGGLE_BTN_COLLAPSE_TITLE);`
	`182`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_TOGGLE_BTN_COLLAPSE_TITLE);`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`get priorityText() {`
`186`	`186`	`if (this.priority === Priority.High) {`
`187`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_HIGH_PRIORITY_TXT);`
	`187`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_HIGH_PRIORITY_TXT);`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`if (this.priority === Priority.Medium) {`
`191`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_MEDIUM_PRIORITY_TXT);`
	`191`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_MEDIUM_PRIORITY_TXT);`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`if (this.priority === Priority.Low) {`
`195`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_LOW_PRIORITY_TXT);`
	`195`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_LOW_PRIORITY_TXT);`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`return "";`
`@@ -204,18 +204,18 @@ class NotificationListGroupItem extends NotificationListItemBase {`
`204`	`204`
`205`	`205`	`get readText() {`
`206`	`206`	`if (this.read) {`
`207`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_READ);`
	`207`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_READ);`
`208`	`208`	`}`
`209`	`209`
`210`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_UNREAD);`
	`210`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_UNREAD);`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`get groupText() {`
`214`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_TXT);`
	`214`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_TXT);`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`get counterText() {`
`218`		`- const text = this.i18nBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_COUNTER_TXT);`
	`218`	`+ const text = this.i18nFioriBundle.getText(NOTIFICATION_LIST_GROUP_ITEM_COUNTER_TXT);`
`219`	`219`	return this.showCounter ? `${text} ${this.itemsCount}` : "";
`220`	`220`	`}`
`221`	`221`
Original file line number	Diff line number	Diff line change
`@@ -222,18 +222,18 @@ class NotificationListItem extends NotificationListItemBase {`
`222`	`222`
`223`	`223`	`get showMoreText() {`
`224`	`224`	`if (this._showMorePressed) {`
`225`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_SHOW_LESS);`
	`225`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_SHOW_LESS);`
`226`	`226`	`}`
`227`	`227`
`228`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_SHOW_MORE);`
	`228`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_SHOW_MORE);`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`get overflowBtnAccessibleName() {`
`232`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_OVERLOW_BTN_TITLE);`
	`232`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_OVERLOW_BTN_TITLE);`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`get closeBtnAccessibleName() {`
`236`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_CLOSE_BTN_TITLE);`
	`236`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_CLOSE_BTN_TITLE);`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`get hideShowMore() {`
`@@ -319,23 +319,23 @@ class NotificationListItem extends NotificationListItemBase {`
`319`	`319`
`320`	`320`	`get priorityText() {`
`321`	`321`	`if (this.priority === Priority.High) {`
`322`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_HIGH_PRIORITY_TXT);`
	`322`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_HIGH_PRIORITY_TXT);`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`if (this.priority === Priority.Medium) {`
`326`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_MEDIUM_PRIORITY_TXT);`
	`326`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_MEDIUM_PRIORITY_TXT);`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`if (this.priority === Priority.Low) {`
`330`		`- return this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_LOW_PRIORITY_TXT);`
	`330`	`+ return this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_LOW_PRIORITY_TXT);`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`return "";`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`get accInvisibleText() {`
`337`		`- const notifcationTxt = this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_TXT);`
`338`		`- const readTxt = this.read ? this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_READ) : this.i18nBundle.getText(NOTIFICATION_LIST_ITEM_UNREAD);`
	`337`	`+ const notifcationTxt = this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_TXT);`
	`338`	`+ const readTxt = this.read ? this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_READ) : this.i18nFioriBundle.getText(NOTIFICATION_LIST_ITEM_UNREAD);`
`339`	`339`	`const priorityText = this.priorityText;`
`340`	`340`
`341`	`341`	return `${notifcationTxt} ${readTxt} ${priorityText}`;
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ class NotificationListItemBase extends ListItemBase {`
`124`	`124`	`constructor() {`
`125`	`125`	`super();`
`126`	`126`
`127`		`- this.i18nBundle = getI18nBundle("@ui5/webcomponents-fiori");`
	`127`	`+ this.i18nFioriBundle = getI18nBundle("@ui5/webcomponents-fiori");`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`static get metadata() {`