freshlybakedca.ke / git
Git fork
fork atom

Makefile: add "po-update" rule to update po/XX.po

Since there is no longer a "po/git.pot" file in tree, a l10n team leader
has to run several commands to update their "po/XX.po" file:

$ make pot
$ msgmerge --add-location --backup=off -U po/XX.po po/git.pot

To make this process easier, add a new rule so that l10n team leaders
can update their "po/XX.po" with one command. E.g.:

$ make po-update PO_FILE=po/zh_CN.po

Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Jiang Xin and committed by
Junio C Hamano fbb3d323 5377abc0

+19
unified split
+18
Makefile
··· 571 571 XGETTEXT = xgettext 572 572 MSGCAT = msgcat 573 573 MSGFMT = msgfmt 574 + MSGMERGE = msgmerge 574 575 CURL_CONFIG = curl-config 575 576 GCOV = gcov 576 577 STRIP = strip ··· 2715 2716 --keyword=gettextln --keyword=eval_gettextln 2716 2717 XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \ 2717 2718 --keyword=__ --keyword=N__ --keyword="__n:1,2" 2719 + MSGMERGE_FLAGS = --add-location --backup=off --update 2718 2720 LOCALIZED_C = $(sort $(FOUND_C_SOURCES) $(FOUND_H_SOURCES) $(SCALAR_SOURCES) \ 2719 2721 $(GENERATED_H)) 2720 2722 LOCALIZED_SH = $(sort $(SCRIPT_SH) git-sh-setup.sh) ··· 2791 2793 2792 2794 .PHONY: pot 2793 2795 pot: po/git.pot 2796 + 2797 + define check_po_file_envvar 2798 + $(if $(PO_FILE), \ 2799 + $(if $(filter po/%.po,$(PO_FILE)), , \ 2800 + $(error PO_FILE should match pattern: "po/%.po")), \ 2801 + $(error PO_FILE is not defined)) 2802 + endef 2803 + 2804 + .PHONY: po-update 2805 + po-update: po/git.pot 2806 + $(check_po_file_envvar) 2807 + @if test ! -e $(PO_FILE); then \ 2808 + echo >&2 "error: $(PO_FILE) does not exist"; \ 2809 + exit 1; \ 2810 + fi 2811 + $(QUIET_MSGMERGE)$(MSGMERGE) $(MSGMERGE_FLAGS) $(PO_FILE) po/git.pot 2794 2812 2795 2813 .PHONY: check-pot 2796 2814 check-pot: $(LOCALIZED_ALL_GEN_PO)
+1
shared.mak
··· 63 63 QUIET_LNCP = @echo ' ' LN/CP $@; 64 64 QUIET_XGETTEXT = @echo ' ' XGETTEXT $@; 65 65 QUIET_MSGFMT = @echo ' ' MSGFMT $@; 66 + QUIET_MSGMERGE = @echo ' ' MSGMERGE $@; 66 67 QUIET_GCOV = @echo ' ' GCOV $@; 67 68 QUIET_SP = @echo ' ' SP $<; 68 69 QUIET_HDR = @echo ' ' HDR $(<:hcc=h);