# HG changeset patch # User Bram Moolenaar # Date 1683727209 -7200 # Node ID 7296f4ef3eadd9cb7966b54cd85d05b4e80cc558 # Parent 2746d1b8680fb5e394b54c75d6ec3a1cf39611be patch 9.0.1537: message for opening the cmdline window is not translated Commit: https://github.com/vim/vim/commit/65b34868dac4bdc99e1144e36d5315b569795fc4 Author: Bram Moolenaar Date: Wed May 10 14:47:50 2023 +0100 patch 9.0.1537: message for opening the cmdline window is not translated Problem: Message for opening the cmdline window is not translated. Solution: Add gettext() and scan the defaults script for text to be translated. (closes #12371) diff --git a/runtime/defaults.vim b/runtime/defaults.vim --- a/runtime/defaults.vim +++ b/runtime/defaults.vim @@ -120,7 +120,7 @@ if 1 au! autocmd CmdwinEnter * \ echohl Todo | - \ echo 'You discovered the command-line window! You can close it with ":q".' | + \ echo gettext('You discovered the command-line window! You can close it with ":q".') | \ echohl None augroup END diff --git a/src/po/Makefile b/src/po/Makefile --- a/src/po/Makefile +++ b/src/po/Makefile @@ -204,10 +204,12 @@ PO_INPUTLIST = \ vim.desktop.in PO_VIM_INPUTLIST = \ - ../../runtime/optwin.vim + ../../runtime/optwin.vim \ + ../../runtime/defaults.vim PO_VIM_JSLIST = \ - optwin.js + optwin.js \ + defaults.js $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST) # Convert the Vim scripts to (what looks like) Javascript diff --git a/src/po/tojavascript.vim b/src/po/tojavascript.vim --- a/src/po/tojavascript.vim +++ b/src/po/tojavascript.vim @@ -8,8 +8,9 @@ set shortmess+=A for name in argv()[1:] exe 'edit ' .. fnameescape(name) - " Strip comments + " Strip comments, also after :set commands. g/^\s*"/s/.*// + g/^\s*set .*"/s/.*// " Write as .js file, xgettext recognizes them exe 'w! ' .. fnamemodify(name, ":t:r") .. ".js" diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1537, +/**/ 1536, /**/ 1535,