Tack-Support
/
powerlevel10k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

attempt to make locale workarounds more robust

Browse Source
pull/527/head
romkatv 5 years ago
parent 8a845210b5
commit 9ce0a0551e
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File

8
internal/icons.zsh
Unescape Escape View File

@ -643,9 +643,9 @@ function _p9k_init_icons() {
# Sadly, this is a part of public API. Its use is emphatically discouraged. # Sadly, this is a part of public API. Its use is emphatically discouraged.
function print_icon() { function print_icon() {
eval "$__p9k_intro" eval "$__p9k_intro"
if (( ! $+_p9k__locale )); then if (( ! $+__p9k_locale )); then
_p9k_init_locale _p9k_init_locale
[[ -z $_p9k__locale ]] || local LC_ALL=$_p9k__locale [[ -z $__p9k_locale ]] || local LC_ALL=$__p9k_locale
fi fi
_p9k_init_icons _p9k_init_icons
local var=POWERLEVEL9K_$1 local var=POWERLEVEL9K_$1
@ -663,9 +663,9 @@ function print_icon() {
# overrides into account. # overrides into account.
function get_icon_names() { function get_icon_names() {
eval "$__p9k_intro" eval "$__p9k_intro"
if (( ! $+_p9k__locale )); then if (( ! $+__p9k_locale )); then
_p9k_init_locale _p9k_init_locale
[[ -z $_p9k__locale ]] || local LC_ALL=$_p9k__locale [[ -z $__p9k_locale ]] || local LC_ALL=$__p9k_locale
fi fi
_p9k_init_icons _p9k_init_icons
local key local key

13
internal/p10k.zsh
Unescape Escape View File

@ -5160,7 +5160,7 @@ _p9k_dump_instant_prompt() {
local prompt_dir=${(q)prompt_dir} local prompt_dir=${(q)prompt_dir}
zmodload zsh/langinfo zmodload zsh/langinfo
if [[ \${langinfo[CODESET]:-} != (utf|UTF)(-|)8 ]]; then if [[ \${langinfo[CODESET]:-} != (utf|UTF)(-|)8 ]]; then
local lc=${(q)${${${_p9k__locale:-${(M)LC_CTYPE:#*.(utf|UTF)(-|)8}}:-${(M)LC_ALL:#*.(utf|UTF)(-|)8}}}:-${(M)LANG:#*.(utf|UTF)(-|)8}} local lc=${(q)${${${__p9k_locale:-${(M)LC_CTYPE:#*.(utf|UTF)(-|)8}}:-${(M)LC_ALL:#*.(utf|UTF)(-|)8}}}:-${(M)LANG:#*.(utf|UTF)(-|)8}}
local LC_ALL=\${lc:-\${\${(@M)\$(locale -a 2>/dev/null):#*.(utf|UTF)(-|)8}[1]:-en_US.UTF-8}} local LC_ALL=\${lc:-\${\${(@M)\$(locale -a 2>/dev/null):#*.(utf|UTF)(-|)8}[1]:-en_US.UTF-8}}
fi" fi"
>&$fd print -r -- ' >&$fd print -r -- '
@ -5812,9 +5812,9 @@ _p9k_precmd_impl() {
(( __p9k_enabled )) || return (( __p9k_enabled )) || return
if (( ! $+_p9k__locale )); then if (( ! $+__p9k_locale )); then
_p9k_init_locale _p9k_init_locale
[[ -z $_p9k__locale ]] || local LC_ALL=$_p9k__locale [[ -z $__p9k_locale ]] || local LC_ALL=$__p9k_locale
fi fi
if ! zle || [[ -z $_p9k__param_sig ]]; then if ! zle || [[ -z $_p9k__param_sig ]]; then
@ -5962,9 +5962,9 @@ function _p9k_prompt_overflow_bug() {
function _p9k_init_locale() { function _p9k_init_locale() {
zmodload zsh/langinfo zmodload zsh/langinfo
if [[ ${langinfo[CODESET]:-} != (utf|UTF)(-|)8 ]]; then if [[ ${langinfo[CODESET]:-} != (utf|UTF)(-|)8 ]]; then
typeset -g _p9k__locale=${${(@M)$(locale -a):#*.(utf|UTF)(-|)8}[1]:-en_US.UTF-8} typeset -g __p9k_locale=${${(@M)$(locale -a):#*.(utf|UTF)(-|)8}[1]:-en_US.UTF-8}
else else
typeset -g _p9k__locale= typeset -g __p9k_locale=
fi fi
} }
@ -7030,7 +7030,7 @@ _p9k_must_init() {
[[ $sig == $_p9k__param_sig ]] && return 1 [[ $sig == $_p9k__param_sig ]] && return 1
_p9k_deinit _p9k_deinit
fi fi
_p9k__param_pat=$'v52\1'${ZSH_VERSION}$'\1'${ZSH_PATCHLEVEL}$'\1' _p9k__param_pat=$'v53\1'${ZSH_VERSION}$'\1'${ZSH_PATCHLEVEL}$'\1'
_p9k__param_pat+=$'${#parameters[(I)POWERLEVEL9K_*]}\1${(%):-%n%#}\1$GITSTATUS_LOG_LEVEL\1' _p9k__param_pat+=$'${#parameters[(I)POWERLEVEL9K_*]}\1${(%):-%n%#}\1$GITSTATUS_LOG_LEVEL\1'
_p9k__param_pat+=$'$GITSTATUS_ENABLE_LOGGING\1$GITSTATUS_DAEMON\1$GITSTATUS_NUM_THREADS\1' _p9k__param_pat+=$'$GITSTATUS_ENABLE_LOGGING\1$GITSTATUS_DAEMON\1$GITSTATUS_NUM_THREADS\1'
_p9k__param_pat+=$'$DEFAULT_USER\1${ZLE_RPROMPT_INDENT:-1}\1$P9K_SSH\1$__p9k_ksh_arrays' _p9k__param_pat+=$'$DEFAULT_USER\1${ZLE_RPROMPT_INDENT:-1}\1$P9K_SSH\1$__p9k_ksh_arrays'
@ -7441,6 +7441,7 @@ _p9k_deinit() {
(( $+_p9k__iterm2_precmd )) && functions[iterm2_precmd]=$_p9k__iterm2_precmd (( $+_p9k__iterm2_precmd )) && functions[iterm2_precmd]=$_p9k__iterm2_precmd
(( $+_p9k__iterm2_decorate_prompt )) && functions[iterm2_decorate_prompt]=$_p9k__iterm2_decorate_prompt (( $+_p9k__iterm2_decorate_prompt )) && functions[iterm2_decorate_prompt]=$_p9k__iterm2_decorate_prompt
unset -m '(_POWERLEVEL9K_|P9K_|_p9k_)*~(P9K_SSH|P9K_TTY)' unset -m '(_POWERLEVEL9K_|P9K_|_p9k_)*~(P9K_SSH|P9K_TTY)'
[[ -n $__p9k_locale ]] || unset __p9k_locale
} }
typeset -gi __p9k_enabled=0 typeset -gi __p9k_enabled=0

4
powerlevel10k.zsh-theme
Unescape Escape View File

@ -24,13 +24,13 @@
local -a match mbegin mend reply local -a match mbegin mend reply
local -i MBEGIN MEND OPTIND local -i MBEGIN MEND OPTIND
local MATCH REPLY OPTARG IFS=$'\'' \t\n\0'\'' local MATCH REPLY OPTARG IFS=$'\'' \t\n\0'\''
[[ -z $_p9k__locale ]] || local LC_ALL=$_p9k__locale' [[ -z $__p9k_locale ]] || local LC_ALL=$__p9k_locale'
# The same as above but without `local -a reply` and `local REPLY`. # The same as above but without `local -a reply` and `local REPLY`.
typeset -gr __p9k_intro_no_reply='emulate -L zsh -o no_hist_expand -o extended_glob -o no_prompt_bang -o prompt_percent -o no_prompt_subst -o no_aliases -o no_bg_nice -o typeset_silent typeset -gr __p9k_intro_no_reply='emulate -L zsh -o no_hist_expand -o extended_glob -o no_prompt_bang -o prompt_percent -o no_prompt_subst -o no_aliases -o no_bg_nice -o typeset_silent
local -a match mbegin mend local -a match mbegin mend
local -i MBEGIN MEND OPTIND local -i MBEGIN MEND OPTIND
local REPLY OPTARG IFS=$'\'' \t\n\0'\'' local REPLY OPTARG IFS=$'\'' \t\n\0'\''
[[ -z $_p9k__locale ]] || local LC_ALL=$_p9k__locale' [[ -z $__p9k_locale ]] || local LC_ALL=$__p9k_locale'
} }
() { () {

Write Preview
Loading…
Cancel
Save