Merge remote-tracking branch 'origin/v2' into oasis

# Conflicts:
#	app/Http/Controllers/User/AccountController.php
#	app/Http/helpers.php
#	public/mix-manifest.json
#	resources/js/components/FilesView/Icons/AlphabetIcon.vue
#	resources/js/components/FilesView/MobileActionButton.vue
#	resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
#	resources/js/views/Admin/Users/UserTabs/UserDetail.vue
#	resources/js/views/Upgrade/UpgradeBilling.vue
#	resources/views/index.blade.php
#	resources/views/vuefilemanager/invoice.blade.php
#	resources/views/vuefilemanager/others/color-template.blade.php

resources/js/store/modules/app.js

@@ -1,4 +1,6 @@
 import i18n from '@/i18n/index'
+import axios from "axios";
+import Vue from "vue";
 
 const defaultState = {
     fileInfoPanelVisible: localStorage.getItem('file_info_visibility') === 'true' || false,
@@ -14,11 +16,11 @@ const defaultState = {
     },
     roles: [
         {
-            label: i18n.t('roles.admin'),
+            label: 'roles.admin',
             value: 'admin',
         },
         {
-            label: i18n.t('roles.user'),
+            label: 'roles.user',
             value: 'user',
         },
     ],
@@ -269,31 +271,31 @@ const defaultState = {
     ],
     expirationList: [
         {
-            label: i18n.t('shared_form.expiration_hour', {value: 1}),
+            label: ['shared_form.expiration_hour', {value: 1}],
             value: 1,
         },
         {
-            label: i18n.t('shared_form.expiration_hour', {value: 2}),
+            label: ['shared_form.expiration_hour', {value: 2}],
             value: 2,
         },
         {
-            label: i18n.t('shared_form.expiration_hour', {value: 6}),
+            label: ['shared_form.expiration_hour', {value: 6}],
             value: 6,
         },
         {
-            label: i18n.t('shared_form.expiration_hour', {value: 12}),
+            label: ['shared_form.expiration_hour', {value: 12}],
             value: 12,
         },
         {
-            label: i18n.t('shared_form.expiration_day', {value: 1}),
+            label: ['shared_form.expiration_day', {value: 1}],
             value: 24,
         },
         {
-            label: i18n.t('shared_form.expiration_day', {value: 2}),
+            label: ['shared_form.expiration_day', {value: 2}],
             value: 48,
         },
         {
-            label: i18n.t('shared_form.expiration_day', {value: 7}),
+            label: ['shared_form.expiration_day', {value: 7}],
             value: 168,
         },
     ],
@@ -989,6 +991,19 @@ const actions = {
             context.commit('FILE_INFO_TOGGLE', visibility)
         }
     },
+    getLanguageTranslations: ({commit, state}, lang) => {
+        return new Promise((resolve, reject) => {
+
+            axios.get(`/translations/${lang}`)
+                .then(response => {
+
+                    i18n.setLocaleMessage(lang, response.data)
+                    i18n.locale = lang
+
+                    resolve(response)
+                })
+        })
+    },
 }
 
 const mutations = {

resources/js/store/modules/sharing.js

@@ -7,12 +7,12 @@ import Vue from "vue";
 const defaultState = {
     permissionOptions: [
         {
-            label: i18n.t('shared.editor'),
+            label: 'shared.editor',
             value: 'editor',
             icon: 'user-edit',
         },
         {
-            label: i18n.t('shared.visitor'),
+            label: 'shared.visitor',
             value: 'visitor',
             icon: 'user',
         },