mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-26 12:53:13 +00:00
Move LANG init back to /etc where it belongs. IT was temporarily moved earlier to do some translations at init time, but that is no longer needed
darcs-hash:20060310134039-ac50b-e826176a9d574b26235013384963f2dd7e9e9457.gz
This commit is contained in:
parent
32b531667a
commit
f320f5f710
2 changed files with 15 additions and 15 deletions
15
etc/fish.in
15
etc/fish.in
|
@ -38,6 +38,21 @@ for i in $path_list
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
|
# Set some value for LANG if nothing was set before, and this is a
|
||||||
|
# login shell. Also check for i18n information in /etc/sysconfig/i18n
|
||||||
|
#
|
||||||
|
|
||||||
|
if status --is-login
|
||||||
|
if not set -q LANG >/dev/null
|
||||||
|
set -gx LANG en_US.UTF-8
|
||||||
|
end
|
||||||
|
|
||||||
|
if test -f /etc/sysconfig/i18n
|
||||||
|
eval (cat /etc/sysconfig/i18n |sed -ne 's/^\([a-zA-Z]*\)=\(.*\)$/set -gx \1 \2;/p')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
#
|
#
|
||||||
# Put linux console in unicode mode. Should this be done in any other
|
# Put linux console in unicode mode. Should this be done in any other
|
||||||
# situation as well?
|
# situation as well?
|
||||||
|
|
15
share/fish
15
share/fish
|
@ -10,21 +10,6 @@
|
||||||
|
|
||||||
set -g fish_function_path $PWD/functions/
|
set -g fish_function_path $PWD/functions/
|
||||||
|
|
||||||
#
|
|
||||||
# Set some value for LANG if nothing was set before, and this is a
|
|
||||||
# login shell. Also check for i18n information in /etc/sysconfig/i18n
|
|
||||||
#
|
|
||||||
|
|
||||||
if status --is-login
|
|
||||||
if not set -q LANG >/dev/null
|
|
||||||
set -gx LANG en_US.UTF-8
|
|
||||||
end
|
|
||||||
|
|
||||||
if test -f /etc/sysconfig/i18n
|
|
||||||
eval (cat /etc/sysconfig/i18n |sed -ne 's/^\([a-zA-Z]*\)=\(.*\)$/set -gx \1 \2;/p')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Don't need completions in non-interactive mode
|
# Don't need completions in non-interactive mode
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in a new issue