patch 8.2.1544: cannot translate messages in a Vim script
Problem: Cannot translate messages in a Vim script.
Solution: Add gettext(). Try it out for a few messages in the options
window.
diff --git a/src/po/Makefile b/src/po/Makefile
index cce14a9..8ef93e6 100644
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -36,6 +36,7 @@
check: $(CHECKFILES)
+# installing for real
install: $(MOFILES) $(MOCONVERTED)
@$(MAKE) prefixcheck
for lang in $(LANGUAGES); do \
@@ -61,6 +62,24 @@
rm -f $(LOCALEDIR)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
done
+# installing for local tryout into ../../runtime/lang
+tryoutinstall: $(MOFILES) $(MOCONVERTED)
+ @$(MAKE) prefixcheck
+ for lang in $(LANGUAGES); do \
+ dir=../../runtime/lang/$$lang/; \
+ if test ! -x "$$dir"; then \
+ mkdir $$dir; chmod 755 $$dir; \
+ fi; \
+ dir=../../runtime/lang/$$lang/LC_MESSAGES; \
+ if test ! -x "$$dir"; then \
+ mkdir $$dir; chmod 755 $$dir; \
+ fi; \
+ if test -r $$lang.mo; then \
+ cp $$lang.mo $$dir/$(PACKAGE).mo; \
+ chmod 644 $$dir/$(PACKAGE).mo; \
+ fi; \
+ done
+
converted: $(MOCONVERTED)
# nl.po was added later, if it does not exist use a file with just a # in it
@@ -158,12 +177,34 @@
checkclean:
rm -f *.ck
-$(PACKAGE).pot: ../*.c ../if_perl.xs ../GvimExt/gvimext.cpp ../globals.h ../if_py_both.h ../vim.h gvim.desktop.in vim.desktop.in
- cd ..; $(XGETTEXT) --default-domain=$(PACKAGE) \
- --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 \
- *.c if_perl.xs GvimExt/gvimext.cpp globals.h if_py_both.h vim.h \
- po/gvim.desktop.in po/vim.desktop.in
- mv -f ../$(PACKAGE).po $(PACKAGE).pot
+PO_INPUTLIST = \
+ ../*.c \
+ ../if_perl.xs \
+ ../GvimExt/gvimext.cpp \
+ ../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
+
+$(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST)
+ # Convert the Vim scripts to (what looks like) Javascript
+ $(VIM) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
+ # create vim.pot
+ $(XGETTEXT) --default-domain=$(PACKAGE) --add-comments \
+ --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 \
+ $(PO_INPUTLIST) $(PO_VIM_JSLIST)
+ mv -f $(PACKAGE).po $(PACKAGE).pot
+ # Fix Vim scripts names, so that "gf" works
+ $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)
+ # Delete the temporary files
+ rm *.js
vim.desktop: vim.desktop.in $(POFILES)
echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS