diff --git a/src/buffer.c b/src/buffer.c index fe19269a49..0bac265b74 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5411,9 +5411,11 @@ get_rel_pos( return (int)vim_snprintf_safelen((char *)buf, buflen, "%s", _("Top")); + int perc = calc_percentage(above, above + below); + char tmp[8]; // localized percentage value - return (int)vim_snprintf_safelen((char *)buf, buflen, - _("%2d%%"), calc_percentage(above, above + below)); + vim_snprintf(tmp, sizeof(tmp), _("%d%%"), perc); + return (int)vim_snprintf_safelen((char *)buf, buflen, _("%2s"), tmp); } /* diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim index cbd90ec4e7..a8fe7b5f4c 100644 --- a/src/testdir/test_normal.vim +++ b/src/testdir/test_normal.vim @@ -4377,4 +4377,30 @@ func Test_scroll_longline_winwidth() bwipe! endfunc +func Test_pos_percentage_in_turkish_locale() + throw 'Skipped: FIXME: please remove throw when Turkish locale has been updated!' + CheckRunVimInTerminal + defer execute(':lang C') + + try + let dir = expand('$VIMRUNTIME/lang/tr/') + let target = expand('$VIMRUNTIME/lang/tr/LC_MESSAGES/') + let tr = '../po/tr.mo' + call mkdir(dir, 'R') + call mkdir(target, '') + call filecopy(tr, target .. 'vim.mo') + lang tr_TR.UTF-8 + let buf = RunVimInTerminal('', {'rows': 5}) + call term_sendkeys(buf, ":lang tr_TR.UTF-8\") + call term_sendkeys(buf, ":put =range(1,40)\") + call term_sendkeys(buf, ":5\") + call WaitForAssert({-> assert_match('%8$', term_getline(buf, 5))}) + + call StopVimInTerminal(buf) + catch /E197:/ + " can't use Turkish locale + throw 'Skipped: Turkish locale not available' + endtry +endfunc + " vim: shiftwidth=2 sts=2 expandtab nofoldenable diff --git a/src/version.c b/src/version.c index 6db18c6181..f36bcacdbb 100644 --- a/src/version.c +++ b/src/version.c @@ -709,6 +709,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1479, /**/ 1478, /**/