Merge 5d9fa9da41 into ca867f0d7a

README.md

@@ -9,7 +9,7 @@ It is open-source and easily extendable. You can use it as a starter kit for mor
  
 Run it locally or host it yourself.
  
-You can always use the latest free version at [invoices.elevate.ee](https://invoices.elevate.ee)
+You can always use the latest free version at [invoices.mokuapp.io](https://invoices.mokuapp.io)
 
 Built with [Vue.js](https://vuejs.org/) and [Bootstrap](https://getbootstrap.com/)
 
@@ -35,7 +35,7 @@ Built with [Vue.js](https://vuejs.org/) and [Bootstrap](https://getbootstrap.com
 - Multilingual
 - PWA support 
 - Ready-to-go backend adapters
-  - [Browser Storage](https://invoices.elevate.ee)
+  - [Browser Storage](https://invoices.mokuapp.io)
   - [Wordpress](https://wordpress.org/plugins/beautiful-custom-invoices/)
   - Woocommerce (coming soon)
   - Google Drive (coming soon)

src/config/app.config.example.js

@@ -3,7 +3,7 @@
 export default {
   storageType: 'local',
   // base_url: wordpress.front_url,
-  // base_url: process.env.BASE_URL
+  // base_url: `${window.location.origin}${process.env.BASE_URL}`
   // api_url: wordpress.api_url,
   // api_nonce: wordpress.nonce,
 };

src/config/i18n.config.js

@@ -4,6 +4,7 @@ import VueI18Next from '@panter/vue-i18next';
 import Backend from 'i18next-http-backend';
 import LanguageDetector from 'i18next-browser-languagedetector';
 import app from '@/main';
+import config from '@/config/app.config';
 
 Vue.use(VueI18Next);
 
@@ -15,7 +16,7 @@ const initialized = i18next.init({
   fallbackLng: 'en',
   whitelist: ['en', 'de', 'fr', 'et', 'fa', 'bn', 'es', 'pt_br', 'it', 'id', 'kr'],
   backend: {
-    loadPath: `${window.location.origin}/locales/{{lng}}/{{ns}}.json`,
+    loadPath: `${config.base_url || ''}/locales/{{lng}}/{{ns}}.json`,
   },
   detection: {
     order: ['querystring', 'path', 'localStorage', 'navigator'],