Skip to content
This repository was archived by the owner on Jan 20, 2021. It is now read-only.

Commit fc9f618

Browse files
committed
auth: translation menu in login form
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent c9de1ff commit fc9f618

File tree

5 files changed

+11
-8
lines changed

5 files changed

+11
-8
lines changed

src/components/header/TranslationMenu.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
// under the License.
1717

1818
<template>
19-
2019
<a-dropdown>
2120
<span class="action ant-dropdown-link translation-menu">
2221
<font-awesome-icon :icon="['fas', 'language']" size="lg" />
@@ -44,7 +43,6 @@
4443
<a-menu-item key="ru_RU" :value="ruRU">Русский</a-menu-item>
4544
</a-menu>
4645
</a-dropdown>
47-
4846
</template>
4947

5048
<script>

src/config/section/event.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default {
3232
api: 'archiveEvents',
3333
icon: 'book',
3434
label: 'Archive Event',
35-
listView: true,
35+
listView: false,
3636
dataView: true,
3737
args: ['ids'],
3838
mapping: {
@@ -45,7 +45,7 @@ export default {
4545
api: 'deleteEvents',
4646
icon: 'delete',
4747
label: 'Delete Event',
48-
listView: true,
48+
listView: false,
4949
dataView: true,
5050
args: ['ids'],
5151
mapping: {

src/locales/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,7 @@
612612
"label.kubernetes.version.update": "Update Kubernetes Version",
613613
"label.link.domain.to.ldap": "Link Domain to LDAP",
614614
"label.local.storage":"Local Storage",
615+
"label.login":"Login",
615616
"label.make.project.owner": "Make account project owner",
616617
"label.management.ips":"Management IP Addresses",
617618
"label.management.server":"Management Server",

src/locales/ja_JP.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,7 @@
505505
"label.gslb.lb.remove": "\u3053\u306e GSLB \u304b\u3089\u8ca0\u8377\u5206\u6563\u3092\u524a\u9664",
506506
"label.instanciate.template.associate.profile.blade": "\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u4f5c\u6210\u304a\u3088\u3073\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u3068\u30d6\u30ec\u30fc\u30c9\u306e\u95a2\u9023\u4ed8\u3051",
507507
"label.link.domain.to.ldap": "\u30c9\u30e1\u30a4\u30f3\u3092 LDAP \u306b\u30ea\u30f3\u30af\u3059\u308b",
508+
"label.login": "ログオン",
508509
"label.make.project.owner": "\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u6240\u6709\u8005\u5316",
509510
"label.metrics": "\u30e1\u30c8\u30ea\u30c3\u30af\u30b9",
510511
"label.migrate.instance.to.host": "\u5225\u306e\u30db\u30b9\u30c8\u3078\u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u79fb\u884c",
@@ -891,4 +892,4 @@
891892
"zoneId": "\u30be\u30fc\u30f3",
892893
"zoneid": "\u30be\u30fc\u30f3",
893894
"zonename": "\u30be\u30fc\u30f3"
894-
}
895+
}

src/views/auth/Login.vue

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<a-tab-pane key="cs">
3434
<span slot="tab">
3535
<a-icon type="safety" />
36-
Portal Login
36+
Portal {{ $t('label.login') }}
3737
</span>
3838
<a-form-item>
3939
<a-input
@@ -82,7 +82,7 @@
8282
<a-tab-pane key="saml" :disabled="idps.length === 0">
8383
<span slot="tab">
8484
<a-icon type="audit" />
85-
Single-Sign-On
85+
Single Sign-On
8686
</span>
8787
<a-form-item>
8888
<a-select v-decorator="['idp', { initialValue: selectedIdp } ]">
@@ -102,18 +102,21 @@
102102
class="login-button"
103103
:loading="state.loginBtn"
104104
:disabled="state.loginBtn"
105-
>Log In</a-button>
105+
>{{ $t('label.login') }}</a-button>
106106
</a-form-item>
107+
<translation-menu/>
107108
</a-form>
108109
</template>
109110

110111
<script>
111112
import { api } from '@/api'
112113
import { mapActions } from 'vuex'
113114
import config from '@/config/settings'
115+
import TranslationMenu from '@/components/header/TranslationMenu'
114116
115117
export default {
116118
components: {
119+
TranslationMenu
117120
},
118121
data () {
119122
return {

0 commit comments

Comments
 (0)