aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 7.4.2255

Browse Source 
Problem:    The script that checks translations can't handle plurals.
Solution:   Check for plural msgid and msgstr entries.  Leave the cursor on
            the first error.
This commit is contained in:
Bram Moolenaar
2016-08-26 15:51:53 +02:00
parent 54b6352c6f
commit ec42059b78
2 changed files with 57 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/po/check.vim
View File

@@ -30,36 +30,66 @@ func! GetMline()
return substitute(idline, '[^%]*\(%[-+ #''.0-9*]*l\=[dsuxXpoc%]\)\=', '\1', 'g') return substitute(idline, '[^%]*\(%[-+ #''.0-9*]*l\=[dsuxXpoc%]\)\=', '\1', 'g')
endfunc endfunc
" This only works when 'wrapscan' is set. " This only works when 'wrapscan' is not set.
let s:save_wrapscan = &wrapscan let s:save_wrapscan = &wrapscan
set wrapscan set nowrapscan
" Start at the first "msgid" line. " Start at the first "msgid" line.
1 1
/^msgid /^msgid\>
let startline = line('.')
" When an error is detected this is set to the line number.
" Note: this is used in the Makefile.
let error = 0 let error = 0
while 1 while 1
if getline(line('.') - 1) !~ "no-c-format" if getline(line('.') - 1) !~ "no-c-format"
let fromline = GetMline() " go over the "msgid" and "msgid_plural" lines
let prevfromline = 'foobar'
while 1
let fromline = GetMline()
if prevfromline != 'foobar' && prevfromline != fromline
echomsg 'Mismatching % in line ' . (line('.') - 1)
echomsg 'msgid: ' . prevfromline
echomsg 'msgid ' . fromline
if error == 0
let error = line('.')
endif
endif
if getline('.') !~ 'msgid_plural'
break
endif
let prevfromline = fromline
endwhile
if getline('.') !~ '^msgstr' if getline('.') !~ '^msgstr'
echo 'Missing "msgstr" in line ' . line('.') echomsg 'Missing "msgstr" in line ' . line('.')
let error = 1 if error == 0
endif let error = line('.')
let toline = GetMline() endif
if fromline != toline
echo 'Mismatching % in line ' . (line('.') - 1)
echo 'msgid: ' . fromline
echo 'msgstr: ' . toline
let error = 1
endif endif
" check all the 'msgstr' lines
while getline('.') =~ '^msgstr'
let toline = GetMline()
if fromline != toline
echomsg 'Mismatching % in line ' . (line('.') - 1)
echomsg 'msgid: ' . fromline
echomsg 'msgstr: ' . toline
if error == 0
let error = line('.')
endif
endif
if line('.') == line('$')
break
endif
endwhile
endif endif
" Find next msgid. " Find next msgid. Quit when there is no more.
" Wrap around at the end of the file, quit when back at the first one. let lnum = line('.')
/^msgid silent! /^msgid\>
if line('.') == startline if line('.') == lnum
break break
endif endif
endwhile endwhile
@@ -74,12 +104,16 @@ endwhile
" "
1 1
if search('msgid "\("\n"\)\?\([EW][0-9]\+:\).*\nmsgstr "\("\n"\)\?[^"]\@=\2\@!') > 0 if search('msgid "\("\n"\)\?\([EW][0-9]\+:\).*\nmsgstr "\("\n"\)\?[^"]\@=\2\@!') > 0
echo 'Mismatching error/warning code in line ' . line('.') echomsg 'Mismatching error/warning code in line ' . line('.')
let error = 1 if error == 0
let error = line('.')
endif
endif endif
if error == 0 if error == 0
echo "OK" echomsg "OK"
else
exe error
endif endif
let &wrapscan = s:save_wrapscan let &wrapscan = s:save_wrapscan

2
src/version.c
View File

@@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2255,
/**/ /**/
2254, 2254,
/**/ /**/