feat: Languages with country codes

client/src/i18n.js

@@ -58,9 +58,9 @@ i18n
   .use(initReactI18next)
   .init({
     resources: embeddedLocales,
-    fallbackLng: 'en',
+    fallbackLng: 'en-US',
     supportedLngs: languages,
-    load: 'languageOnly',
+    load: 'currentOnly',
     interpolation: {
       escapeValue: false,
       format(value, format, language) {
@@ -80,7 +80,7 @@ i18n
   });
 
 i18n.loadCoreLocale = async (language = i18n.resolvedLanguage) => {
-  if (language === 'en') {
+  if (language === i18n.options.fallbackLng[0]) {
     return;
   }
 

client/src/locales/bg-BG/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'bg',
+  language: 'bg-BG',
   country: 'bg',
   name: 'Български',
   embeddedLocale: login,

client/src/locales/cs-CZ/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'cs',
+  language: 'cs-CZ',
   country: 'cz',
   name: 'Čeština',
   embeddedLocale: login,

client/src/locales/da-DK/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'da',
+  language: 'da-DK',
   country: 'dk',
   name: 'Dansk',
   embeddedLocale: login,

client/src/locales/de-DE/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'de',
+  language: 'de-DE',
   country: 'de',
   name: 'Deutsch',
   embeddedLocale: login,

client/src/locales/en-US/index.js

@@ -4,8 +4,8 @@ import login from './login';
 import core from './core';
 
 export default {
-  language: 'en',
-  country: 'gb',
+  language: 'en-US',
+  country: 'us',
   name: 'English',
   embeddedLocale: merge(login, core),
 };

client/src/locales/es-ES/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'es',
+  language: 'es-ES',
   country: 'es',
   name: 'Español',
   embeddedLocale: login,

client/src/locales/fa-IR/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'fa',
+  language: 'fa-IR',
   country: 'ir',
   name: 'فارسی',
   embeddedLocale: login,

client/src/locales/fr-FR/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'fr',
+  language: 'fr-FR',
   country: 'fr',
   name: 'Français',
   embeddedLocale: login,

client/src/locales/hu-HU/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'hu',
+  language: 'hu-HU',
   country: 'hu',
   name: 'Magyar',
   embeddedLocale: login,

client/src/locales/id-ID/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'id',
+  language: 'id-ID',
   country: 'id',
   name: 'Bahasa Indonesia',
   embeddedLocale: login,

client/src/locales/index.js

@@ -1,53 +1,53 @@
-import bg from './bg';
-import cs from './cs';
-import da from './da';
-import de from './de';
-import en from './en';
-import es from './es';
-import fa from './fa';
-import fr from './fr';
-import hu from './hu';
-import id from './id';
-import it from './it';
-import ja from './ja';
-import ko from './ko';
-import nl from './nl';
-import pl from './pl';
-import pt from './pt';
-import ro from './ro';
-import ru from './ru';
-import sk from './sk';
-import sv from './sv';
-import tr from './tr';
-import ua from './ua';
-import uz from './uz';
-import zh from './zh';
+import bgBG from './bg-BG';
+import csCZ from './cs-CZ';
+import daDK from './da-DK';
+import deDE from './de-DE';
+import enUS from './en-US';
+import esES from './es-ES';
+import faIR from './fa-IR';
+import frFR from './fr-FR';
+import huHU from './hu-HU';
+import idID from './id-ID';
+import itIT from './it-IT';
+import jaJP from './ja-JP';
+import koKR from './ko-KR';
+import nlNL from './nl-NL';
+import plPL from './pl-PL';
+import ptBR from './pt-BR';
+import roRO from './ro-RO';
+import ruRU from './ru-RU';
+import skSK from './sk-SK';
+import svSE from './sv-SE';
+import trTR from './tr-TR';
+import ukUA from './uk-UA';
+import uzUZ from './uz-UZ';
+import zhCN from './zh-CN';
 
 const locales = [
-  bg,
-  cs,
-  da,
-  de,
-  en,
-  es,
-  fa,
-  fr,
-  hu,
-  id,
-  it,
-  ja,
-  ko,
-  nl,
-  pl,
-  pt,
-  ro,
-  ru,
-  sk,
-  sv,
-  tr,
-  ua,
-  uz,
-  zh,
+  bgBG,
+  csCZ,
+  daDK,
+  deDE,
+  enUS,
+  esES,
+  faIR,
+  frFR,
+  huHU,
+  idID,
+  itIT,
+  jaJP,
+  koKR,
+  nlNL,
+  plPL,
+  ptBR,
+  roRO,
+  ruRU,
+  skSK,
+  svSE,
+  trTR,
+  ukUA,
+  uzUZ,
+  zhCN,
 ];
 
 export default locales;

client/src/locales/it-IT/core.js

@@ -1,4 +1,8 @@
+import dateFns from 'date-fns/locale/it';
+
 export default {
+  dateFns,
+
   format: {
     date: 'd/M/yyyy',
     time: 'p',

client/src/locales/it-IT/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'it',
+  language: 'it-IT',
   country: 'it',
   name: 'Italiano',
   embeddedLocale: login,

client/src/locales/ja-JP/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'ja',
+  language: 'ja-JP',
   country: 'jp',
   name: '日本語',
   embeddedLocale: login,

client/src/locales/ko-KR/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'ko',
+  language: 'ko-KR',
   country: 'kr',
   name: '한국어',
   embeddedLocale: login,

client/src/locales/nl-NL/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'nl',
+  language: 'nl-NL',
   country: 'nl',
   name: 'Nederlands',
   embeddedLocale: login,

client/src/locales/pl-PL/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'pl',
+  language: 'pl-PL',
   country: 'pl',
   name: 'Polski',
   embeddedLocale: login,

client/src/locales/pt-BR/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'pt',
+  language: 'pt-BR',
   country: 'br',
   name: 'Português',
   embeddedLocale: login,

client/src/locales/ro-RO/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'ro',
+  language: 'ro-RO',
   country: 'ro',
   name: 'Română',
   embeddedLocale: login,

client/src/locales/ru-RU/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'ru',
+  language: 'ru-RU',
   country: 'ru',
   name: 'Русский',
   embeddedLocale: login,

client/src/locales/sk-SK/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'sk',
+  language: 'sk-SK',
   country: 'sk',
   name: 'Slovenčina',
   embeddedLocale: login,

client/src/locales/sv-SE/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'sv',
+  language: 'sv-SE',
   country: 'se',
   name: 'Svenska',
   embeddedLocale: login,

client/src/locales/tr-TR/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'tr',
+  language: 'tr-TR',
   country: 'tr',
   name: 'Türkçe',
   embeddedLocale: login,

client/src/locales/uk-UA/core.js

@@ -1,4 +1,8 @@
+import dateFns from 'date-fns/locale/uk';
+
 export default {
+  dateFns,
+
   format: {
     date: 'd/M/yyyy',
     time: 'p',

client/src/locales/uk-UA/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'ua',
+  language: 'uk-UA',
   country: 'ua',
   name: 'Українська',
   embeddedLocale: login,

client/src/locales/uz-UZ/core.js

@@ -1,4 +1,8 @@
+import dateFns from 'date-fns/locale/uz';
+
 export default {
+  dateFns,
+
   format: {
     date: 'M/d/yyyy',
     time: 'p',

client/src/locales/uz-UZ/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'uz',
+  language: 'uz-UZ',
   country: 'uz',
   name: "O'zbek",
   embeddedLocale: login,

client/src/locales/zh-CN/core.js

@@ -1,4 +1,8 @@
+import dateFns from 'date-fns/locale/zh-CN';
+
 export default {
+  dateFns,
+
   format: {
     date: 'M/d/yyyy',
     time: 'p',

client/src/locales/zh-CN/index.js

@@ -1,7 +1,7 @@
 import login from './login';
 
 export default {
-  language: 'zh',
+  language: 'zh-CN',
   country: 'cn',
   name: '中文',
   embeddedLocale: login,