mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-15 01:56:24 -04:00
Don't depend on en_US locale to be installed (#4949)
For some of the git commands that lazygit uses, it needs to force the language to English because it parses git's output and needs to react to certain things. It used to do this by setting the locale to `en_US.UTF-8`; some users reported that this locale isn't available on their systems. Use the "C" locale instead, which achieves the same result and is guaranteed to be available everywhere. Fixes #4731.
This commit is contained in:
commit
47ca08240b
|
|
@ -244,8 +244,9 @@ func (self *RebaseCommands) PrepareInteractiveRebaseCommand(opts PrepareInteract
|
|||
|
||||
cmdObj.AddEnvVars(
|
||||
"DEBUG="+debug,
|
||||
"LANG=en_US.UTF-8", // Force using EN as language
|
||||
"LC_ALL=en_US.UTF-8", // Force using EN as language
|
||||
"LANG=C", // Force using English language
|
||||
"LC_ALL=C", // Force using English language
|
||||
"LC_MESSAGES=C", // Force using English language
|
||||
"GIT_SEQUENCE_EDITOR="+gitSequenceEditor,
|
||||
)
|
||||
|
||||
|
|
@ -277,8 +278,9 @@ func (self *RebaseCommands) GitRebaseEditTodo(todosFileContent []byte) error {
|
|||
|
||||
cmdObj.AddEnvVars(
|
||||
"DEBUG="+debug,
|
||||
"LANG=en_US.UTF-8", // Force using EN as language
|
||||
"LC_ALL=en_US.UTF-8", // Force using EN as language
|
||||
"LANG=C", // Force using English language
|
||||
"LC_ALL=C", // Force using English language
|
||||
"LC_MESSAGES=C", // Force using English language
|
||||
"GIT_EDITOR="+ex,
|
||||
"GIT_SEQUENCE_EDITOR="+ex,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -330,7 +330,7 @@ func (self *cmdObjRunner) runAndDetectCredentialRequest(
|
|||
promptUserForCredential func(CredentialType) <-chan string,
|
||||
) error {
|
||||
// setting the output to english so we can parse it for a username/password request
|
||||
cmdObj.AddEnvVars("LANG=en_US.UTF-8", "LC_ALL=en_US.UTF-8")
|
||||
cmdObj.AddEnvVars("LANG=C", "LC_ALL=C", "LC_MESSAGES=C")
|
||||
|
||||
return self.runAndStreamAux(cmdObj, func(handler *cmdHandler, cmdWriter io.Writer) {
|
||||
tr := io.TeeReader(handler.stdoutPipe, cmdWriter)
|
||||
|
|
|
|||
Loading…
Reference in a new issue