=lang: fix language Core & Admin

packages/admin-web-angular/src/app/@shared/product/categories/forms/basic-info/basic-info-form.component.ts

@@ -53,7 +53,7 @@ export class BasicInfoFormComponent implements OnInit, AfterViewInit {
 	constructor(
 		private readonly fb: FormBuilder,
 		private readonly _langTranslateService: TranslateService
-	) {}
+	) { }
 
 	get image() {
 		return this.form.get('image');
@@ -77,20 +77,11 @@ export class BasicInfoFormComponent implements OnInit, AfterViewInit {
 			case 'en-US':
 				return 'en-US';
 
-			case 'bg-BG':
-				return 'bg-BG';
-
-			case 'he-IL':
-				return 'he-IL';
-
-			case 'ru-RU':
-				return 'ru-RU';
-
-			case 'es-ES':
-				return 'es-ES';
+			case 'fr-FR':
+				return 'fr-FR';
 
 			default:
-				return 'en-US';
+				return 'fr-FR';
 		}
 	}
 
@@ -113,9 +104,9 @@ export class BasicInfoFormComponent implements OnInit, AfterViewInit {
 			({ locale, value }) => {
 				return locale === usedLanguage
 					? {
-							locale: usedLanguage,
-							value: this.name.value,
-					  }
+						locale: usedLanguage,
+						value: this.name.value,
+					}
 					: { locale, value };
 			}
 		);

packages/admin-web-angular/src/app/@theme/components/theme-settings/theme-settings.component.ts

@@ -19,20 +19,8 @@ export class ThemeSettingsComponent {
 			name: 'English',
 		},
 		{
-			value: 'bg-BG',
-			name: 'Bulgarian',
-		},
-		{
-			value: 'he-IL',
-			name: 'Hebrew',
-		},
-		{
-			value: 'ru-RU',
-			name: 'Russian',
-		},
-		{
-			value: 'es-ES',
-			name: 'Spanish',
+			value: 'fr-FR',
+			name: 'Francais',
 		},
 	];
 
@@ -64,7 +52,7 @@ export class ThemeSettingsComponent {
 	];
 
 	currentTheme = 'everlight';
-	defaultLanguage = '';
+	defaultLanguage = 'fr-FR';
 
 	constructor(
 		protected stateService: StateService,
@@ -73,17 +61,17 @@ export class ThemeSettingsComponent {
 	) {
 		this.defaultLanguage = environment['DEFAULT_LANGUAGE'];
 
-		translate.addLangs(['en-US', 'bg-BG', 'he-IL', 'ru-RU', 'es-ES']);
-		translate.setDefaultLang('en-US');
+		translate.addLangs(['en-US', 'fr-FR']);
+		translate.setDefaultLang('fr-FR');
 
 		const browserLang = translate.getBrowserLang();
 		if (this.defaultLanguage) {
 			translate.use(this.defaultLanguage);
 		} else {
 			translate.use(
-				browserLang.match(/en-US|bg-BG|he-IL|ru-RU|es-ES/)
+				browserLang.match(/en-US|fr-FR/)
 					? browserLang
-					: 'en-US'
+					: 'fr-FR'
 			);
 		}
 

packages/admin-web-angular/src/app/pages/+products/+product/product.component.ts

@@ -62,14 +62,8 @@ export class ProductComponent implements OnInit, OnDestroy {
 		switch (langAbbreviation) {
 			case 'en-US':
 				return 'English';
-			case 'bg-BG':
-				return 'Български';
-			case 'he-IL':
-				return 'עברית';
-			case 'ru-RU':
-				return 'Русский';
-			case 'es-ES':
-				return 'Spanish';
+			case 'fr-FR':
+				return 'Francais';
 		}
 	}
 

packages/admin-web-angular/src/app/pages/+server-down/server-down.page.ts

@@ -22,7 +22,7 @@ export class ServerDownPage implements OnDestroy {
 		private serverConnectionService: ServerConnectionService
 	) {
 		const browserLang = translate.getBrowserLang();
-		translate.use(browserLang.match(/en|bg|he|ru/) ? browserLang : 'en-US');
+		translate.use(browserLang.match(/en|fr/) ? browserLang : 'fr-FR');
 
 		this.noInternetLogo = environment['NO_INTERNET_LOGO'];
 		this.testConnection();

packages/common-angular/src/locale/product-locales.service.ts

@@ -20,7 +20,7 @@ export class ProductLocalesService {
 
 	public currentLocale: string;
 
-	constructor(private readonly _translateService: TranslateService) {}
+	constructor(private readonly _translateService: TranslateService) { }
 
 	public get isServiceStateValid() {
 		return (
@@ -103,16 +103,8 @@ export class ProductLocalesService {
 			case 'en-US':
 				translateLang = 'en-US';
 				break;
-			case 'he-IL':
-				translateLang = 'he-IL';
-				break;
-			case 'ru-RU':
-				translateLang = 'ru-RU';
-				break;
-			case 'bg-BG':
-				translateLang = 'bg-BG';
-			case 'es-ES':
-				translateLang = 'es-ES';
+			case 'fr-FR':
+				translateLang = 'fr-FR';
 				break;
 		}
 		return translateLang;

packages/common/src/consts/consts.ts

@@ -3,9 +3,7 @@ export class Consts {
 	static get langAbbreviations() {
 		return {
 			en: 'en',
-			bg: 'bg',
-			he: 'he',
-			ru: 'ru',
+			fr: 'fr',
 		};
 	}
 }

packages/common/src/entities/Currency.ts

@@ -39,4 +39,5 @@ export const countriesDefaultCurrencies = {
 	RU: 'RUB',
 	US: 'USD',
 	BG: 'BGN',
+	CM: 'XAF',
 };

packages/common/src/entities/Order.ts

@@ -312,14 +312,8 @@ class Order extends DBObject<IOrder, IOrderCreateObject> implements IOrder {
 		switch (language) {
 			case 'en-US':
 				return this._getStatusTextEnglish();
-			case 'he-IL':
-				return this._getStatusTextHebrew();
-			case 'ru-RU':
-				return this._getStatusTextRussian();
-			case 'bg-BG':
-				return this._getStatusTextBulgarian();
-			case 'es-ES':
-				return this._getStatusTextSpanish();
+			case 'fr-FR':
+				return this._getStatusTextFrench();
 			default:
 				return 'BAD_STATUS';
 		}
@@ -380,85 +374,26 @@ class Order extends DBObject<IOrder, IOrderCreateObject> implements IOrder {
 		}
 	}
 
-	private _getStatusTextBulgarian(): string {
+	private _getStatusTextFrench(): string {
 		switch (this.status) {
 			case OrderStatus.WarehousePreparation:
-				return 'Подготовка';
-			case OrderStatus.InDelivery:
-				return 'Доставя се';
-			case OrderStatus.Delivered:
-				return 'Доставено';
-			case OrderStatus.CanceledWhileWarehousePreparation:
-			case OrderStatus.CanceledWhileInDelivery:
-				return 'Отказана';
-			case OrderStatus.WarehouseIssue:
-				return 'Проблем при подготовката';
-			case OrderStatus.CarrierIssue:
-				return 'Проблем при доставката';
-			default:
-				return 'Проблем с поръчката';
-		}
-	}
-
-	private _getStatusTextHebrew(): string {
-		switch (this.status) {
-			case OrderStatus.WarehousePreparation:
-				return 'בהכנה';
-			case OrderStatus.InDelivery:
-				return 'במשלוח';
-			case OrderStatus.Delivered:
-				return 'הסתיים בצלחה';
-			case OrderStatus.CanceledWhileWarehousePreparation:
-			case OrderStatus.CanceledWhileInDelivery:
-				return 'התבטל';
-			case OrderStatus.WarehouseIssue:
-				return 'בעייה בהכנה';
-			case OrderStatus.CarrierIssue:
-				return 'בעייה במשלוח';
-			default:
-				return 'BAD_STATUS';
-		}
-	}
-
-	private _getStatusTextRussian(): string {
-		switch (this.status) {
-			case OrderStatus.WarehousePreparation:
-				return 'В подготовке';
+				return 'Preparation';
 			case OrderStatus.InDelivery:
-				return 'В доставки';
+				return 'In Delivery';
 			case OrderStatus.Delivered:
-				return 'Доставлено';
+				return 'Delivered';
 			case OrderStatus.CanceledWhileWarehousePreparation:
 			case OrderStatus.CanceledWhileInDelivery:
-				return 'Отменено';
+				return 'Cancelled';
 			case OrderStatus.WarehouseIssue:
-				return 'Проблема с подготовкой';
+				return 'Preparation Issue';
 			case OrderStatus.CarrierIssue:
-				return 'Проблема с доставкой';
+				return 'Delivery Issue';
 			default:
 				return 'BAD_STATUS';
 		}
 	}
 
-	private _getStatusTextSpanish() {
-		switch (this.status) {
-			case OrderStatus.WarehousePreparation:
-				return 'Preparación';
-			case OrderStatus.InDelivery:
-				return 'En la entrega';
-			case OrderStatus.Delivered:
-				return 'Entregado';
-			case OrderStatus.CanceledWhileWarehousePreparation:
-			case OrderStatus.CanceledWhileInDelivery:
-				return 'Cancelado';
-			case OrderStatus.WarehouseIssue:
-				return 'Problema de preparación';
-			case OrderStatus.CarrierIssue:
-				return 'Problema de envio';
-			default:
-				return 'BAD_STATUS';
-		}
-	}
 }
 
 export default Order;

packages/core/res/views/about_us_fr.hbs

@@ -0,0 +1 @@
+{{> about_us/fr-FR }}

packages/core/res/views/privacy_fr.hbs

@@ -0,0 +1 @@
+{{> privacy/fr-FR }}

packages/core/res/views/terms_of_use_fr.hbs

@@ -0,0 +1 @@
+{{> terms_of_use/fr-FR }}

packages/core/src/graphql/devices/devices.types.graphql

@@ -54,8 +54,6 @@ type Subscription {
 }
 
 enum Language {
-	he_IL
 	en_US
-	ru_RU
-	bg_BG
+	fr_FR
 }

packages/core/src/services/services.app.ts

@@ -151,8 +151,8 @@ export class ServicesApp {
 				this.db.close(() => {
 					this.log.info(
 						'Mongoose default connection with DB :' +
-							this.db_server +
-							' is disconnected through app termination'
+						this.db_server +
+						' is disconnected through app termination'
 					);
 					process.exit(0);
 				});
@@ -199,16 +199,16 @@ export class ServicesApp {
 		this.db.on('disconnected', () => {
 			this.log.warn(
 				'Mongoose default connection to DB :' +
-					this.db_server +
-					' disconnected'
+				this.db_server +
+				' disconnected'
 			);
 		});
 
 		this.db.on('connected', () => {
 			this.log.info(
 				'Mongoose default connection to DB :' +
-					this.db_server +
-					' connected'
+				this.db_server +
+				' connected'
 			);
 		});
 	}
@@ -570,40 +570,24 @@ export class ServicesApp {
 			res.render('about_us_en');
 		});
 
-		this.expressApp.get('/he/about', function (req, res) {
-			res.render('about_us_he');
-		});
-
-		this.expressApp.get('/ru/about', function (req, res) {
-			res.render('about_us_ru');
+		this.expressApp.get('/fr/about', function (req, res) {
+			res.render('about_us_fr');
 		});
 
 		this.expressApp.get('/en/privacy', function (req, res) {
 			res.render('privacy_en');
 		});
 
-		this.expressApp.get('/he/privacy', function (req, res) {
-			res.render('privacy_he');
-		});
-
-		this.expressApp.get('/ru/privacy', function (req, res) {
-			res.render('privacy_ru');
+		this.expressApp.get('/fr/privacy', function (req, res) {
+			res.render('privacy_fr');
 		});
 
 		this.expressApp.get('/en/terms', function (req, res) {
 			res.render('terms_of_use_en');
 		});
 
-		this.expressApp.get('/he/terms', function (req, res) {
-			res.render('terms_of_use_he');
-		});
-
-		this.expressApp.get('/ru/terms', function (req, res) {
-			res.render('terms_of_use_ru');
-		});
-
-		this.expressApp.get('/bg/terms', function (req, res) {
-			res.render('terms_of_use_bg');
+		this.expressApp.get('/fr/terms', function (req, res) {
+			res.render('terms_of_use_fr');
 		});
 	}
 

packages/core/src/services/users/UsersService.ts

@@ -91,8 +91,8 @@ export class UsersService extends DBService<User>
 			['aboutUs', 'privacy', 'termsOfUse'],
 			_.map(['about_us', 'privacy', 'terms_of_use'], (folder) =>
 				_.zipObject(
-					['en-US', 'he-IL', 'ru-RU', 'bg-BG'],
-					_.map(['en-US', 'he-IL', 'ru-RU', 'bg-BG'], (language) =>
+					['en-US', 'fr-FR'],
+					_.map(['en-US', 'fr-FR'], (language) =>
 						observeFile(
 							`${__dirname}/../../../../res/templates/${folder}/${language}.hbs`
 						).pipe(