diff --git a/ChangeLog b/ChangeLog index 8db751e94..703a9a932 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ 2005-01-23 Clint Adams - * 20737: Completion/Unix/Command/_subversion: run svn commands with - LANG=C. + * 20737, 20739: Completion/Unix/Command/_subversion: run svn + commands with LC_MESSAGES=C. 2005-01-22 Clint Adams diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion index 0895bf4d5..81188b25d 100644 --- a/Completion/Unix/Command/_subversion +++ b/Completion/Unix/Command/_subversion @@ -41,7 +41,7 @@ _svn_command () { if (( ! $+_svn_cmds )); then typeset -gA _svn_cmds _svn_cmds=( - ${=${(f)${${"$(LANG=C _call_program commands svn help)"#l#*Available subcommands:}%%Subversion is a tool*}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:} + ${=${(f)${${"$(LC_MESSAGES=C _call_program commands svn help)"#l#*Available subcommands:}%%Subversion is a tool*}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:} ) fi @@ -64,10 +64,10 @@ _svn_command () { _svn_subcommand () { local subcmd _svn_subcmds _svn_subcmd_usage - _svn_subcmd_usage=${${(M)${(f)"$(LANG=C _call_program options svn help $1)"}:#usage:*}#usage: $1 } + _svn_subcmd_usage=${${(M)${(f)"$(LC_MESSAGES=C _call_program options svn help $1)"}:#usage:*}#usage: $1 } _svn_subcmds=( - ${${=${${${(M)${(f)"$(LANG=C _call_program options svn help $1)"##*Valid options:}:#* :*}%% #:*}/ arg/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}[2,-1]} + ${${=${${${(M)${(f)"$(LC_MESSAGES=C _call_program options svn help $1)"##*Valid options:}:#* :*}%% #:*}/ arg/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}[2,-1]} ) case $1 in; @@ -108,7 +108,7 @@ _svnadmin_command () { if (( ! $+_svnadmin_cmds )); then typeset -gA _svnadmin_cmds _svnadmin_cmds=( - ${=${(f)${${"$(LANG=C _call_program commands svnadmin help)"#l#*Available subcommands:}}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:} + ${=${(f)${${"$(LC_MESSAGES=C _call_program commands svnadmin help)"#l#*Available subcommands:}}}/(#s)[[:space:]]#(#b)([a-z]##)[[:space:]]#(\([a-z, ?]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:} ) fi @@ -131,10 +131,10 @@ _svnadmin_command () { _svnadmin_subcommand () { local subcmd _svnadmin_subcmds _svnadmin_subcmd_usage - _svnadmin_subcmd_usage=${${(M)${(f)"$(LANG=C _call_program options svnadmin help $1)"}:#$1: usage:*}#$1: usage: svnadmin $1 } + _svnadmin_subcmd_usage=${${(M)${(f)"$(LC_MESSAGES=C _call_program options svnadmin help $1)"}:#$1: usage:*}#$1: usage: svnadmin $1 } _svnadmin_subcmds=( - ${${=${${${(M)${(f)"$(LANG=C _call_program options svnadmin help $1)"##*Valid options:}:#*:*}%% #:*}/ arg/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}[2,-1]} + ${${=${${${(M)${(f)"$(LC_MESSAGES=C _call_program options svnadmin help $1)"##*Valid options:}:#*:*}%% #:*}/ arg/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}[2,-1]} ) [[ "$_svnadmin_subcmd_usage" == *REPOS_PATH* ]] &&