code refactor

src/lib/i18n.js

@@ -204,80 +204,69 @@ function getCurrencyName(currencyCode, translateFn) {
 }
 
 function getAllMeridiemIndicatorNames(translateFn) {
-    return [
+    const allMeridiemIndicatorNames = [];
-        translateFn('datetime.AM.content'),
+
-        translateFn('datetime.PM.content')
+    for (let i = 0; i < datetimeConstants.allMeridiemIndicatorsArray.length; i++) {
-    ];
+        const indicatorName = datetimeConstants.allMeridiemIndicatorsArray[i];
+        allMeridiemIndicatorNames.push(translateFn(`datetime.${indicatorName}.content`));
+    }
+
+    return allMeridiemIndicatorNames;
 }
 
 function getAllLongMonthNames(translateFn) {
-    return [
+    const allMonthNames = [];
-        translateFn('datetime.January.long'),
+
-        translateFn('datetime.February.long'),
+    for (let i = 0; i < datetimeConstants.allMonthsArray.length; i++) {
-        translateFn('datetime.March.long'),
+        const monthName = datetimeConstants.allMonthsArray[i];
-        translateFn('datetime.April.long'),
+        allMonthNames.push(translateFn(`datetime.${monthName}.long`));
-        translateFn('datetime.May.long'),
+    }
-        translateFn('datetime.June.long'),
+
-        translateFn('datetime.July.long'),
+    return allMonthNames;
-        translateFn('datetime.August.long'),
-        translateFn('datetime.September.long'),
-        translateFn('datetime.October.long'),
-        translateFn('datetime.November.long'),
-        translateFn('datetime.December.long')
-    ];
 }
 
 function getAllShortMonthNames(translateFn) {
-    return [
+    const allMonthNames = [];
-        translateFn('datetime.January.short'),
+
-        translateFn('datetime.February.short'),
+    for (let i = 0; i < datetimeConstants.allMonthsArray.length; i++) {
-        translateFn('datetime.March.short'),
+        const monthName = datetimeConstants.allMonthsArray[i];
-        translateFn('datetime.April.short'),
+        allMonthNames.push(translateFn(`datetime.${monthName}.short`));
-        translateFn('datetime.May.short'),
+    }
-        translateFn('datetime.June.short'),
+
-        translateFn('datetime.July.short'),
+    return allMonthNames;
-        translateFn('datetime.August.short'),
-        translateFn('datetime.September.short'),
-        translateFn('datetime.October.short'),
-        translateFn('datetime.November.short'),
-        translateFn('datetime.December.short')
-    ];
 }
 
 function getAllLongWeekdayNames(translateFn) {
-    return [
+    const allWeekNames = [];
-        translateFn('datetime.Sunday.long'),
+
-        translateFn('datetime.Monday.long'),
+    for (let i = 0; i < datetimeConstants.allWeekDaysArray.length; i++) {
-        translateFn('datetime.Tuesday.long'),
+        const weekDay = datetimeConstants.allWeekDaysArray[i];
-        translateFn('datetime.Wednesday.long'),
+        allWeekNames.push(translateFn(`datetime.${weekDay.name}.long`));
-        translateFn('datetime.Thursday.long'),
+    }
-        translateFn('datetime.Friday.long'),
+
-        translateFn('datetime.Saturday.long')
+    return allWeekNames;
-    ];
 }
 
 function getAllShortWeekdayNames(translateFn) {
-    return [
+    const allWeekNames = [];
-        translateFn('datetime.Sunday.short'),
+
-        translateFn('datetime.Monday.short'),
+    for (let i = 0; i < datetimeConstants.allWeekDaysArray.length; i++) {
-        translateFn('datetime.Tuesday.short'),
+        const weekDay = datetimeConstants.allWeekDaysArray[i];
-        translateFn('datetime.Wednesday.short'),
+        allWeekNames.push(translateFn(`datetime.${weekDay.name}.short`));
-        translateFn('datetime.Thursday.short'),
+    }
-        translateFn('datetime.Friday.short'),
+
-        translateFn('datetime.Saturday.short')
+    return allWeekNames;
-    ];
 }
 
 function getAllMinWeekdayNames(translateFn) {
-    return [
+    const allWeekNames = [];
-        translateFn('datetime.Sunday.min'),
+
-        translateFn('datetime.Monday.min'),
+    for (let i = 0; i < datetimeConstants.allWeekDaysArray.length; i++) {
-        translateFn('datetime.Tuesday.min'),
+        const weekDay = datetimeConstants.allWeekDaysArray[i];
-        translateFn('datetime.Wednesday.min'),
+        allWeekNames.push(translateFn(`datetime.${weekDay.name}.min`));
-        translateFn('datetime.Thursday.min'),
+    }
-        translateFn('datetime.Friday.min'),
+
-        translateFn('datetime.Saturday.min')
+    return allWeekNames;
-    ];
 }
 
 function getAllLongDateFormats(translateFn) {
@@ -300,20 +289,20 @@ function getAllShortTimeFormats(translateFn) {
     return getDateTimeFormats(translateFn, datetimeConstants.allShortTimeFormat, datetimeConstants.allShortTimeFormatArray, 'format.shortTime', defaultShortTimeFormatTypeName, datetimeConstants.defaultShortTimeFormat);
 }
 
-function getMonthShortName(month, translateFn) {
+function getMonthShortName(monthName, translateFn) {
-    return translateFn(`datetime.${month}.short`);
+    return translateFn(`datetime.${monthName}.short`);
 }
 
-function getMonthLongName(month, translateFn) {
+function getMonthLongName(monthName, translateFn) {
-    return translateFn(`datetime.${month}.long`);
+    return translateFn(`datetime.${monthName}.long`);
 }
 
-function getWeekdayShortName(weekDay, translateFn) {
+function getWeekdayShortName(weekDayName, translateFn) {
-    return translateFn(`datetime.${weekDay}.short`);
+    return translateFn(`datetime.${weekDayName}.short`);
 }
 
-function getWeekdayLongName(weekDay, translateFn) {
+function getWeekdayLongName(weekDayName, translateFn) {
-    return translateFn(`datetime.${weekDay}.long`);
+    return translateFn(`datetime.${weekDayName}.long`);
 }
 
 function getI18nLongDateFormat(translateFn, formatTypeValue) {
@@ -1293,12 +1282,13 @@ function setLanguage(i18nGlobal, locale, force) {
         weekdaysMin : getAllMinWeekdayNames(i18nGlobal.t),
         meridiem: function (hours) {
             if (isPM(hours)) {
-                return i18nGlobal.t('datetime.PM.content');
+                return i18nGlobal.t(`datetime.${datetimeConstants.allMeridiemIndicators.PM}.content`);
             } else {
-                return i18nGlobal.t('datetime.AM.content');
+                return i18nGlobal.t(`datetime.${datetimeConstants.allMeridiemIndicators.AM}.content`);
             }
         }
     });
+
     services.setLocale(locale);
     document.querySelector('html').setAttribute('lang', locale);