Skip to content

Commit af13267

Browse files
ebicogluebicoglu
committed
Missing localizations fixed.
1 parent 350946c commit af13267

File tree

9 files changed

+54
-52
lines changed

9 files changed

+54
-52
lines changed

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName-tr.xml

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
<text name="HomePage" value="Ana Sayfa" />
55
<text name="About" value="Hakkında" />
66
<text name="WellcomeMessage" value="AbpProjectName projesine hoşgeldiniz!" />
7-
87
<text name="FormIsNotValidMessage" value="Form geçerli değil. Lütfen kontrol edip hataları düzeltin." />
98
<text name="TenantNameCanNotBeEmpty" value="Müşteri adı boş bırakılamaz." />
10-
119
<text name="InvalidUserNameOrPassword" value="Kullanıcı adı ya da şifre hatalı." />
1210
<text name="ThereIsNoTenantDefinedWithName{0}" value="{0} isminde bir müşteri tanımlı değildir." />
1311
<text name="TenantIsNotActive" value="{0} isimli müşteri aktif edilmemiştir." />
@@ -20,15 +18,12 @@
2018
<text name="Password" value="Şifre" />
2119
<text name="RememberMe" value="Beni hatırla" />
2220
<text name="LogIn" value="Giriş" />
23-
2421
<text name="LoginFailed" value="Giriş başarısız!" />
25-
2622
<text name="NameSurname" value="Ad soyad" />
2723
<text name="UserName" value="Kullanıcı adı" />
2824
<text name="Name" value="İsim" />
29-
<text name="Surname" value="Soyisim" />
25+
<text name="Surname" value="Soy isim" />
3026
<text name="EmailAddress" value="E-posta adresi" />
31-
3227
<text name="Tenants" value="Müşteriler" />
3328
<text name="SavedSuccessfully" value="Başarıyla kaydedildi" />
3429
<text name="CreateNewTenant" value="Yeni müşteri oluştur" />
@@ -44,9 +39,7 @@
4439
<text name="TenantSelection" value="Müşteri seçimi" />
4540
<text name="TenantSelection_Detail" value="Lütfen aşağıdaki müşterilerden birisini seçin." />
4641
<text name="Logout" value="Çıkış" />
47-
4842
<text name="RegisterFormUserNameInvalidMessage">Lütfen kullanıcı adı alanına e-posta adresi girmeyin.</text>
49-
5043
<text name="DatabaseConnectionString" value="Veritabanı bağlantı cümlesi" />
5144
<text name="Users" value="Kullanıcılar" />
5245
<text name="IsActive" value="Etkin mi" />
@@ -56,24 +49,39 @@
5649
<text name="No" value="Hayır" />
5750
<text name="Optional" value="Opsiyonel" />
5851
<text name="LeaveEmptyToSwitchToHost">Üst kullanıcıya geçiş için boş değer girin.</text>
59-
6052
<text name="CurrentTenant">Geçerli müşteri</text>
6153
<text name="NotSelected">Seçilmemiş</text>
6254
<text name="Change">Değiştir</text>
6355
<text name="ChangeTenant">Müşteri değiştir</text>
64-
6556
<text name="MultiLevelMenu">Çok Seviyeli Menü</text>
6657
<text name="Back">Geri</text>
6758
<text name="SuccessfullyRegistered">Başarıyla kayıt olundu</text>
6859
<text name="WaitingForEmailActivation">E-posta adresiniz etkinleştirilmeli.</text>
6960
<text name="Roles">Roller</text>
7061
<text name="DisplayName">Görünen ad</text>
71-
7262
<text name="Edit">Düzenle</text>
7363
<text name="Delete">Sil</text>
74-
7564
<text name="CreateNewRole">Yeni rol oluştur</text>
7665
<text name="RoleName">Rol adı</text>
7766
<text name="Actions">İşlemler</text>
67+
<text name="CouldNotCompleteLoginOperation">Giriş işlemi başarısız! Lütfen daha sonra tekrar deneyiniz.</text>
68+
<text name="CouldNotValidateExternalUser">Harici kullanıcı doğrulanamadı!</text>
69+
<text name="EditRole">Rolü düzenle</text>
70+
<text name="EditTenant">Müşteri düzenle</text>
71+
<text name="EditUser">Kullanıcı düzenleme</text>
72+
<text name="TenantIdIsNotActive{0}">Müşteri id aktif değil: {0}</text>
73+
<text name="UnknownTenantId{0}">Müşteri id aktif değil: {0}</text>
74+
<text name="ThisFieldIsRequired">Bu alan zorunludur.</text>
75+
<text name="PleaseWait">Lütfen bekleyin...</text>
76+
<text name="Administration">Yönetim</text>
77+
<text name="ClearAll">Hepsini temizle</text>
78+
<text name="ClearOthers">Diğerlerini temizle</text>
79+
<text name="LabelOptions">Etikent seçenekleri</text>
80+
<text name="Permissions">Yetkiler</text>
81+
<text name="RoleDescription">Rol tanımı</text>
82+
<text name="Refresh">Yenile</text>
83+
<text name="Create">Oluştur</text>
84+
<text name="UserDetails">Kullanıcı detayları</text>
85+
<text name="UserRoles">Kullanıcı rolleri</text>
7886
</texts>
79-
</localizationDictionary>
87+
</localizationDictionary>

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
<text name="HomePage" value="Home page" />
55
<text name="About" value="About" />
66
<text name="WellcomeMessage" value="Welcome to AbpProjectName!" />
7-
87
<text name="FormIsNotValidMessage" value="Form is not valid. Please check and fix errors." />
98
<text name="TenantNameCanNotBeEmpty" value="Tenant name can not be empty" />
10-
119
<text name="InvalidUserNameOrPassword" value="Invalid user name or password" />
1210
<text name="ThereIsNoTenantDefinedWithName{0}" value="There is no tenant defined with name {0}" />
1311
<text name="TenantIsNotActive" value="Tenant {0} is not active." />
@@ -20,15 +18,12 @@
2018
<text name="Password" value="Password" />
2119
<text name="RememberMe" value="Remember me" />
2220
<text name="LogIn" value="Log in" />
23-
2421
<text name="LoginFailed" value="Login failed!" />
25-
2622
<text name="NameSurname" value="Name surname" />
2723
<text name="UserName" value="User name" />
2824
<text name="Name" value="Name" />
2925
<text name="Surname" value="Surname" />
3026
<text name="EmailAddress" value="Email address" />
31-
3227
<text name="Tenants" value="Tenants" />
3328
<text name="SavedSuccessfully" value="Saved successfully" />
3429
<text name="CreateNewTenant" value="Create new tenant" />
@@ -44,9 +39,7 @@
4439
<text name="TenantSelection" value="Tenant Selection" />
4540
<text name="TenantSelection_Detail" value="Please select one of the following tenants." />
4641
<text name="Logout" value="Logout" />
47-
4842
<text name="RegisterFormUserNameInvalidMessage">Please don't enter an email address for username.</text>
49-
5043
<text name="DatabaseConnectionString" value="Database connection string" />
5144
<text name="Users" value="Users" />
5245
<text name="IsActive" value="Is active" />
@@ -56,28 +49,22 @@
5649
<text name="No" value="No" />
5750
<text name="Optional" value="Optional" />
5851
<text name="LeaveEmptyToSwitchToHost">Leave empty to switch to the host</text>
59-
6052
<text name="CurrentTenant">Current tenant</text>
6153
<text name="NotSelected">Not selected</text>
6254
<text name="Change">Change</text>
6355
<text name="ChangeTenant">Change tenant</text>
64-
6556
<text name="MultiLevelMenu">Multi Level Menu</text>
6657
<text name="Back">Back</text>
6758
<text name="SuccessfullyRegistered">Successfully registered</text>
6859
<text name="WaitingForEmailActivation">Your email address should be activated</text>
6960
<text name="Roles">Roles</text>
7061
<text name="DisplayName">Display Name</text>
71-
7262
<text name="Edit">Edit</text>
7363
<text name="Delete">Delete</text>
74-
7564
<text name="CreateNewRole">Create new role</text>
7665
<text name="RoleName">Role Name</text>
7766
<text name="Actions">Actions</text>
78-
7967
<text name="CouldNotCompleteLoginOperation">Could not complete login operation. Please try again later.</text>
80-
8168
<text name="CouldNotValidateExternalUser">Could not validate external user</text>
8269
<text name="EditRole">Edit role</text>
8370
<text name="EditTenant">Edit tenant</text>
@@ -86,10 +73,15 @@
8673
<text name="UnknownTenantId{0}">Unknown tenantId {0}</text>
8774
<text name="ThisFieldIsRequired">This field is required</text>
8875
<text name="PleaseWait">Please wait...</text>
89-
<text name="Administration">Administration</text>
90-
76+
<text name="Administration">Administration</text>
9177
<text name="ClearAll">Clear all</text>
9278
<text name="ClearOthers">Clear others</text>
9379
<text name="LabelOptions">Label options</text>
80+
<text name="Permissions">Permissions</text>
81+
<text name="RoleDescription">Role description</text>
82+
<text name="Refresh">Refresh</text>
83+
<text name="Create">Create</text>
84+
<text name="UserDetails">User details</text>
85+
<text name="UserRoles">User roles</text>
9486
</texts>
95-
</localizationDictionary>
87+
</localizationDictionary>

‎vue/src/store/modules/app.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ const app = {
88
cachePage: [],
99
lang: '',
1010
isFullScreen: false,
11-
openedSubmenuArr: [], // 要展开的菜单数组
12-
menuTheme: 'dark', // 主题
11+
openedSubmenuArr: [],
12+
menuTheme: 'dark',
1313
themeColor: '',
14-
initSignalR:false,
14+
initSignalR: false,
1515
pageOpenedList: [{
1616
title: 'HomePage',
1717
path: '',
@@ -24,15 +24,15 @@ const app = {
2424
path: '',
2525
name: 'home_index'
2626
}
27-
], // 面包屑数组
27+
],
2828
menuList: [],
2929
routers: [
3030
otherRouter,
3131
...appRouter
3232
],
3333
tagsList: [...otherRouter.children],
3434
messageCount: 0,
35-
dontCache: [] // 在这里定义你不想要缓存的页面的name属性值(参见路由配置router.js)
35+
dontCache: []
3636
},
3737
mutations: {
3838
initSignalR(state){
@@ -61,6 +61,7 @@ const app = {
6161
}
6262
}
6363
});
64+
6465
state.menuList = menuList;
6566
},
6667
changeMenuTheme (state, theme) {

‎vue/src/views/Main.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
changeLanguage
8989
},
9090
data () {
91+
9192
return {
9293
shrink: false,
9394
userName: '',
@@ -101,10 +102,10 @@
101102
return this.$store.state.app.menuList;
102103
},
103104
pageTagsList () {
104-
return this.$store.state.app.pageOpenedList; // 打开的页面的页面对象
105+
return this.$store.state.app.pageOpenedList;
105106
},
106107
currentPath () {
107-
return this.$store.state.app.currentPath; // 当前面包屑数组
108+
return this.$store.state.app.currentPath;
108109
},
109110
avatorPath () {
110111
return localStorage.avatorImgPath;

‎vue/src/views/admin/roles/roles.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<Icon type="android-more-vertical"></Icon>
99
</a>
1010
<DropdownMenu slot="list">
11-
<DropdownItem name='Refresh'>{{'Refresh'|l}}</DropdownItem>
12-
<DropdownItem name='Create'>{{'Create'|l}}</DropdownItem>
11+
<DropdownItem name='Refresh'>{{'Refresh' | l}}</DropdownItem>
12+
<DropdownItem name='Create'>{{'Create' | l}}</DropdownItem>
1313
</DropdownMenu>
1414
</Dropdown>
1515
<Table :columns="columns" border :data="roles"></Table>
@@ -24,10 +24,10 @@
2424
<FormItem :label="L('DisplayName')" prop="displayName">
2525
<Input v-model="editRole.displayName" :maxlength="32" :minlength="2"></Input>
2626
</FormItem>
27-
<FormItem label="Role description" prop="description">
27+
<FormItem :label="L('RoleDescription')" prop="description">
2828
<Input v-model="editRole.description"></Input>
2929
</FormItem>
30-
<FormItem label="Permissions">
30+
<FormItem :label="L('Permissions')">
3131
<CheckboxGroup v-model="editRole.permissions">
3232
<Checkbox :label="permission.name" v-for="permission in permissions" :key="permission.name"><span>{{permission.displayName}}</span></Checkbox>
3333
</CheckboxGroup>
@@ -48,10 +48,10 @@
4848
<FormItem :label="L('DisplayName')" prop="displayName">
4949
<Input v-model="editRole.displayName" :maxlength="32" :minlength="2"></Input>
5050
</FormItem>
51-
<FormItem label="Role description" prop="description">
51+
<FormItem :label="L('RoleDescription')" prop="description">
5252
<Input v-model="editRole.description"></Input>
5353
</FormItem>
54-
<FormItem label="Permissions">
54+
<FormItem :label="L('Permissions')">
5555
<CheckboxGroup v-model="editRole.permissions">
5656
<Checkbox :label="permission.name" v-for="permission in permissions" :key="permission.name"><span>{{permission.displayName}}</span></Checkbox>
5757
</CheckboxGroup>

‎vue/src/views/admin/users/users.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div>
2020
<Form ref="newUserForm" label-position="top" :rules="newUserRule" :model="editUser">
2121
<Tabs value="detail">
22-
<TabPane :label="'User Details'|l" name="detail">
22+
<TabPane :label="L('UserDetails')" name="detail">
2323
<FormItem :label="L('UserName')" prop="userName">
2424
<Input v-model="editUser.userName" :maxlength="32" :minlength="2"></Input>
2525
</FormItem>
@@ -42,7 +42,7 @@
4242
<Checkbox v-model="editUser.isActive">{{'IsActive'|l}}</Checkbox>
4343
</FormItem>
4444
</TabPane>
45-
<TabPane :label="'User Roles'|l" name="roles">
45+
<TabPane :label="L('UserRoles')" name="roles">
4646
<CheckboxGroup v-model="editUser.roleNames">
4747
<Checkbox :label="role.normalizedName" v-for="role in roles" :key="role.id"><span>{{role.name}}</span></Checkbox>
4848
</CheckboxGroup>
@@ -60,7 +60,7 @@
6060
<div>
6161
<Form ref="userForm" label-position="top" :rules="userRule" :model="editUser">
6262
<Tabs value="detail">
63-
<TabPane :label="'User Details'|l" name="detail">
63+
<TabPane :label="L('UserDetails')" name="detail">
6464
<FormItem :label="L('UserName')" prop="userName">
6565
<Input v-model="editUser.userName" :maxlength="32" :minlength="2"></Input>
6666
</FormItem>
@@ -77,7 +77,7 @@
7777
<Checkbox v-model="editUser.isActive">{{'IsActive'|l}}</Checkbox>
7878
</FormItem>
7979
</TabPane>
80-
<TabPane :label="'User Roles'|l" name="roles">
80+
<TabPane :label="L('UserRoles')" name="roles">
8181
<CheckboxGroup v-model="editUser.roleNames">
8282
<Checkbox :label="role.normalizedName" v-for="role in roles" :key="role.id"><span>{{role.name}}</span></Checkbox>
8383
</CheckboxGroup>

‎vue/src/views/home/home.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</Row>
3232
<Row class="margin-top-8">
3333
<Col span="8"><p class="notwrap">Last login location:</p></Col>
34-
<Col span="16" class="padding-left-8">Beijing</Col>
34+
<Col span="16" class="padding-left-8">London</Col>
3535
</Row>
3636
</Card>
3737
</Col>

‎vue/src/views/main-components/tags-page-opened.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,11 @@ export default {
147147
this.tagBodyLeft = 0;
148148
},
149149
moveToView (tag) {
150-
if (tag.offsetLeft < -this.tagBodyLeft) {
151-
// 标签在可视区域左侧
150+
if (tag.offsetLeft < -this.tagBodyLeft) {
152151
this.tagBodyLeft = -tag.offsetLeft + 10;
153152
} else if (tag.offsetLeft + 10 > -this.tagBodyLeft && tag.offsetLeft + tag.offsetWidth < -this.tagBodyLeft + this.$refs.scrollCon.offsetWidth - 100) {
154-
// 标签在可视区域
155153
this.tagBodyLeft = Math.min(0, this.$refs.scrollCon.offsetWidth - 100 - tag.offsetWidth - tag.offsetLeft - 20);
156154
} else {
157-
// 标签在可视区域右侧
158155
this.tagBodyLeft = -(tag.offsetLeft - (this.$refs.scrollCon.offsetWidth - 100 - tag.offsetWidth) + 20);
159156
}
160157
}
@@ -168,7 +165,7 @@ export default {
168165
this.moveToView(tag);
169166
}
170167
});
171-
}, 1); // 这里不设定时器就会有偏移bug
168+
}, 1); //bug
172169
this.tagsCount = this.tagsList.length;
173170
},
174171
watch: {

‎vue/src/views/main.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@
9292
background: white;
9393
box-shadow: -3px 0 15px 3px rgba(0, 0, 0, .1);
9494
z-index: 10;
95+
padding-left: 10px;
96+
padding-right: 10px;
97+
width: auto;
9598
}
9699
}
97100
}

0 commit comments

Comments
 (0)