fix34: устранён import-time баг i18n, усилен SSH tunnel policy и doctor warning
This commit is contained in:
@@ -1,10 +1,15 @@
|
||||
import { createI18n } from "vue-i18n";
|
||||
import { useAppStore } from "@/store/modules/app";
|
||||
|
||||
const appStore = useAppStore();
|
||||
import defaultSettings from "@/settings";
|
||||
import enLocale from "./package/en";
|
||||
import ruLocale from "./package/ru";
|
||||
|
||||
function initialLocale(): string {
|
||||
if (typeof window === "undefined") {
|
||||
return defaultSettings.language || "ru";
|
||||
}
|
||||
return window.localStorage.getItem("language") || defaultSettings.language || "ru";
|
||||
}
|
||||
|
||||
const messages = {
|
||||
ru: {
|
||||
...ruLocale,
|
||||
@@ -16,7 +21,8 @@ const messages = {
|
||||
|
||||
const i18n = createI18n({
|
||||
legacy: false,
|
||||
locale: appStore.language,
|
||||
locale: initialLocale(),
|
||||
fallbackLocale: "ru",
|
||||
messages: messages,
|
||||
globalInjection: true,
|
||||
});
|
||||
|
||||
@@ -7,8 +7,6 @@ import "nprogress/nprogress.css";
|
||||
|
||||
NProgress.configure({ showSpinner: false }); // Индикатор загрузки
|
||||
|
||||
const permissionStore = usePermissionStoreHook();
|
||||
|
||||
// Разрешённые маршруты
|
||||
const whiteList = ["/login", "/register"];
|
||||
|
||||
@@ -37,6 +35,7 @@ router.beforeEach(async (to, from, next) => {
|
||||
} else {
|
||||
try {
|
||||
const { roles, forcePasswordChange } = await adminStore.getAdminInfo();
|
||||
const permissionStore = usePermissionStoreHook();
|
||||
const accessRoutes = permissionStore.generateRoutes(roles);
|
||||
accessRoutes.forEach((route) => {
|
||||
router.addRoute(route);
|
||||
@@ -68,4 +67,3 @@ router.beforeEach(async (to, from, next) => {
|
||||
router.afterEach(() => {
|
||||
NProgress.done();
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user