diff --git a/projects/angular-sdk/CHANGELOG.md b/projects/angular-sdk/CHANGELOG.md
index 529a09f..0760146 100644
--- a/projects/angular-sdk/CHANGELOG.md
+++ b/projects/angular-sdk/CHANGELOG.md
@@ -1,6 +1,12 @@
-
+
-# 6.3.3 (2024-05-06)
+# 6.3.5 (2024-05-21)
+
+- Various improvements in label management.
+
+
+
+# 6.3.4 (2024-05-06)
- Fix for datadog.
diff --git a/projects/angular-sdk/package.json b/projects/angular-sdk/package.json
index 87259e5..6a8b936 100644
--- a/projects/angular-sdk/package.json
+++ b/projects/angular-sdk/package.json
@@ -1,6 +1,6 @@
{
"name": "@hopper-cloud-airlines/angular-sdk",
- "version": "6.3.4",
+ "version": "6.3.5",
"license": "Apache-2.0",
"author": {
"name": "HTS - Airlines Team",
diff --git a/projects/angular-sdk/src/components/cfar-offer-banner-large/cfar-offer-banner-large.component.html b/projects/angular-sdk/src/components/cfar-offer-banner-large/cfar-offer-banner-large.component.html
index 740a50d..01617e5 100644
--- a/projects/angular-sdk/src/components/cfar-offer-banner-large/cfar-offer-banner-large.component.html
+++ b/projects/angular-sdk/src/components/cfar-offer-banner-large/cfar-offer-banner-large.component.html
@@ -141,7 +141,7 @@
: offer?.currency
: 'symbol'
: undefined
- : currentLang)
+ : currentCulturalLang)
}
}}
"
@@ -171,7 +171,7 @@
: offer?.currency
: 'symbol'
: undefined
- : currentLang)
+ : currentCulturalLang)
}
}}"
innerHtml="{{
@@ -184,7 +184,7 @@
: offer?.currency
: 'symbol'
: undefined
- : currentLang)
+ : currentCulturalLang)
}
}}"
>
diff --git a/projects/angular-sdk/src/components/cfar-offer-dialog/cfar-offer-dialog.component.html b/projects/angular-sdk/src/components/cfar-offer-dialog/cfar-offer-dialog.component.html
index 5ad1e24..c5c62b7 100644
--- a/projects/angular-sdk/src/components/cfar-offer-dialog/cfar-offer-dialog.component.html
+++ b/projects/angular-sdk/src/components/cfar-offer-dialog/cfar-offer-dialog.component.html
@@ -96,7 +96,7 @@ {{ 'CFAR_OFFER_DIALOG.TITLE' | translate }}
: offer?.currency
: 'symbol'
: undefined
- : currentLang)
+ : currentCulturalLang)
}
}}
"
@@ -120,7 +120,7 @@ {{ 'CFAR_OFFER_DIALOG.TITLE' | translate }}
: offer?.currency
: 'symbol'
: undefined
- : currentLang)
+ : currentCulturalLang)
}
}}
"
@@ -143,7 +143,7 @@ {{ 'CFAR_OFFER_DIALOG.TITLE' | translate }}
: offer?.currency
: 'symbol'
: undefined
- : currentLang)
+ : currentCulturalLang)
}
}}
"
@@ -168,7 +168,7 @@ {{ 'CFAR_OFFER_DIALOG.TITLE' | translate }}
: offer?.currency
: 'symbol'
: undefined
- : currentLang)
+ : currentCulturalLang)
}
}}"
innerHtml="{{
@@ -181,7 +181,7 @@ {{ 'CFAR_OFFER_DIALOG.TITLE' | translate }}
: offer?.currency
: 'symbol'
: undefined
- : currentLang)
+ : currentCulturalLang)
}
}}"
>
diff --git a/projects/angular-sdk/src/components/global.component.ts b/projects/angular-sdk/src/components/global.component.ts
index f1e8cb5..ecb9442 100644
--- a/projects/angular-sdk/src/components/global.component.ts
+++ b/projects/angular-sdk/src/components/global.component.ts
@@ -41,6 +41,8 @@ export class GlobalComponent implements OnChanges {
@Input() isFakeBackend?: boolean;
@Input() env?: string;
+ public currentCulturalLang!: string;
+
@Output() errorOccurred = new EventEmitter();
public errorCode?: string;
@@ -91,6 +93,8 @@ export class GlobalComponent implements OnChanges {
}
protected _updateLanguage(newLanguage: string): void {
+ this.currentCulturalLang = this._getCulturalLangFromLang(newLanguage);
+
// Set language for components
this._translateService.use(newLanguage);
@@ -393,10 +397,6 @@ export class GlobalComponent implements OnChanges {
return '';
}
- // *********************
- // Errors
- // *********************
-
public handleApiError(error: any, errorEndPoint: string) {
const builtError = this._getHcAirlinesErrorResponse(error);
@@ -454,4 +454,23 @@ export class GlobalComponent implements OnChanges {
});
}
}
+
+ // -----------------------------------------------
+ // Privates Methods
+ // -----------------------------------------------
+
+ private _getCulturalLangFromLang(lang: string): string {
+ let result = 'en_US';
+
+ switch(lang) {
+ case 'fr':
+ result = 'fr_CA';
+ break;
+ case 'zh':
+ result = 'zh_CN';
+ break;
+ }
+
+ return result;
+ }
}
diff --git a/projects/angular-sdk/src/i18n/i18n-schema.ts b/projects/angular-sdk/src/i18n/i18n-schema.ts
index 2adad93..4830a60 100644
--- a/projects/angular-sdk/src/i18n/i18n-schema.ts
+++ b/projects/angular-sdk/src/i18n/i18n-schema.ts
@@ -12,12 +12,9 @@ export const I18N_SCHEMA = {
},
DATE: {
type: 'string',
- },
- HOUR_AND_DATE: {
- type: 'string',
- },
+ }
},
- required: ['HOUR', 'DATE', 'HOUR_AND_DATE'],
+ required: ['HOUR', 'DATE'],
},
BUTTON: {
type: 'object',
diff --git a/projects/angular-sdk/src/i18n/index.ts b/projects/angular-sdk/src/i18n/index.ts
index 6510bca..450c8ed 100644
--- a/projects/angular-sdk/src/i18n/index.ts
+++ b/projects/angular-sdk/src/i18n/index.ts
@@ -1,8 +1,8 @@
// http://www.loc.gov/standards/iso639-2/php/code_list.php
-import * as English from './locales/en.json';
-import * as French from './locales/fr.json';
-import * as Chinese from './locales/zh.json';
+import * as English from './locales/en/common.json';
+import * as French from './locales/fr/common.json';
+import * as Chinese from './locales/zh/common.json';
// Availables Languages
export const Locales: Map = new Map([
diff --git a/projects/angular-sdk/src/i18n/locales/en.json b/projects/angular-sdk/src/i18n/locales/en/common.json
similarity index 94%
rename from projects/angular-sdk/src/i18n/locales/en.json
rename to projects/angular-sdk/src/i18n/locales/en/common.json
index 26e03ff..f5336d3 100644
--- a/projects/angular-sdk/src/i18n/locales/en.json
+++ b/projects/angular-sdk/src/i18n/locales/en/common.json
@@ -2,8 +2,7 @@
"COMMON": {
"DATE_FORMAT": {
"HOUR": "hh:mm a",
- "DATE": "ddMMM",
- "HOUR_AND_DATE": "EEEE, MMMM d, y, h:mm a z"
+ "DATE": "ddMMM"
},
"BUTTON": {
"CLOSE": "Close"
diff --git a/projects/angular-sdk/src/i18n/locales/fr.json b/projects/angular-sdk/src/i18n/locales/fr/common.json
similarity index 95%
rename from projects/angular-sdk/src/i18n/locales/fr.json
rename to projects/angular-sdk/src/i18n/locales/fr/common.json
index ff9e091..b0e2cd2 100644
--- a/projects/angular-sdk/src/i18n/locales/fr.json
+++ b/projects/angular-sdk/src/i18n/locales/fr/common.json
@@ -2,8 +2,7 @@
"COMMON": {
"DATE_FORMAT": {
"HOUR": "hh:mm a",
- "DATE": "ddMMM",
- "HOUR_AND_DATE": "EEEE d MMMM y à H:mm z"
+ "DATE": "ddMMM"
},
"BUTTON": {
"CLOSE": "Fermer"
diff --git a/projects/angular-sdk/src/i18n/locales/zh.json b/projects/angular-sdk/src/i18n/locales/zh/common.json
similarity index 94%
rename from projects/angular-sdk/src/i18n/locales/zh.json
rename to projects/angular-sdk/src/i18n/locales/zh/common.json
index 68a1a47..ed7fa45 100644
--- a/projects/angular-sdk/src/i18n/locales/zh.json
+++ b/projects/angular-sdk/src/i18n/locales/zh/common.json
@@ -2,8 +2,7 @@
"COMMON": {
"DATE_FORMAT": {
"HOUR": "hh:mm a",
- "DATE": "ddMMM",
- "HOUR_AND_DATE": "EEEE, MMMM d, y, h:mm a z"
+ "DATE": "ddMMM"
},
"BUTTON": {
"CLOSE": "关"