# HG changeset patch # User Christian Brabandt # Date 1526244307 -7200 # Node ID b9db0bc9b8f9fed1f67d9261854ad131ec720d61 # Parent cd513458728c08d4b4391cb430bd506ea0084145 patch 8.0.1839: script to check .po file doesn't check for plural header commit https://github.com/vim/vim/commit/9cfc7d885cb3bf37362b11df19a38992893fb385 Author: Bram Moolenaar Date: Sun May 13 22:37:03 2018 +0200 patch 8.0.1839: script to check .po file doesn't check for plural header Problem: Script to check .po file doesn't check for plural header. Solution: Add a check that the plural header is present when needed. diff --git a/src/po/check.vim b/src/po/check.vim --- a/src/po/check.vim +++ b/src/po/check.vim @@ -157,6 +157,23 @@ if executable("msgfmt") endif endif +" Check that the plural form is properly initialized +1 +let plural = search('^msgid_plural ', 'n') +if (plural && search('^"Plural-Forms: ', 'n') == 0) || (plural && search('^msgstr\[0\] ".\+"', 'n') != plural + 1) + if search('^"Plural-Forms: ', 'n') == 0 + echomsg "Missing Plural header" + if error == 0 + let error = search('\(^"[A-Za-z-_]\+: .*\\n"\n\)\+\zs', 'n') - 1 + endif + elseif error == 0 + let error = plural + endif +elseif !plural && search('^"Plural-Forms: ', 'n') + " We allow for a stray plural header, msginit adds one. +endif + + if error == 0 " If all was OK restore the view. call winrestview(wsv) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1839, +/**/ 1838, /**/ 1837,