From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 21 Jul 2019 13:23:35 +0000 (+0200)
Subject: patch 8.1.1725: MS-Windows: E325 message may use incorrect date format
X-Git-Tag: v8.1.1725
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=663bbc09babea1ff8dfa7ccd58801ac9219fc2b2;p=vim

patch 8.1.1725: MS-Windows: E325 message may use incorrect date format

Problem:    MS-Windows: E325 message may use incorrect date format.
Solution:   Convert strftime() result to 'encoding'.  Also make the message
            translatable. (Ken Takata, closes #4685, closes #4681)
---

diff --git a/src/memline.c b/src/memline.c
index 0a947f927..e401c73fa 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -2142,7 +2142,24 @@ get_ctime(time_t thetime, int add_newline)
     if (curtime == NULL)
 	vim_strncpy((char_u *)buf, (char_u *)_("(Invalid)"), sizeof(buf) - 1);
     else
-	(void)strftime(buf, sizeof(buf) - 1, "%a %b %d %H:%M:%S %Y", curtime);
+    {
+	(void)strftime(buf, sizeof(buf) - 1, _("%a %b %d %H:%M:%S %Y"),
+								    curtime);
+# ifdef MSWIN
+	if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+	{
+	    char_u	*to_free = NULL;
+	    int		len;
+
+	    acp_to_enc((char_u *)buf, (int)strlen(buf), &to_free, &len);
+	    if (to_free != NULL)
+	    {
+		STRCPY(buf, to_free);
+		vim_free(to_free);
+	    }
+	}
+# endif
+    }
 #else
     STRCPY(buf, "(unknown)");
 #endif
diff --git a/src/version.c b/src/version.c
index 8a98f510a..afdefb270 100644
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1725,
 /**/
     1724,
 /**/