X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=lib%2Fbranch_rename.tcl;h=166538808f461275075e2b03c56ddc15b5813e1a;hb=d3bcf55d675a255c00d2743c00978e1f42c93572;hp=405101637f0d224e341abd1177e3660cf8ea73a8;hpb=fe813d4e80426971ce17f6ea03f97bc1e26383a1;p=git.git

diff --git a/lib/branch_rename.tcl b/lib/branch_rename.tcl
index 405101637..166538808 100644
--- a/lib/branch_rename.tcl
+++ b/lib/branch_rename.tcl
@@ -8,10 +8,10 @@ field oldname
 field newname
 
 constructor dialog {} {
-	global all_heads current_branch
+	global current_branch
 
 	make_toplevel top w
-	wm title $top "[appname] ([reponame]): Rename Branch"
+	wm title $top [append "[appname] ([reponame]): " [mc "Rename Branch"]]
 	if {$top ne {.}} {
 		wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
 	}
@@ -19,24 +19,24 @@ constructor dialog {} {
 	set oldname $current_branch
 	set newname [get_config gui.newbranchtemplate]
 
-	label $w.header -text {Rename Branch} -font font_uibold
+	label $w.header -text [mc "Rename Branch"] -font font_uibold
 	pack $w.header -side top -fill x
 
 	frame $w.buttons
-	button $w.buttons.rename -text Rename \
+	button $w.buttons.rename -text [mc Rename] \
 		-default active \
 		-command [cb _rename]
 	pack $w.buttons.rename -side right
-	button $w.buttons.cancel -text {Cancel} \
+	button $w.buttons.cancel -text [mc Cancel] \
 		-command [list destroy $w]
 	pack $w.buttons.cancel -side right -padx 5
 	pack $w.buttons -side bottom -fill x -pady 10 -padx 10
 
 	frame $w.rename
-	label $w.rename.oldname_l -text {Branch:}
-	eval tk_optionMenu $w.rename.oldname_m @oldname $all_heads
+	label $w.rename.oldname_l -text [mc "Branch:"]
+	eval tk_optionMenu $w.rename.oldname_m @oldname [load_all_heads]
 
-	label $w.rename.newname_l -text {New Name:}
+	label $w.rename.newname_l -text [mc "New Name:"]
 	entry $w.rename.newname_t \
 		-borderwidth 1 \
 		-relief sunken \
@@ -64,7 +64,7 @@ constructor dialog {} {
 }
 
 method _rename {} {
-	global all_heads current_branch
+	global current_branch
 
 	if {$oldname eq {}} {
 		tk_messageBox \
@@ -72,7 +72,7 @@ method _rename {} {
 			-type ok \
 			-title [wm title $w] \
 			-parent $w \
-			-message "Please select a branch to rename."
+			-message [mc "Please select a branch to rename."]
 		focus $w.rename.oldname_m
 		return
 	}
@@ -83,7 +83,7 @@ method _rename {} {
 			-type ok \
 			-title [wm title $w] \
 			-parent $w \
-			-message "Please supply a branch name."
+			-message [mc "Please supply a branch name."]
 		focus $w.rename.newname_t
 		return
 	}
@@ -93,7 +93,7 @@ method _rename {} {
 			-type ok \
 			-title [wm title $w] \
 			-parent $w \
-			-message "Branch '$newname' already exists."
+			-message [mc "Branch '%s' already exists." $newname]
 		focus $w.rename.newname_t
 		return
 	}
@@ -103,7 +103,7 @@ method _rename {} {
 			-type ok \
 			-title [wm title $w] \
 			-parent $w \
-			-message "We do not like '$newname' as a branch name."
+			-message [mc "'%s' is not an acceptable branch name." $newname]
 		focus $w.rename.newname_t
 		return
 	}
@@ -114,18 +114,10 @@ method _rename {} {
 			-type ok \
 			-title [wm title $w] \
 			-parent $w \
-			-message "Failed to rename '$oldname'.\n\n$err"
+			-message [strcat [mc "Failed to rename '%s'." $oldname] "\n\n$err"]
 		return
 	}
 
-	set oldidx [lsearch -exact -sorted $all_heads $oldname]
-	if {$oldidx >= 0} {
-		set all_heads [lreplace $all_heads $oldidx $oldidx]
-	}
-	lappend all_heads $newname
-	set all_heads [lsort $all_heads]
-	populate_branch_menu
-
 	if {$current_branch eq $oldname} {
 		set current_branch $newname
 	}