diff options
| author |  axel <axel@liljencrantz.se> | 2006-03-10 23:40:39 +1000 |
|---|---|---|
| committer | axel <axel@liljencrantz.se> | 2006-03-10 23:40:39 +1000 |
| commit | f320f5f7104714145728730e7dc32f31a4e4c27e (patch) | |
| tree | d7957623cc3c73af9cd61e1006ab736468ba9a56 | |
| parent | 32b531667aa1e7f085b8316ffd5c8df7f6b3987c (diff) | |
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
| -rw-r--r-- | etc/fish.in | 15 | ||||
| -rw-r--r-- | share/fish | 15 |
2 files changed, 15 insertions, 15 deletions
diff --git a/etc/fish.in b/etc/fish.in index ef9bcf4d..f4bb6516 100644 --- a/etc/fish.in +++ b/etc/fish.in @@ -39,6 +39,21 @@ 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 # situation as well? # @@ -11,21 +11,6 @@ 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 # |