patch 9.0.1586: error for using two messages with ngettext() differing in "%"
Problem: Checking translations gives an error for using two messages with
ngettext() that differ in "%" items.
Solution: Adjust the check script to tolerate omitting one "%" item.
diff --git a/src/po/check.vim b/src/po/check.vim
index a01874c..b2a5fd5 100644
--- a/src/po/check.vim
+++ b/src/po/check.vim
@@ -6,6 +6,9 @@
if 1 " Only execute this if the eval feature is available.
+" using line continuation
+set cpo&vim
+
" Function to get a split line at the cursor.
" Used for both msgid and msgstr lines.
" Removes all text except % items and returns the result.
@@ -59,12 +62,18 @@
if getline(line('.') - 1) !~ "no-c-format"
" go over the "msgid" and "msgid_plural" lines
let prevfromline = 'foobar'
+ let plural = 0
while 1
+ if getline('.') =~ 'msgid_plural'
+ let plural += 1
+ endif
let fromline = GetMline()
if prevfromline != 'foobar' && prevfromline != fromline
+ \ && (plural != 1
+ \ || count(prevfromline, '%') + 1 != count(fromline, '%'))
echomsg 'Mismatching % in line ' . (line('.') - 1)
echomsg 'msgid: ' . prevfromline
- echomsg 'msgid ' . fromline
+ echomsg 'msgid: ' . fromline
if error == 0
let error = line('.')
endif
@@ -86,6 +95,7 @@
while getline('.') =~ '^msgstr'
let toline = GetMline()
if fromline != toline
+ \ && (plural == 0 || count(fromline, '%') != count(toline, '%') + 1)
echomsg 'Mismatching % in line ' . (line('.') - 1)
echomsg 'msgid: ' . fromline
echomsg 'msgstr: ' . toline
diff --git a/src/version.c b/src/version.c
index 27e558a..fdb7716 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1586,
+/**/
1585,
/**/
1584,