All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christian Stimming <stimming@tuhh.de>
To: Paul Mackerras <paulus@samba.org>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: [PATCH 8/9] gitk i18n: More i18n markup: gdttype optionmenu.
Date: Wed, 7 Nov 2007 18:46:13 +0100	[thread overview]
Message-ID: <200711071846.14097.stimming@tuhh.de> (raw)
In-Reply-To: <200711071845.40236.stimming@tuhh.de>

---
 gitk |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gitk b/gitk
index 3acb0be..b861f8d 100755
--- a/gitk
+++ b/gitk
@@ -769,11 +769,11 @@ proc makewindow {} {
     label .tf.lbar.flab2 -text " [mc "commit"] " -font uifont
     pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \
 	-side left -fill y
-    set gdttype "containing:"
+    set gdttype [mc "containing:"]
     set gm [tk_optionMenu .tf.lbar.gdttype gdttype \
-		"containing:" \
-		"touching paths:" \
-		"adding/removing string:"]
+		[mc "containing:"] \
+		[mc "touching paths:"] \
+		[mc "adding/removing string:"]]
     trace add variable gdttype write gdttype_change
     $gm conf -font uifont
     .tf.lbar.gdttype conf -font uifont
@@ -1743,12 +1743,12 @@ proc flist_hl {only} {
     global flist_menu_file findstring gdttype
 
     set x [shellquote $flist_menu_file]
-    if {$only || $findstring eq {} || $gdttype ne "touching paths:"} {
+    if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} {
 	set findstring $x
     } else {
 	append findstring " " $x
     }
-    set gdttype "touching paths:"
+    set gdttype [mc "touching paths:"]
 }
 
 # Functions for adding and removing shell-type quoting
@@ -2313,7 +2313,7 @@ proc gdttype_change {name ix op} {
 
     stopfinding
     if {$findstring ne {}} {
-	if {$gdttype eq "containing:"} {
+	if {$gdttype eq [mc "containing:"]} {
 	    if {$highlight_files ne {}} {
 		set highlight_files {}
 		hfiles_change
@@ -2336,7 +2336,7 @@ proc find_change {name ix op} {
     global gdttype findstring highlight_files
 
     stopfinding
-    if {$gdttype eq "containing:"} {
+    if {$gdttype eq [mc "containing:"]} {
 	findcom_change
     } else {
 	if {$highlight_files ne $findstring} {
@@ -2360,7 +2360,7 @@ proc findcom_change args {
     catch {unset nhighlights}
     unbolden
     unmarkmatches
-    if {$gdttype ne "containing:" || $findstring eq {}} {
+    if {$gdttype ne [mc "containing:"] || $findstring eq {}} {
 	set findpattern {}
     } elseif {$findtype eq [mc "Regexp"]} {
 	set findpattern $findstring
@@ -2388,12 +2388,12 @@ proc makepatterns {l} {
 proc do_file_hl {serial} {
     global highlight_files filehighlight highlight_paths gdttype fhl_list
 
-    if {$gdttype eq "touching paths:"} {
+    if {$gdttype eq [mc "touching paths:"]} {
 	if {[catch {set paths [shellsplit $highlight_files]}]} return
 	set highlight_paths [makepatterns $paths]
 	highlight_filelist
 	set gdtargs [concat -- $paths]
-    } elseif {$gdttype eq "adding/removing string:"} {
+    } elseif {$gdttype eq [mc "adding/removing string:"]} {
 	set gdtargs [list "-S$highlight_files"]
     } else {
 	# must be "containing:", i.e. we're searching commit info
@@ -4325,7 +4325,7 @@ proc findmore {} {
     }
     set found 0
     set domore 1
-    if {$gdttype eq "containing:"} {
+    if {$gdttype eq [mc "containing:"]} {
 	for {} {$n > 0} {incr n -1; incr l $find_dirn} {
 	    set id [lindex $displayorder $l]
 	    # shouldn't happen unless git log doesn't give all the commits...
-- 
1.5.3.4.206.g58ba4

  reply	other threads:[~2007-11-07 17:18 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-07 17:39 [PATCH 1/9] gitk i18n implementation: Add Makefile with rules for po file creation and installation Christian Stimming
2007-11-07 17:40 ` [PATCH 2/9] gitk i18n implementation: Import msgcat for message string translation; load translation catalogs Christian Stimming
2007-11-07 17:42   ` [PATCH 3/9] gitk i18n implementation: Markup many strings for translation Christian Stimming
2007-11-07 17:44     ` [PATCH 4/9] gitk i18n: Initial German translation Christian Stimming
2007-11-07 17:44       ` [PATCH 5/9] gitk i18n: More i18n markup: findtype options menu Christian Stimming
2007-11-07 17:45         ` [PATCH 6/9] gitk i18n: More i18n markup: highlight_related and selectedhlview " Christian Stimming
2007-11-07 17:45           ` [PATCH 7/9] gitk i18n: More i18n markup: findloc optionmenu Christian Stimming
2007-11-07 17:46             ` Christian Stimming [this message]
2007-11-07 17:47               ` [PATCH 9/9] gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8 Christian Stimming
2007-12-11 23:22       ` [PATCH 4/9] gitk i18n: Initial German translation Paul Mackerras
2007-12-12  8:23         ` Christian Stimming
2007-11-07 21:38 ` [PATCH 1/9] gitk i18n implementation: Add Makefile with rules for po file creation and installation Junio C Hamano
2007-11-07 22:18   ` Christian Stimming

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200711071846.14097.stimming@tuhh.de \
    --to=stimming@tuhh.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.