* [PATCH] git-gui: guitools: add the path in the confirmation dialog for tools which needs one
@ 2011-10-20 19:32 Bert Wesarg
2011-10-21 22:19 ` Pat Thoyts
0 siblings, 1 reply; 3+ messages in thread
From: Bert Wesarg @ 2011-10-20 19:32 UTC (permalink / raw)
To: Pat Thoyts; +Cc: git, Bert Wesarg
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---
lib/tools.tcl | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/tools.tcl b/lib/tools.tcl
index 95e6e55..39e08f0 100644
--- a/lib/tools.tcl
+++ b/lib/tools.tcl
@@ -87,8 +87,14 @@ proc tools_exec {fullname} {
return
}
} elseif {[is_config_true "guitool.$fullname.confirm"]} {
- if {[ask_popup [mc "Are you sure you want to run %s?" $fullname]] ne {yes}} {
- return
+ if {[is_config_true "guitool.$fullname.needsfile"]} {
+ if {[ask_popup [mc "Are you sure you want to run %s on file \"%s\"?" $fullname $current_diff_path]] ne {yes}} {
+ return
+ }
+ } else {
+ if {[ask_popup [mc "Are you sure you want to run %s?" $fullname]] ne {yes}} {
+ return
+ }
}
}
--
1.7.7.759.gfc8c6
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] git-gui: guitools: add the path in the confirmation dialog for tools which needs one
2011-10-20 19:32 [PATCH] git-gui: guitools: add the path in the confirmation dialog for tools which needs one Bert Wesarg
@ 2011-10-21 22:19 ` Pat Thoyts
2011-10-21 22:43 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Pat Thoyts @ 2011-10-21 22:19 UTC (permalink / raw)
To: Bert Wesarg; +Cc: git
Bert Wesarg <bert.wesarg@googlemail.com> writes:
>Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
>---
> lib/tools.tcl | 10 ++++++++--
> 1 files changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/lib/tools.tcl b/lib/tools.tcl
>index 95e6e55..39e08f0 100644
>--- a/lib/tools.tcl
>+++ b/lib/tools.tcl
>@@ -87,8 +87,14 @@ proc tools_exec {fullname} {
> return
> }
> } elseif {[is_config_true "guitool.$fullname.confirm"]} {
>- if {[ask_popup [mc "Are you sure you want to run %s?" $fullname]] ne {yes}} {
>- return
>+ if {[is_config_true "guitool.$fullname.needsfile"]} {
>+ if {[ask_popup [mc "Are you sure you want to run %s on file \"%s\"?" $fullname $current_diff_path]] ne {yes}} {
>+ return
>+ }
>+ } else {
>+ if {[ask_popup [mc "Are you sure you want to run %s?" $fullname]] ne {yes}} {
>+ return
>+ }
> }
> }
This looks good. I modified the string there to use positional
parameters as sometimes translations need to re-order things and the
msgcat format can support this using [mc {%2$s and %1$d} $first $second]
--
Pat Thoyts http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] git-gui: guitools: add the path in the confirmation dialog for tools which needs one
2011-10-21 22:19 ` Pat Thoyts
@ 2011-10-21 22:43 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2011-10-21 22:43 UTC (permalink / raw)
To: Pat Thoyts; +Cc: Bert Wesarg, git
Pat Thoyts <patthoyts@users.sourceforge.net> writes:
> .... I modified the string there to use positional
> parameters as sometimes translations need to re-order things and the
> msgcat format can support this using [mc {%2$s and %1$d} $first $second]
Good catch.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-10-21 22:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-20 19:32 [PATCH] git-gui: guitools: add the path in the confirmation dialog for tools which needs one Bert Wesarg
2011-10-21 22:19 ` Pat Thoyts
2011-10-21 22:43 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox