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)
This commit is contained in:
@ -2142,7 +2142,24 @@ get_ctime(time_t thetime, int add_newline)
|
|||||||
if (curtime == NULL)
|
if (curtime == NULL)
|
||||||
vim_strncpy((char_u *)buf, (char_u *)_("(Invalid)"), sizeof(buf) - 1);
|
vim_strncpy((char_u *)buf, (char_u *)_("(Invalid)"), sizeof(buf) - 1);
|
||||||
else
|
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
|
#else
|
||||||
STRCPY(buf, "(unknown)");
|
STRCPY(buf, "(unknown)");
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -777,6 +777,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1725,
|
||||||
/**/
|
/**/
|
||||||
1724,
|
1724,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user