From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 10 May 2023 13:47:50 +0000 (+0100)
Subject: patch 9.0.1537: message for opening the cmdline window is not translated
X-Git-Tag: v9.0.1537
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65b34868dac4bdc99e1144e36d5315b569795fc4;p=thirdparty%2Fvim.git

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
index f1d5cd1edf..f449c6e1e9 100644
--- 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
index 9dfbc34e74..fbe474b949 100644
--- 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
index 7868570be7..8b0dd736d5 100644
--- 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
index c8daf71c8c..3a7dcb8278 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1537,
 /**/
     1536,
 /**/