# HG changeset patch # User Bram Moolenaar # Date 1563715804 -7200 # Node ID 37afc0146eabc02067d59e8ee1dad15a9bd6963e # Parent e67fa5e734558228c1e54f019cb8f8708b96cc93 patch 8.1.1725: MS-Windows: E325 message may use incorrect date format commit https://github.com/vim/vim/commit/663bbc09babea1ff8dfa7ccd58801ac9219fc2b2 Author: Bram Moolenaar Date: Sun Jul 21 15:23:35 2019 +0200 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 --- a/src/memline.c +++ b/src/memline.c @@ -2142,7 +2142,24 @@ get_ctime(time_t thetime, int add_newlin 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 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1725, +/**/ 1724, /**/ 1723,