Mercurial > vim
changeset 32509:ec4e725ab8cd v9.0.1586
patch 9.0.1586: error for using two messages with ngettext() differing in "%"
Commit: https://github.com/vim/vim/commit/78ee62563ea940086f094150f0356e38f780c580
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun May 28 18:39:55 2023 +0100
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.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 28 May 2023 19:45:04 +0200 |
| parents | eb8089e59bae |
| children | a2b76de54ae3 |
| files | src/po/check.vim src/version.c |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ while 1 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 1 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