Skip to content

K
k3s
Commit c365829d authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #46487 from CaoShuFeng/LANG

Automatic merge from submit-queue (batch tested with PRs 46686, 45049, 46323, 45708, 46487) set LANG to 'C' in Makefile Now we support multi-languages: https://github.com/kubernetes/kubernetes/tree/master/translations But some tests support only English. This test fails when LANG is set to zh_CN.UTF-8: https://github.com/kubernetes/kubernetes/blob/master/hack/make-rules/test-cmd-util.sh#L2838 The expected err string is translated to Chinese: https://github.com/kubernetes/kubernetes/blob/master/translations/kubectl/zh_CN/LC_MESSAGES/k8s.po#L82 **Release note**: ``` NONE ```
parents 05e2e1fd 58c62007
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
hack/make-rules/test-cmd-util.sh
View file @ c365829d
...@@ -20,6 +20,9 @@ set -o errexit ...@@ -20,6 +20,9 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
# Set locale to ensure english responses from kubectl commands
export LANG=C
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
# Expects the following has already been done by whatever sources this script # Expects the following has already been done by whatever sources this script
# source "${KUBE_ROOT}/hack/lib/init.sh" # source "${KUBE_ROOT}/hack/lib/init.sh"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment