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 0a947f9..e401c73 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -2142,7 +2142,24 @@
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 8a98f51..afdefb2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1725,
+/**/
1724,
/**/
1723,