Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
K
koko
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
koko
Commits
421db984
Unverified
Commit
421db984
authored
Sep 18, 2019
by
Eric_Lee
Committed by
GitHub
Sep 18, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复语言设置无效的问题 (#84)
parent
8c252932
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
3 deletions
+6
-3
config.go
pkg/config/config.go
+1
-1
banner.go
pkg/handler/banner.go
+1
-1
i18n.go
pkg/i18n/i18n.go
+1
-1
koko.go
pkg/koko/koko.go
+2
-0
server.go
pkg/sshd/server.go
+1
-0
No files found.
pkg/config/config.go
View file @
421db984
...
@@ -51,7 +51,7 @@ func (c *Config) EnsureConfigValid() {
...
@@ -51,7 +51,7 @@ func (c *Config) EnsureConfigValid() {
if
c
.
LanguageCode
!=
""
&&
c
.
Language
==
""
{
if
c
.
LanguageCode
!=
""
&&
c
.
Language
==
""
{
c
.
Language
=
c
.
LanguageCode
c
.
Language
=
c
.
LanguageCode
}
}
if
c
.
Language
==
""
{
if
c
.
Language
==
""
{
c
.
Language
=
"zh"
c
.
Language
=
"zh"
}
}
// 确保至少有一个认证
// 确保至少有一个认证
...
...
pkg/handler/banner.go
View file @
421db984
...
@@ -41,7 +41,7 @@ func (mi *MenuItem) Text() string {
...
@@ -41,7 +41,7 @@ func (mi *MenuItem) Text() string {
type
Menu
[]
MenuItem
type
Menu
[]
MenuItem
func
init
()
{
func
Initial
()
{
defaultTitle
=
utils
.
WrapperTitle
(
i18n
.
T
(
"Welcome to use Jumpserver open source fortress system"
))
defaultTitle
=
utils
.
WrapperTitle
(
i18n
.
T
(
"Welcome to use Jumpserver open source fortress system"
))
menu
=
Menu
{
menu
=
Menu
{
{
id
:
1
,
instruct
:
"ID"
,
helpText
:
i18n
.
T
(
"directly login"
)},
{
id
:
1
,
instruct
:
"ID"
,
helpText
:
i18n
.
T
(
"directly login"
)},
...
...
pkg/i18n/i18n.go
View file @
421db984
...
@@ -9,7 +9,7 @@ import (
...
@@ -9,7 +9,7 @@ import (
"github.com/jumpserver/koko/pkg/config"
"github.com/jumpserver/koko/pkg/config"
)
)
func
init
()
{
func
Initial
()
()
{
cf
:=
config
.
GetConf
()
cf
:=
config
.
GetConf
()
localePath
:=
path
.
Join
(
cf
.
RootPath
,
"locale"
)
localePath
:=
path
.
Join
(
cf
.
RootPath
,
"locale"
)
if
strings
.
HasPrefix
(
cf
.
Language
,
"zh"
)
{
if
strings
.
HasPrefix
(
cf
.
Language
,
"zh"
)
{
...
...
pkg/koko/koko.go
View file @
421db984
...
@@ -9,6 +9,7 @@ import (
...
@@ -9,6 +9,7 @@ import (
"github.com/jumpserver/koko/pkg/config"
"github.com/jumpserver/koko/pkg/config"
"github.com/jumpserver/koko/pkg/httpd"
"github.com/jumpserver/koko/pkg/httpd"
"github.com/jumpserver/koko/pkg/i18n"
"github.com/jumpserver/koko/pkg/logger"
"github.com/jumpserver/koko/pkg/logger"
"github.com/jumpserver/koko/pkg/service"
"github.com/jumpserver/koko/pkg/service"
"github.com/jumpserver/koko/pkg/sshd"
"github.com/jumpserver/koko/pkg/sshd"
...
@@ -45,6 +46,7 @@ func RunForever() {
...
@@ -45,6 +46,7 @@ func RunForever() {
func
bootstrap
()
{
func
bootstrap
()
{
config
.
Initial
()
config
.
Initial
()
i18n
.
Initial
()
logger
.
Initial
()
logger
.
Initial
()
service
.
Initial
()
service
.
Initial
()
Initial
()
Initial
()
...
...
pkg/sshd/server.go
View file @
421db984
...
@@ -15,6 +15,7 @@ import (
...
@@ -15,6 +15,7 @@ import (
var
sshServer
*
ssh
.
Server
var
sshServer
*
ssh
.
Server
func
StartServer
()
{
func
StartServer
()
{
handler
.
Initial
()
conf
:=
config
.
GetConf
()
conf
:=
config
.
GetConf
()
hostKey
:=
HostKey
{
Value
:
conf
.
HostKey
,
Path
:
conf
.
HostKeyFile
}
hostKey
:=
HostKey
{
Value
:
conf
.
HostKey
,
Path
:
conf
.
HostKeyFile
}
logger
.
Debug
(
"Loading host key"
)
logger
.
Debug
(
"Loading host key"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment