From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 21 Feb 2008 02:52:54 +0000 (-0500)
Subject: git-gui: Remove explicit references to 'aspell' in message strings
X-Git-Tag: v1.5.5-rc0~3^2~24
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd0962883b239ab265079b666d9a9f5014d60e52;p=git.git

git-gui: Remove explicit references to 'aspell' in message strings

Users may or may not be using aspell here.  About the only thing
we are using that is aspell specific (and not supported by ispell
or an ispell variant) is some command line options when we start
up aspell, and a forced encoding of UTF-8.  Both of these can be
corrected and/or cleaned up by users through an aspell wrapper
script, or through further improvements to git-gui.  There is no
reason to require our translated strings to reference a specific
spell checker, especially if that spell checker implementation is
not very suitable for the language being translated.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/lib/spellcheck.tcl b/lib/spellcheck.tcl
index d0486f807..f359356c8 100644
--- a/lib/spellcheck.tcl
+++ b/lib/spellcheck.tcl
@@ -1,10 +1,10 @@
-# git-gui spellchecking support through aspell
+# git-gui spellchecking support through ispell/aspell
 # Copyright (C) 2008 Shawn Pearce
 
 class spellcheck {
 
-field s_fd      {} ; # pipe to aspell
-field s_version {} ; # aspell version string
+field s_fd      {} ; # pipe to ispell/aspell
+field s_version {} ; # ispell/aspell version string
 field s_lang    {} ; # current language code
 
 field w_text      ; # text widget we are spelling
@@ -15,7 +15,7 @@ field s_i           {} ; # timer registration for _run callbacks
 field s_clear        0 ; # did we erase mispelled tags yet?
 field s_seen    [list] ; # lines last seen from $w_text in _run
 field s_checked [list] ; # lines already checked
-field s_pending [list] ; # [$line $data] sent to aspell
+field s_pending [list] ; # [$line $data] sent to ispell/aspell
 field s_suggest        ; # array, list of suggestions, keyed by misspelling
 
 constructor init {pipe_fd ui_text ui_menu} {
@@ -35,11 +35,11 @@ method _connect {pipe_fd} {
 
 	if {[gets $pipe_fd s_version] <= 0} {
 		close $pipe_fd
-		error [mc "Not connected to aspell"]
+		error [mc "Spell checker sliently failed on startup"]
 	}
 	if {{@(#) } ne [string range $s_version 0 4]} {
 		close $pipe_fd
-		error [strcat [mc "Unrecognized aspell version"] ": $s_version"]
+		error [strcat [mc "Unrecognized spell checker"] ": $s_version"]
 	}
 	set s_version [string range $s_version 5 end]
 
@@ -337,7 +337,7 @@ method _read {} {
 	fconfigure $s_fd -block 1
 	if {[eof $s_fd]} {
 		if {![catch {close $s_fd} err]} {
-			set err [mc "Unexpected EOF from aspell"]
+			set err [mc "Unexpected EOF from spell checker"]
 		}
 		catch {after cancel $s_i}
 		$w_text tag remove misspelled 1.0 end