diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-04 13:53:00 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-04 13:53:00 +0200 |
| commit | fa57335e532e505ce9229ddb2354a593fb057561 (patch) | |
| tree | f391b2147bd2ecb9a8ee38b977aef28c2085b5f3 /src/po/Make_mvc.mak | |
| parent | eb24556df3b16a19009ee3ddee8ae94dc058a3b2 (diff) | |
| download | vim-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_mvc.mak')
| -rw-r--r-- | src/po/Make_mvc.mak | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/src/po/Make_mvc.mak b/src/po/Make_mvc.mak index 43c805fb9..801a43694 100644 --- a/src/po/Make_mvc.mak +++ b/src/po/Make_mvc.mak @@ -14,6 +14,7 @@ VIMRUNTIME = ..\..\runtime !include Make_all.mak PACKAGE = vim +VIM = ..\vim # Correct the following line for the directory where gettext et al is installed GETTEXT_PATH = H:\gettext.0.14.4\bin @@ -41,19 +42,47 @@ INSTALLDIR = $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES all: $(MOFILES) $(MOCONVERTED) -files: - $(LS) $(LSFLAGS) ..\*.c ..\if_perl.xs ..\GvimExt\gvimext.cpp ..\globals.h ..\if_py_both.h ..\vim.h > .\files +PO_INPUTLIST = \ + ..\*.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 + +files: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST) + $(LS) $(LSFLAGS) $(PO_INPUTLIST) > .\files + echo $(PO_VIM_JSLIST)>> .\files first_time: files + $(VIM) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) set OLD_PO_FILE_INPUT=yes set OLD_PO_FILE_OUTPUT=yes $(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files + $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) + $(RM) *.js -$(LANGUAGES): files +$(PACKAGE).pot: files + $(VIM) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST) set OLD_PO_FILE_INPUT=yes set OLD_PO_FILE_OUTPUT=yes $(XGETTEXT) --default-domain=$(PACKAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files $(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) -nologo -f Make_mvc.mak $(PACKAGE).pot GETTEXT_PATH=$(GETTEXT_PATH) $(CP) $@.po $@.po.orig $(MV) $@.po $@.po.old $(MSGMERGE) $@.po.old $(PACKAGE).pot -o $@.po @@ -70,3 +99,4 @@ install-all: all clean: $(RM) *.mo $(RM) *.pot + $(RM) files |