Skip to content

Commit 66496da

Browse files
committed
gitk: UI text: change "SHA1 ID" to "Commit ID"
SHA1 might not stay forever, and plans to use SHA256 already exist, so use the official name for it - "Commit ID". Only visible UI texts are modified to reduce the noise when using git-blame, while comments and variable names still contain SHA1/sha1. Signed-off-by: Avi Halachmi (:avih) <[email protected]>
1 parent b952bd0 commit 66496da

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

gitk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2223,7 +2223,7 @@ proc makewindow {} {
22232223
set sha1entry .tf.bar.sha1
22242224
set entries $sha1entry
22252225
set sha1but .tf.bar.sha1label
2226-
button $sha1but -text "[mc "SHA1 ID:"] " -state disabled -relief flat \
2226+
button $sha1but -text "[mc "Commit ID:"] " -state disabled -relief flat \
22272227
-command gotocommit -width 8
22282228
$sha1but conf -disabledforeground [$sha1but cget -foreground]
22292229
pack .tf.bar.sha1label -side left
@@ -8756,7 +8756,7 @@ proc sha1change {n1 n2 op} {
87568756
if {$state == "normal"} {
87578757
$sha1but conf -state normal -relief raised -text "[mc "Goto:"] "
87588758
} else {
8759-
$sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] "
8759+
$sha1but conf -state disabled -relief flat -text "[mc "Commit ID:"] "
87608760
}
87618761
}
87628762

@@ -8775,7 +8775,7 @@ proc gotocommit {} {
87758775
set matches [longid $id]
87768776
if {$matches ne {}} {
87778777
if {[llength $matches] > 1} {
8778-
error_popup [mc "Short SHA1 id %s is ambiguous" $id]
8778+
error_popup [mc "Short commit ID %s is ambiguous" $id]
87798779
return
87808780
}
87818781
set id [lindex $matches 0]
@@ -8792,7 +8792,7 @@ proc gotocommit {} {
87928792
return
87938793
}
87948794
if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
8795-
set msg [mc "SHA1 id %s is not known" $sha1string]
8795+
set msg [mc "Commit ID %s is not known" $sha1string]
87968796
} else {
87978797
set msg [mc "Revision %s is not in the current view" $sha1string]
87988798
}
@@ -11594,7 +11594,7 @@ proc prefspage_general {notebook} {
1159411594
${NS}::checkbutton $page.showlocal -text [mc "Show local changes"] \
1159511595
-variable showlocalchanges
1159611596
grid x $page.showlocal -sticky w
11597-
${NS}::checkbutton $page.autoselect -text [mc "Auto-select SHA1 (length)"] \
11597+
${NS}::checkbutton $page.autoselect -text [mc "Auto-select commit ID (length)"] \
1159811598
-variable autoselect
1159911599
spinbox $page.autosellen -from 1 -to 40 -width 4 -textvariable autosellen
1160011600
grid x $page.autoselect $page.autosellen -sticky w

0 commit comments

Comments
 (0)