author | Junio C Hamano <gitster@pobox.com> | |
Thu, 24 Jan 2008 05:37:12 +0000 (21:37 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 24 Jan 2008 05:37:12 +0000 (21:37 -0800) |
* 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
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
git-gui/Makefile | patch | blob | history | |
git-gui/lib/choose_rev.tcl | patch | blob | history | |
git-gui/po/po2msg.sh | patch | blob | history |
diff --git a/git-gui/Makefile b/git-gui/Makefile
index 1baf4b086131a10ab7e33529274ebd15100f375e..34438cdf5cc219ac71cbc90a23c23550276f5af2 100644 (file)
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
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=
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
index a063c5bc49fc9bad58f7fd78e7446a097ce86b88..c8821c146386f850c0794df70f605cd9f18dcff3 100644 (file)
focus $old_focus
}
}
- $sb set $first $last
+
+ catch {$sb set $first $last}
}
method _show_tooltip {pos} {
diff --git a/git-gui/po/po2msg.sh b/git-gui/po/po2msg.sh
index c63248e3752b8b479f75ad2fe772dd40f684be54..b7c4bf3fdffb3d04b8c01b25e99a706e499de0d1 100644 (file)
--- a/git-gui/po/po2msg.sh
+++ b/git-gui/po/po2msg.sh
}
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
}