use sting 'en' for english translation instead of 'default'

src/canvasesDesc.js

@@ -66,8 +66,8 @@ const lCanvases = {};
   });
 })();
 
-export function getLocalizedCanvases(lang) {
+export function getLocalizedCanvases(lang = 'en') {
-  return lCanvases[lang] || lCanvases.default;
+  return lCanvases[lang] || lCanvases.en;
 }
 
 export default lCanvases;

src/core/ChatProvider.js

@@ -192,7 +192,7 @@ export class ChatProvider {
 
   getDefaultChannels(lang) {
     const langChannel = {};
-    if (lang && lang !== 'default') {
+    if (lang && lang !== 'en') {
       const { langChannels } = this;
       if (langChannels[lang]) {
         const {

src/core/assets.js

@@ -7,7 +7,7 @@ const assetDir = path.join(__dirname, 'public', ASSET_DIR);
  * {
  *   js:
  *     client:
- *       default: "/assets/client.defult.134234.js",
+ *       en: "/assets/client.defult.134234.js",
  *       de: "/assets/client.de.32834234.js",
  *       [...]
  *     [...]
@@ -95,9 +95,15 @@ export function getJsAssets(name, lang) {
       // nothing
   }
 
-  const mainAsset = (lang && assets.js[name][lang])
+  const nameAssets = assets.js[name];
-    || assets.js[name].default
+  let mainAsset;
-    || assets.js[name];
+  if (typeof nameAssets === 'object') {
+    mainAsset = (lang && nameAssets[lang])
+      || nameAssets.en
+      || Object.values(nameAssets)[0];
+  } else {
+    mainAsset = nameAssets;
+  }
   if (mainAsset) {
     jsAssets.push(mainAsset);
   }

src/core/me.js

@@ -9,7 +9,7 @@ import { USE_MAILER } from './config';
 import chatProvider from './ChatProvider';
 
 
-export default async function getMe(user, lang = 'default') {
+export default async function getMe(user, lang) {
   const userdata = await user.getUserData();
   // sanitize data
   const {

src/core/ttag.js

@@ -10,7 +10,7 @@ import { languageFromLocalisation } from '../utils/location';
 const localeImports = require.context('../../i18n', false, /^\.[/\\]ssr-.+\.po$/);
 
 const ttags = {
-  default: new TTag(),
+  en: new TTag(),
 };
 
 (() => {
@@ -27,7 +27,7 @@ const ttags = {
 })();
 
 export function getTTag(lang) {
-  return ttags[lang] || ttags.default;
+  return ttags[lang] || ttags.en;
 }
 
 /*

src/ssr/Main.jsx

@@ -48,7 +48,7 @@ function generateMainPage(req) {
   const ssvR = JSON.stringify({
     ...ssv,
     shard,
-    lang: lang === 'default' ? 'en' : lang,
+    lang,
   });
   const scripts = getJsAssets('client', lang);
 

src/ssr/PopUp.jsx

@@ -44,7 +44,7 @@ function generatePopUpPage(req) {
   const ssvR = JSON.stringify({
     ...ssv,
     shard,
-    lang: lang === 'default' ? 'en' : lang,
+    lang,
   });
   const scripts = getJsAssets('popup', lang);
 

src/utils/location.js

@@ -9,7 +9,7 @@
  */
 export function languageFromLocalisation(localisation) {
   if (!localisation) {
-    return 'default';
+    return 'en';
   }
   let lang = localisation;
   let i = lang.indexOf('-');
@@ -24,9 +24,6 @@ export function languageFromLocalisation(localisation) {
   if (i !== -1) {
     lang = lang.slice(0, i);
   }
-  if (lang === 'en') {
-    lang = 'default';
-  }
   return lang.toLowerCase();
 }
 

webpack.config.client.js

@@ -21,9 +21,9 @@ function buildWebpackClientConfig(
 ) {
   const ttag = {
     resolve: {
-      translations: (locale !== 'default')
+      translations: (locale !== 'en')
         ? path.resolve('i18n', `${locale}.po`)
-        : locale,
+        : 'default',
     },
   };
 
@@ -182,12 +182,11 @@ function buildWebpackClientConfig(
 }
 
 function getAllAvailableLocals() {
-  // return ['default', 'de', 'tr'];
   const langDir = path.resolve('i18n');
   const langs = fs.readdirSync(langDir)
     .filter((e) => (e.endsWith('.po') && !e.startsWith('ssr')))
     .map((l) => l.slice(0, -3));
-  langs.unshift('default');
+  langs.unshift('en');
   return langs;
 }
 
@@ -222,7 +221,7 @@ module.exports = ({
 }) => {
   if (extract || analyze || locale || development) {
     return buildWebpackClientConfig(
-      development, analyze, locale || 'default', extract,
+      development, analyze, locale || 'en', extract,
     );
   }
   return buildWebpackClientConfigAllLangs(development);