Skip to content

sysding: Enhance locale setup with additional variables #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hexalantes wants to merge 1 commit into
base: oi
Choose a base branch
from
Open

sysding: Enhance locale setup with additional variables #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions sysding
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,21 +336,35 @@ setup_locale() {
# set up zones default locale
typeset def_locale
typeset rt

typeset lc_base
typeset lc_lang
typeset lc_language
def_locale="$1"
rt=0

if ! locale -a | egrep "^${def_locale}$$" 2>&1 >/dev/null ; then
if ! locale -a | egrep "^${def_locale}\$" >/dev/null 2>&1 ; then
# selected locale is not installed - fall back to C and log error
log_error "specified locale ${def_locale} not installed, reverting to C"
def_local="C"
rt=42
fi

log_error "specified locale ${def_locale} not installed, reverting to C"
def_locale="C"
rt=42
fi
printf ",g,^LANG=,d\na\nLANG=%s\n.\nw\nq\n" "${def_locale}" | ed /etc/default/init

REBOOT_NEEDED=yes
# set locale variables for gui apps if it's not fallback
if [ "${def_locale}" != "C" ]; then
lc_base="${def_locale%%.*}"
lc_lang="${lc_base%%_*}"
if [ "${lc_lang}" = "en" ]; then
lc_language="${lc_base}:en"
else
lc_language="${lc_base}:${lc_lang}:en"
fi

printf "export LANG=%s\nexport LC_TIME=\$LANG\nexport LC_MESSAGES=\$LANG\nexport LANGUAGE=%s\n" \
"${def_locale}" "${lc_language}" >> /etc/profile
fi

REBOOT_NEEDED=yes
return ${rt}
}

Expand Down