patch 9.1.0559: translation of vim scripts can be improved
Problem: translation of vim scripts can be improved
(after v9.1.0509)
Solution: improve documentation, add tests, include missing
libraries for the Windows CI
(RestorerZ)
closes: #15100
Signed-off-by: RestorerZ <restorer@mail2k.ru>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index f199fec..76d4429 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -166,6 +166,7 @@
test_gettext \
test_gettext_cp1251 \
test_gettext_utf8 \
+ test_gettext_make \
test_getvar \
test_gf \
test_glob2regpat \
@@ -428,6 +429,7 @@
test_gettext.res \
test_gettext_cp1251.res \
test_gettext_utf8.res \
+ test_gettext_make.res \
test_getvar.res \
test_gf.res \
test_gn.res \
diff --git a/src/testdir/Make_mvc.mak b/src/testdir/Make_mvc.mak
index bd6d1a2..1bf9eae 100644
--- a/src/testdir/Make_mvc.mak
+++ b/src/testdir/Make_mvc.mak
@@ -42,7 +42,7 @@
else ( echo No failures reported > test_result.log )
$(VIMPROG) -u NONE $(COMMON_ARGS) -S summarize.vim messages
-if exist starttime del starttime
- @echo.
+ @echo:
@echo Test results:
@cmd /c type test_result.log
@if exist test.log ( echo TEST FAILURE & exit /b 1 ) \
@@ -56,7 +56,7 @@
-if exist test.log del test.log
-if exist messages del messages
-if exist starttime del starttime
- @$(MAKE) -nologo -f Make_mvc.mak $@.res VIMPROG=$(VIMPROG)
+ @$(MAKE) -nologo -f Make_mvc.mak VIMPROG=$(VIMPROG) $@.res
@type messages
@if exist test.log exit 1
diff --git a/src/testdir/test_gettext_cp1251.vim b/src/testdir/test_gettext_cp1251.vim
index c6f04bb..c91f784 100644
--- a/src/testdir/test_gettext_cp1251.vim
+++ b/src/testdir/test_gettext_cp1251.vim
@@ -1,20 +1,20 @@
source check.vim
-" TODO: Why does this fail on MacOS 14 and Windows MSVC (Github CI)?
+" This fail on CI MacOS 14 because bindtextdomain() is not available there
+" (missing library?)
CheckNotMac
-CheckNotMSWindows
" Test for gettext()
func Test_gettext()
set encoding=cp1251
call bindtextdomain("__PACKAGE__", getcwd())
try
- language ru_RU
+ language messages ru_RU
call assert_equal('ÎØÈÁÊÀ: ', gettext("ERROR: ", "__PACKAGE__"))
catch /^Vim\%((\a\+)\)\=:E197:/
throw "Skipped: not possible to set locale to ru (missing?)"
endtry
try
- language en_GB.UTF-8
+ language messages en_GB.UTF-8
call assert_equal('ERROR: ', gettext("ERROR: ", "__PACKAGE__"))
catch /^Vim\%((\a\+)\)\=:E197:/
throw "Skipped: not possible to set locale to en (missing?)"
diff --git a/src/testdir/test_gettext_make.vim b/src/testdir/test_gettext_make.vim
new file mode 100644
index 0000000..480e2ee
--- /dev/null
+++ b/src/testdir/test_gettext_make.vim
@@ -0,0 +1,65 @@
+source check.vim
+"CheckNotMSWindows
+CheckNotMac
+
+" Test for package translation Makefile
+func Test_gettext_makefile()
+ cd ../po
+ if has('win32')
+ call system('nmake.exe -f Make_mvc.mak "VIMPROG=' .. getenv('VIMPROG') ..
+ \ '" "GETTEXT_PATH=' .. getenv('GETTEXT_PATH') ..
+ \ '" PLUGPACKAGE=test_gettext
+ \ "PO_PLUG_INPUTLIST=..\testdir\test_gettext_makefile_in1.vim
+ \ ..\testdir\test_gettext_makefile_in2.vim
+ \ ..\testdir\test_gettext_makefile_in3.vim
+ \ ..\testdir\test_gettext_makefile_in4.vim" test_gettext.pot')
+ else
+" Will it work on macOS?
+ call system("make -f Makefile PLUGPACKAGE=test_gettext
+ \ PO_PLUG_INPUTLIST=\"../testdir/test_gettext_makefile_in1.vim
+ \ ../testdir/test_gettext_makefile_in2.vim
+ \ ../testdir/test_gettext_makefile_in3.vim
+ \ ../testdir/test_gettext_makefile_in4.vim\" test_gettext.pot")
+ endif
+ let expected = [
+ \ '# SOME DESCRIPTIVE TITLE.',
+ \ '# Copyright (C) YEAR THE PACKAGE''S COPYRIGHT HOLDER',
+ \ '# This file is distributed under the same license as the test_gettext package.',
+ \ '# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.',
+ \ '#',
+ \ '#, fuzzy',
+ \ 'msgid ""',
+ \ 'msgstr ""',
+ \ '"Project-Id-Version: test_gettext\n"',
+ \ '"Report-Msgid-Bugs-To: \n"',
+ \ '"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"',
+ \ '"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"',
+ \ '"Language-Team: LANGUAGE <LL@li.org>\n"',
+ \ '"Language: \n"',
+ \ '"MIME-Version: 1.0\n"',
+ \ '"Content-Type: text/plain; charset=CHARSET\n"',
+ \ '"Content-Transfer-Encoding: 8bit\n"',
+ \ '',
+ \ '#: ../testdir/test_gettext_makefile_in1.vim:4 ../testdir/test_gettext_makefile_in1.vim:6',
+ \ '#: ../testdir/test_gettext_makefile_in2.vim:5 ../testdir/test_gettext_makefile_in4.vim:4',
+ \ 'msgid "This is a test"',
+ \ 'msgstr ""',
+ \ '',
+ \ '#: ../testdir/test_gettext_makefile_in1.vim:5',
+ \ 'msgid "This is another test"',
+ \ 'msgstr ""',
+ \ '',
+ \ '#: ../testdir/test_gettext_makefile_in2.vim:4',
+ \ 'msgid "This is a test from the second file"',
+ \ 'msgstr ""',
+ \ '',
+ \ '#: ../testdir/test_gettext_makefile_in4.vim:5',
+ \ 'msgid "This is a fourth test"',
+ \ 'msgstr ""']
+ let potfile = filter(readfile("test_gettext.pot"), 'v:val !~ "POT-Creation-Date"')
+ call assert_equal(expected, potfile)
+ call delete('test_gettext.pot')
+ cd -
+endfunc
+
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_gettext_makefile_in1.vim b/src/testdir/test_gettext_makefile_in1.vim
new file mode 100644
index 0000000..cbe1159
--- /dev/null
+++ b/src/testdir/test_gettext_makefile_in1.vim
@@ -0,0 +1,7 @@
+" Test file for gettext() package makefile
+" Last Change: 2024 Jun 01
+
+echo gettext("This is a test", "test_gettext")
+echo gettext("This is another test", "test_gettext")
+echo gettext("This is a test", "test_gettext")
+" vim: ts=8
diff --git a/src/testdir/test_gettext_makefile_in2.vim b/src/testdir/test_gettext_makefile_in2.vim
new file mode 100644
index 0000000..86d3dd9
--- /dev/null
+++ b/src/testdir/test_gettext_makefile_in2.vim
@@ -0,0 +1,6 @@
+" Test file for gettext() package makefile
+" Last Change: 2024 Jun 01
+
+echo gettext("This is a test from the second file", "test_gettext")
+echo gettext("This is a test", "test_gettext")
+" vim: ts=8
diff --git a/src/testdir/test_gettext_makefile_in3.vim b/src/testdir/test_gettext_makefile_in3.vim
new file mode 100644
index 0000000..f4cf93d
--- /dev/null
+++ b/src/testdir/test_gettext_makefile_in3.vim
@@ -0,0 +1,4 @@
+" Test file for gettext() package makefile
+" Last Change: 2024 Jun 01
+
+" vim: ts=8
diff --git a/src/testdir/test_gettext_makefile_in4.vim b/src/testdir/test_gettext_makefile_in4.vim
new file mode 100644
index 0000000..7f9f3f7
--- /dev/null
+++ b/src/testdir/test_gettext_makefile_in4.vim
@@ -0,0 +1,6 @@
+" Test file for gettext() package makefile
+" Last Change: 2024 Jun 01
+
+echo gettext("This is a test", "test_gettext")
+echo gettext("This is a fourth test", "test_gettext")
+" vim: ts=8
diff --git a/src/testdir/test_gettext_utf8.vim b/src/testdir/test_gettext_utf8.vim
index bb46ca0..7862e39 100644
--- a/src/testdir/test_gettext_utf8.vim
+++ b/src/testdir/test_gettext_utf8.vim
@@ -1,20 +1,20 @@
source check.vim
-" TODO: Why does this fail on MacOS 14 and Windows MSVC (Github CI)?
+" This fail on CI MacOS 14 because bindtextdomain() is not available there
+" (missing library?)
CheckNotMac
-CheckNotMSWindows
" Test for gettext()
func Test_gettext()
set encoding=utf-8
call bindtextdomain("__PACKAGE__", getcwd())
try
- language ru_RU
+ language messages ru_RU
call assert_equal('ОШИБКА: ', gettext("ERROR: ", "__PACKAGE__"))
catch /^Vim\%((\a\+)\)\=:E197:/
throw "Skipped: not possible to set locale to ru (missing?)"
endtry
try
- language en_GB.UTF-8
+ language messages en_GB.UTF-8
call assert_equal('ERROR: ', gettext("ERROR: ", "__PACKAGE__"))
catch /^Vim\%((\a\+)\)\=:E197:/
throw "Skipped: not possible to set locale to en (missing?)"