diff --git a/frontend/Makefile b/frontend/Makefile index 8ed2d18e..be3ba03f 100644 --- a/frontend/Makefile +++ b/frontend/Makefile @@ -6,7 +6,11 @@ LOGNAME ?= $(shell logname) # adding the name of the user's login name to the template file, so that # on a multi-user system several users can run this without interference +ifeq ($(OS),Windows_NT) +TEMPLATE_POT ?= ./template-$(LOGNAME).pot +else TEMPLATE_POT ?= /tmp/template-$(LOGNAME).pot +endif # Where to find input files (it can be multiple paths). INPUT_FILES = ./src diff --git a/frontend/src/components/Breadcrumb/Breadcrumb.vue b/frontend/src/components/Breadcrumb/Breadcrumb.vue index 4a3a2ead..37dc58d4 100644 --- a/frontend/src/components/Breadcrumb/Breadcrumb.vue +++ b/frontend/src/components/Breadcrumb/Breadcrumb.vue @@ -2,7 +2,7 @@ {{ item.name }} diff --git a/frontend/src/layouts/BaseLayout.vue b/frontend/src/layouts/BaseLayout.vue index 7646ff03..dbe720af 100644 --- a/frontend/src/layouts/BaseLayout.vue +++ b/frontend/src/layouts/BaseLayout.vue @@ -50,6 +50,7 @@ import FooterLayout from './FooterLayout' import PageHeader from '@/components/PageHeader/PageHeader' import zh_CN from 'ant-design-vue/es/locale/zh_CN' +// TODO: Change language for base layout. export default { name: 'BaseLayout', data() { diff --git a/frontend/src/layouts/HeaderLayout.vue b/frontend/src/layouts/HeaderLayout.vue index 47a0734d..d24323ee 100644 --- a/frontend/src/layouts/HeaderLayout.vue +++ b/frontend/src/layouts/HeaderLayout.vue @@ -19,13 +19,14 @@ diff --git a/frontend/src/views/other/Error.vue b/frontend/src/views/other/Error.vue index 0b93da55..dce22d36 100644 --- a/frontend/src/views/other/Error.vue +++ b/frontend/src/views/other/Error.vue @@ -1,7 +1,7 @@ diff --git a/frontend/src/views/other/Home.vue b/frontend/src/views/other/Home.vue deleted file mode 100644 index 841c40c4..00000000 --- a/frontend/src/views/other/Home.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/frontend/src/views/other/Install.vue b/frontend/src/views/other/Install.vue index c988382d..9da5f69f 100644 --- a/frontend/src/views/other/Install.vue +++ b/frontend/src/views/other/Install.vue @@ -4,7 +4,7 @@

Nginx UI

diff --git a/frontend/src/views/other/Login.vue b/frontend/src/views/other/Login.vue index 7ac006f5..d5ac4f88 100644 --- a/frontend/src/views/other/Login.vue +++ b/frontend/src/views/other/Login.vue @@ -13,9 +13,9 @@ @@ -24,17 +24,17 @@ - - 登录 + + Login @@ -46,6 +46,8 @@