Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
12bb8c5c
M
minikube
项目概览
Chu Peng 楚鹏
/
minikube
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
minikube
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
12bb8c5c
编写于
6月 24, 2019
作者:
S
Sharif Elgamal
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add translation files into the minikube binary
上级
550218e7
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
9 deletion
+14
-9
.gitignore
.gitignore
+1
-0
Makefile
Makefile
+11
-6
pkg/minikube/translate/translate.go
pkg/minikube/translate/translate.go
+2
-3
translations/fr-FR.json
translations/fr-FR.json
+0
-0
translations/zh-CN.json
translations/zh-CN.json
+0
-0
未找到文件。
.gitignore
浏览文件 @
12bb8c5c
...
...
@@ -34,6 +34,7 @@ _testmain.go
deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/VERSION
/pkg/minikube/assets/assets.go
/pkg/minikube/translate/translations.go
/minikube
.DS_Store
...
...
Makefile
浏览文件 @
12bb8c5c
...
...
@@ -106,7 +106,7 @@ out/minikube$(IS_EXE): out/minikube-$(GOOS)-$(GOARCH)$(IS_EXE)
out/minikube-windows-amd64.exe
:
out/minikube-windows-amd64
cp
out/minikube-windows-amd64 out/minikube-windows-amd64.exe
out/minikube-%
:
pkg/minikube/assets/assets.go $(shell find $(CMD_SOURCE_DIRS) -type f -name "*.go")
out/minikube-%
:
pkg/minikube/assets/assets.go
pkg/minikube/translate/translations.go
$(shell find $(CMD_SOURCE_DIRS) -type f -name "*.go")
ifeq
($(MINIKUBE_BUILD_IN_DOCKER),y)
$(
call
DOCKER,
$(BUILD_IMAGE)
,/usr/bin/make
$@
)
else
...
...
@@ -157,11 +157,11 @@ iso_in_docker:
--user
$(
shell
id
-u
)
:
$(
shell
id
-g
)
--env
HOME
=
/tmp
--env
IN_DOCKER
=
1
\
$(ISO_BUILD_IMAGE)
/bin/bash
test-iso
:
pkg/minikube/assets/assets.go
test-iso
:
pkg/minikube/assets/assets.go
pkg/minikube/translate/translations.go
go
test
-v
./test/integration
--tags
=
iso
--minikube-args
=
"--iso-url=file://
$(
shell
pwd
)
/out/buildroot/output/images/rootfs.iso9660"
.PHONY
:
test-pkg
test-pkg/%
:
pkg/minikube/assets/assets.go
test-pkg/%
:
pkg/minikube/assets/assets.go
pkg/minikube/translate/translations.go
go
test
-v
-test
.timeout
=
60m ./
$*
--tags
=
"
$(MINIKUBE_BUILD_TAGS)
"
.PHONY
:
all
...
...
@@ -183,7 +183,7 @@ integration-versioned: out/minikube
go
test
-v
-test
.timeout
=
60m ./test/integration
--tags
=
"
$(MINIKUBE_INTEGRATION_BUILD_TAGS)
versioned"
$(TEST_ARGS)
.PHONY
:
test
test
:
pkg/minikube/assets/assets.go
test
:
pkg/minikube/assets/assets.go
pkg/minikube/translate/translations.go
./test.sh
# Regenerates assets.go when template files have been updated
...
...
@@ -191,6 +191,10 @@ pkg/minikube/assets/assets.go: $(shell find deploy/addons -type f)
which go-bindata
||
GO111MODULE
=
off
GOBIN
=
$(GOPATH)
/bin go get github.com/jteeuwen/go-bindata/...
PATH
=
"
$(PATH)
:
$(GOPATH)
/bin"
go-bindata
-nomemcopy
-o
pkg/minikube/assets/assets.go
-pkg
assets deploy/addons/...
pkg/minikube/translate/translations.go
:
$(shell find translations/ -type f)
which go-bindata
||
GO111MODULE
=
off
GOBIN
=
$(GOPATH)
/bin go get github.com/jteeuwen/go-bindata/...
PATH
=
"
$(PATH)
:
$(GOPATH)
/bin"
go-bindata
-nomemcopy
-o
pkg/minikube/translate/translations.go
-pkg
translate translations/...
.PHONY
:
cross
cross
:
out/minikube-linux-$(GOARCH) out/minikube-darwin-amd64 out/minikube-windows-amd64.exe
...
...
@@ -210,6 +214,7 @@ checksum:
clean
:
rm
-rf
$(BUILD_DIR)
rm
-f
pkg/minikube/assets/assets.go
rm
-f
pkg/minikube/translate/translations.go
rm
-rf
./vendor
.PHONY
:
gendocs
...
...
@@ -241,7 +246,7 @@ out/linters/golangci-lint:
curl
-sfL
https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh
-s
--
-b
out/linters
$(GOLINT_VERSION)
.PHONY
:
lint
lint
:
pkg/minikube/assets/assets.go out/linters/golangci-lint
lint
:
pkg/minikube/assets/assets.go
pkg/minikube/translate/translations.go
out/linters/golangci-lint
./out/linters/golangci-lint run
\
--deadline
4m
\
--build-tags
"
${MINIKUBE_INTEGRATION_BUILD_TAGS}
"
\
...
...
@@ -259,7 +264,7 @@ reportcard:
mdlint
:
@
$(MARKDOWNLINT)
$(MINIKUBE_MARKDOWN_FILES)
out/docs/minikube.md
:
$(shell find cmd) $(shell find pkg/minikube/constants) pkg/minikube/assets/assets.go
out/docs/minikube.md
:
$(shell find cmd) $(shell find pkg/minikube/constants) pkg/minikube/assets/assets.go
pkg/minikube/translate/translations.go
go run
-ldflags
=
"
$(MINIKUBE_LDFLAGS)
"
hack/help_text/gen_help_text.go
out/minikube_$(DEB_VERSION).deb
:
out/minikube-linux-amd64
...
...
pkg/minikube/translate/translate.go
浏览文件 @
12bb8c5c
...
...
@@ -18,7 +18,6 @@ package translate
import
(
"encoding/json"
"io/ioutil"
"strings"
"github.com/cloudfoundry-attic/jibber_jabber"
...
...
@@ -74,8 +73,8 @@ func DetermineLocale() {
}
// Load translations for preferred language into memory.
translationFile
:=
"
pkg/minikube/translate/
translations/"
+
preferredLanguage
.
String
()
+
".json"
t
,
err
:=
ioutil
.
ReadFile
(
translationFile
)
translationFile
:=
"translations/"
+
preferredLanguage
.
String
()
+
".json"
t
,
err
:=
Asset
(
translationFile
)
if
err
!=
nil
{
glog
.
Infof
(
"Failed to load translation file for %s: %v"
,
preferredLanguage
.
String
(),
err
)
return
...
...
pkg/minikube/translate/
translations/fr-FR.json
→
translations/fr-FR.json
浏览文件 @
12bb8c5c
文件已移动
pkg/minikube/translate/
translations/zh-CN.json
→
translations/zh-CN.json
浏览文件 @
12bb8c5c
文件已移动
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录