xfs
[Top] [All Lists]

[PATCH] xfs_repair: Fix untranslatable strings

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfs_repair: Fix untranslatable strings
From: Eric Sandeen <sandeen@xxxxxxxxxxx>
Date: Sun, 24 Jan 2016 11:08:24 -0600
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <20160124155853.GA10063@xxxxxxxxxxxxxxxxxx>
References: <20160124155853.GA10063@xxxxxxxxxxxxxxxxxx>
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0) Gecko/20100101 Thunderbird/38.5.1
Don't substitute in "would" or "will" for %s here, it makes
it untranslatable.  Just spell it out twice like every other
message in the function.

Reported-by: Jakub Bogusz <qboosh@xxxxxxxxxxxxx>
Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxxx>
---

diff --git a/repair/versions.c b/repair/versions.c
index 1585385..978f48b 100644
--- a/repair/versions.c
+++ b/repair/versions.c
@@ -224,10 +224,17 @@ _("WARNING:  you have disallowed attr2 attributes but 
this filesystem\n"
        }
 
        if (!(sb->sb_versionnum & XFS_SB_VERSION_NLINKBIT)) {
-               do_warn(
-_("WARNING: you have a V1 inode filesystem. It %s be converted to a\n"
+               if (!no_modify) {
+                       do_warn(
+_("WARNING: you have a V1 inode filesystem. It will be converted to a\n"
   "\tversion 2 inode filesystem. If you do not want this, run an older\n"
-  "\tversion of xfs_repair.\n"), no_modify ? "would" : "will");
+  "\tversion of xfs_repair.\n"));
+               } else  {
+                       do_warn(
+_("WARNING: you have a V1 inode filesystem. It would be converted to a\n"
+  "\tversion 2 inode filesystem. If you do not want this, run an older\n"
+  "\tversion of xfs_repair.\n"));
+               }
        }
 
        if (xfs_sb_version_hasquota(sb))  {

<Prev in Thread] Current Thread [Next in Thread>