patch 9.0.1575: "file N of M" message is not translated

Problem:    "file N of M" message is not translated.
Solution:   Make argument count message translatable. (close #12429)

diff --git a/src/buffer.c b/src/buffer.c
index ff7c50fae10c5e277d200c111f83e9d9ae6d642a..a47342a3f5f96170126c31301edd4bae29dbeb18 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5278,24 +5278,21 @@ append_arg_number(
     int                buflen,
     int                add_file)       // Add "file" before the arg number
 {
-    char_u     *p;
-
     if (ARGCOUNT <= 1)         // nothing to do
        return FALSE;
 
-    p = buf + STRLEN(buf);     // go to the end of the buffer
-    if (p - buf + 35 >= buflen)        // getting too long
-       return FALSE;
-    *p++ = ' ';
-    *p++ = '(';
-    if (add_file)
+    char *msg;
+    switch ((wp->w_arg_idx_invalid ? 1 : 0) + (add_file ? 2 : 0))
     {
-       STRCPY(p, "file ");
-       p += 5;
+       case 0: msg = _(" (%d of %d)"); break;
+       case 1: msg = _(" ((%d) of %d)"); break;
+       case 2: msg = _(" (file %d of %d)"); break;
+       case 3: msg = _(" (file (%d) of %d)"); break;
     }
-    vim_snprintf((char *)p, (size_t)(buflen - (p - buf)),
-               wp->w_arg_idx_invalid ? "(%d) of %d)"
-                                 : "%d of %d)", wp->w_arg_idx + 1, ARGCOUNT);
+
+    char_u *p = buf + STRLEN(buf);     // go to the end of the buffer
+    vim_snprintf((char *)p, (size_t)(buflen - (p - buf)), msg,
+                                                 wp->w_arg_idx + 1, ARGCOUNT);
     return TRUE;
 }
 

diff --git a/src/version.c b/src/version.c
index 9ea324fea04e48763e006c08fd807de6fde623db..11e29de2025f9a55b5dcfb33bbae6ff8d2bcc09d 100644 (file)
--- 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 */
+/**/
+    1575,
 /**/
     1574,
 /**/