Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: Correctly cleanup msgfmt '1 message untranslated' output git-gui: Make the statistics of po2msg match those of msgfmt git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available git-gui: Work around random missing scrollbar in revision list
This commit is contained in:
commit
cab31fa076
@ -67,7 +67,7 @@ ifndef V
|
||||
QUIET_GEN = $(QUIET)echo ' ' GEN '$@' &&
|
||||
QUIET_INDEX = $(QUIET)echo ' ' INDEX $(dir $@) &&
|
||||
QUIET_MSGFMT0 = $(QUIET)printf ' MSGFMT %12s ' $@ && v=`
|
||||
QUIET_MSGFMT1 = 2>&1` && echo "$$v" | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages//g'
|
||||
QUIET_MSGFMT1 = 2>&1` && echo "$$v" | sed -e 's/fuzzy translations/fuzzy/' | sed -e 's/ messages*//g'
|
||||
QUIET_2DEVNULL = 2>/dev/null
|
||||
|
||||
INSTALL_D0 = dir=
|
||||
@ -198,6 +198,9 @@ ifdef NO_MSGFMT
|
||||
MSGFMT ?= $(TCL_PATH) po/po2msg.sh
|
||||
else
|
||||
MSGFMT ?= msgfmt
|
||||
ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
|
||||
MSGFMT := $(TCL_PATH) po/po2msg.sh
|
||||
endif
|
||||
endif
|
||||
|
||||
msgsdir = $(gg_libdir)/msgs
|
||||
|
@ -451,7 +451,8 @@ method _sb_set {sb orient first last} {
|
||||
focus $old_focus
|
||||
}
|
||||
}
|
||||
$sb set $first $last
|
||||
|
||||
catch {$sb set $first $last}
|
||||
}
|
||||
|
||||
method _show_tooltip {pos} {
|
||||
|
@ -127,7 +127,26 @@ foreach file $files {
|
||||
}
|
||||
|
||||
if {$show_statistics} {
|
||||
puts [concat "$translated_count translated messages, " \
|
||||
"$fuzzy_count fuzzy ones, " \
|
||||
"$not_translated_count untranslated ones."]
|
||||
set str ""
|
||||
|
||||
append str "$translated_count translated message"
|
||||
if {$translated_count != 1} {
|
||||
append str s
|
||||
}
|
||||
|
||||
if {$fuzzy_count > 1} {
|
||||
append str ", $fuzzy_count fuzzy translation"
|
||||
if {$fuzzy_count != 1} {
|
||||
append str s
|
||||
}
|
||||
}
|
||||
if {$not_translated_count > 0} {
|
||||
append str ", $not_translated_count untranslated message"
|
||||
if {$not_translated_count != 1} {
|
||||
append str s
|
||||
}
|
||||
}
|
||||
|
||||
append str .
|
||||
puts $str
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user