summaryrefslogtreecommitdiff
path: root/src/po/Make_cyg.mak
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-09-04 13:53:00 +0200
committerBram Moolenaar <Bram@vim.org>2020-09-04 13:53:00 +0200
commitfa57335e532e505ce9229ddb2354a593fb057561 (patch)
treef391b2147bd2ecb9a8ee38b977aef28c2085b5f3 /src/po/Make_cyg.mak
parenteb24556df3b16a19009ee3ddee8ae94dc058a3b2 (diff)
downloadvim-git-fa57335e532e505ce9229ddb2354a593fb057561.tar.gz
patch 8.2.1585: messages in globals.h not translatedv8.2.1585
Problem: Messages in globals.h not translated, xgettext on MS-Windows not fully supported. Solution: Add globals.h to list of input files. Update MS-Windows makefiles to improve message translations. (Ken Takata, closes #6858)
Diffstat (limited to 'src/po/Make_cyg.mak')
-rw-r--r--src/po/Make_cyg.mak40
1 files changed, 33 insertions, 7 deletions
diff --git a/src/po/Make_cyg.mak b/src/po/Make_cyg.mak
index 3f853016f..0fe7f9295 100644
--- a/src/po/Make_cyg.mak
+++ b/src/po/Make_cyg.mak
@@ -16,6 +16,7 @@ endif
include Make_all.mak
PACKAGE = vim
+VIM = ../vim
# Uncomment one of the lines below or modify it to put the path to your
# gettext binaries
@@ -44,21 +45,48 @@ MKD = mkdir -p
.SUFFIXES:
.SUFFIXES: .po .mo .pot
-.PHONY: first_time all install clean $(LANGUAGES)
+.PHONY: first_time all install install-all clean $(LANGUAGES)
.po.mo:
$(MSGFMT) -o $@ $<
all: $(MOFILES) $(MOCONVERTED)
-first_time:
+PO_INPUTLIST = \
+ $(wildcard ../*.c) \
+ ../if_perl.xs \
+ ../GvimExt/gvimext.cpp \
+ ../errors.h \
+ ../globals.h \
+ ../if_py_both.h \
+ ../vim.h \
+ gvim.desktop.in \
+ vim.desktop.in
+
+PO_VIM_INPUTLIST = \
+ ../../runtime/optwin.vim
+
+PO_VIM_JSLIST = \
+ optwin.js
+
+first_time: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST)
+ $(VIM) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST)
$(XGETTEXT) --default-domain=$(LANGUAGE) \
- --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h ../vim.h
+ --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(PO_INPUTLIST) $(PO_VIM_JSLIST)
+ $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST)
+ $(RM) *.js
-$(LANGUAGES):
+$(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST)
+ $(VIM) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
$(XGETTEXT) --default-domain=$(PACKAGE) \
- --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h ../vim.h
+ --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 $(PO_INPUTLIST) $(PO_VIM_JSLIST)
$(MV) $(PACKAGE).po $(PACKAGE).pot
+ $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
+ $(RM) *.js
+
+# Don't add a dependency here, we only want to update the .po files manually
+$(LANGUAGES):
+ @$(MAKE) -f Make_cyg.mak $(PACKAGE).pot GETTEXT_PATH=$(GETTEXT_PATH)
$(CP) $@.po $@.po.orig
$(MV) $@.po $@.po.old
$(MSGMERGE) $@.po.old $(PACKAGE).pot -o $@.po
@@ -75,5 +103,3 @@ install-all: install
clean:
$(RM) *.mo
$(RM) *.pot
-
-