Skip to content

Commit d2c0662

Browse files
ismcagdasismcagdas
committed
more localization and modified import paths
1 parent 659ee09 commit d2c0662

File tree

15 files changed

+34
-34
lines changed

15 files changed

+34
-34
lines changed

‎Vue/src/main.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ util.ajax.get('/AbpUserConfiguration/GetAll').then(result => {
4343
},
4444
mounted() {
4545
this.currentPageName = this.$route.name;
46-
// 显示打开的页面的列表
46+
// Display a list of open pages
4747
this.$store.commit('setOpenedList');
4848
this.$store.commit('initCachepage');
49-
// 权限菜单过滤相关
49+
50+
//Filtering admin menu
5051
this.$store.commit('updateMenulist');
51-
// iview-admin检查更新
5252
},
5353
created() {
5454
let tagsList = [];

‎Vue/src/router/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Vue from 'vue';
22
import iView from 'iview';
3-
import Util from '../libs/util';
3+
import Util from '@/libs/util';
44
import VueRouter from 'vue-router';
55
import Cookies from 'js-cookie';
66
import {routers, otherRouter, appRouter} from './router';

‎Vue/src/router/router.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ export const page404 = {
1616
path: '/*',
1717
name: 'error-404',
1818
meta: {
19-
title: '404-页面不存在'
19+
title: '404 - Page does not exist'
2020
},
2121
component: () => import('@/views/error-page/404.vue')
2222
};
2323

2424
export const page403 = {
2525
path: '/403',
2626
meta: {
27-
title: '403-权限不足'
27+
title: '403 - You are not authorized'
2828
},
2929
name: 'error-403',
3030
component: () => import('@//views/error-page/403.vue')
@@ -33,7 +33,7 @@ export const page403 = {
3333
export const page500 = {
3434
path: '/500',
3535
meta: {
36-
title: '500-服务端错误'
36+
title: '500 - Server error'
3737
},
3838
name: 'error-500',
3939
component: () => import('@/views/error-page/500.vue')
@@ -44,7 +44,7 @@ export const locking = {
4444
component: () => import('@/views/main-components/lockscreen/components/locking-page.vue')
4545
};
4646

47-
// 作为Main组件的子页面展示但是不在左侧菜单显示的路由写在otherRouter里
47+
// A route which is not displayed in the left menu
4848
export const otherRouter = {
4949
path: '/',
5050
name: 'otherRouter',
@@ -55,19 +55,19 @@ export const otherRouter = {
5555
]
5656
};
5757

58-
// 作为Main组件的子页面展示并且在左侧菜单显示的路由写在appRouter里
58+
// Left menu items
5959
export const appRouter = [
6060
{
61-
path: '/administration',
61+
path: '/admin',
6262
icon: 'settings',
6363
title: 'Administration',
6464
name: 'administration',
6565
component: Main,
6666
children: [
67-
{ path: 'tenants', title: 'Tenants', name: 'tenants',permission:'Pages.Tenants', component: () => import('@/views/permission/tenants/tenants.vue') },
68-
{ path: 'users', title: 'Users', name: 'users',permission:'Pages.Users', component: () => import('@/views/permission/users/users.vue') },
69-
{ path: 'roles', title: 'Roles', name: 'roles',permission:'Pages.Roles', component: () => import('@/views/permission/roles/roles.vue') },
70-
{ path: 'about', title: 'About', name:'about',component:()=>import('@/views/permission/about/about.vue')}
67+
{ path: 'tenants', title: 'Tenants', name: 'tenants',permission:'Pages.Tenants', component: () => import('@/views/admin/tenants/tenants.vue') },
68+
{ path: 'users', title: 'Users', name: 'users',permission:'Pages.Users', component: () => import('@/views/admin/users/users.vue') },
69+
{ path: 'roles', title: 'Roles', name: 'roles',permission:'Pages.Roles', component: () => import('@/views/admin/roles/roles.vue') },
70+
{ path: 'about', title: 'About', name:'about',component:()=>import('@/views/admin/about/about.vue')}
7171
]
7272
}
7373
];

‎Vue/src/store/modules/role.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Cookies from 'js-cookie';
2-
import Util from '../../libs/util'
3-
import appconst from '../../libs/appconst'
2+
import Util from '@/libs/util'
3+
import appconst from '@/libs/appconst'
44
const user = {
55
namespaced:true,
66
state: {

‎Vue/src/store/modules/tenant.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Cookies from 'js-cookie';
2-
import Util from '../../libs/util'
3-
import appconst from '../../libs/appconst'
2+
import Util from '@/libs/util'
3+
import appconst from '@/libs/appconst'
44
const tenant = {
55
namespaced:true,
66
state: {

‎Vue/src/store/modules/user.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Cookies from 'js-cookie';
2-
import Util from '../../libs/util'
3-
import appconst from '../../libs/appconst'
2+
import Util from '@/libs/util'
3+
import appconst from '@/libs/appconst'
44
const user = {
55
namespaced:true,
66
state: {

‎Vue/src/views/Main.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
import changeLanguage from './main-components/changelanguage.vue';
7575
import Cookies from 'js-cookie';
7676
import util from '@/libs/util.js';
77-
import AppConsts from '../libs/appconst.js'
77+
import AppConsts from '@/libs/appconst.js'
7878
7979
export default {
8080
components: {
@@ -181,7 +181,7 @@
181181
'$route' (to) {
182182
this.$store.commit('setCurrentPageName', to.name);
183183
let pathArr = util.setCurrentPath(this, to.name);
184-
debugger;
184+
185185
if (pathArr.length > 2) {
186186
this.$store.commit('addOpenSubmenu', pathArr[1].name);
187187
}

‎Vue/src/views/error-page/403.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<div class="error403-body-con-title">4<span class="error403-0-span"><Icon type="android-lock"></Icon></span><span class="error403-key-span"><Icon size="220" type="ios-bolt"></Icon></span></div>
1010
<p class="error403-body-con-message">You don't have permission</p>
1111
<div class="error403-btn-con">
12-
<Button @click="goHome" size="large" style="width: 200px;" type="text">返回首页</Button>
13-
<Button @click="backPage" size="large" style="width: 200px;margin-left: 40px;" type="primary">返回上一页</Button>
12+
<Button @click="goHome" size="large" style="width: 200px;" type="text">{{'Return to Home page'|l}}</Button>
13+
<Button @click="backPage" size="large" style="width: 200px;margin-left: 40px;" type="primary">{{'Back to last page'|l}}</Button>
1414
</div>
1515
</Card>
1616
</div>

‎Vue/src/views/error-page/404.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<div class="error404-body-con-title">4<span><Icon type="ios-navigate-outline"></Icon></span>4</div>
1010
<p class="error404-body-con-message">YOU&nbsp;&nbsp;LOOK&nbsp;&nbsp;LOST</p>
1111
<div class="error404-btn-con">
12-
<Button @click="goHome" size="large" style="width: 200px;" type="text">返回首页</Button>
13-
<Button @click="backPage" size="large" style="width: 200px;margin-left: 40px;" type="primary">返回上一页</Button>
12+
<Button @click="goHome" size="large" style="width: 200px;" type="text">{{'Return to Home page'|l}}</Button>
13+
<Button @click="backPage" size="large" style="width: 200px;margin-left: 40px;" type="primary">{{'Back to last page'|l}}</Button>
1414
</div>
1515
</Card>
1616
</div>

‎Vue/src/views/error-page/500.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</div>
1212
<p class="error500-body-con-message">Oops! the server is wrong</p>
1313
<div class="error500-btn-con">
14-
<Button @click="goHome" size="large" style="width: 200px;" type="text">返回首页</Button>
15-
<Button @click="backPage" size="large" style="width: 200px;margin-left: 40px;" type="primary">返回上一页</Button>
14+
<Button @click="goHome" size="large" style="width: 200px;" type="text">{{'Return to Home page'|l}}</Button>
15+
<Button @click="backPage" size="large" style="width: 200px;margin-left: 40px;" type="primary">{{'Back to last page'|l}}</Button>
1616
</div>
1717
</Card>
1818
</div>

0 commit comments

Comments
 (0)