[PATCH] fully and properly gettextize two error messages in e2fsck

[PATCH] fully and properly gettextize two error messages in e2fsck

[Benno Schulenberg]

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]


It is better to gettextize entire sentences, and not synthesize
them from fragments, so the grammar can be kept correct in
translations.

-- 
http://www.fastmail.fm - The way an email service should be


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0010-e2fsck-fully-and-properly-gettextize-two-error-messa.patch --]
[-- Type: text/x-diff; name="0010-e2fsck-fully-and-properly-gettextize-two-error-messa.patch", Size: 1689 bytes --]

From f11ab73d16063132b434b018dc31fc39fa2cd678 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Sun, 1 Jun 2014 19:08:22 +0200
Subject: [PATCH 10/14] e2fsck: fully and properly gettextize two error messages

The phrases "mounted" and "in use" were filled in untranslated into
the messages.  But it is better to gettextize entire sentences, and
not synthesize them from fragments.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 e2fsck/unix.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 2267a02..428c8fb 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -249,15 +249,19 @@ static void check_mount(e2fsck_t ctx)
 	     ((ctx->options & E2F_OPT_FORCE) &&
 	      (ctx->mount_flags & EXT2_MF_READONLY))) &&
 	    !(ctx->options & E2F_OPT_WRITECHECK)) {
-		log_out(ctx, _("Warning!  %s is %s.\n"),
-			ctx->filesystem_name,
-			ctx->mount_flags & EXT2_MF_MOUNTED ?
-				"mounted" : "in use");
+		if (ctx->mount_flags & EXT2_MF_MOUNTED)
+			log_out(ctx, _("Warning!  %s is mounted.\n"),
+					ctx->filesystem_name);
+		else
+			log_out(ctx, _("Warning!  %s is in use.\n"),
+					ctx->filesystem_name);
 		return;
 	}
 
-	log_out(ctx, _("%s is %s.\n"), ctx->filesystem_name,
-		ctx->mount_flags & EXT2_MF_MOUNTED ? "mounted" : "in use");
+	if (ctx->mount_flags & EXT2_MF_MOUNTED)
+		log_out(ctx, _("%s is mounted.\n"), ctx->filesystem_name);
+	else
+		log_out(ctx, _("%s is in use.\n"), ctx->filesystem_name);
 	if (!ctx->interactive || ctx->mount_flags & EXT2_MF_BUSY)
 		fatal_error(ctx, _("Cannot continue, aborting.\n\n"));
 	puts("\007\007\007\007");
-- 
1.7.0.4

Re: [PATCH] fully and properly gettextize two error messages in e2fsck

[Theodore Ts'o]

Thanks, applied.

BTW, it's much better to use git send-email to send a patch series.
That way, the patches are properly chained which makes it easier for
me to find and apply the messages in the proper order.  Also, that way
I can review the patch, and if it's Obviously Correct (tm), I can just
add it to a unix mbox file, and then apply a set of patches using the
"git am" command.

Cheers,

					- Ted

Re: [PATCH] fully and properly gettextize two error messages in e2fsck

[Benno Schulenberg]

On Mon, Jun 2, 2014, at 3:19, Theodore Ts'o wrote:
> BTW, it's much better to use git send-email to send a patch series.

I know.  In the past I have tried twice to set up some outgoing mail
handler, to get 'git send-email' to work, but couldn't get it to do
secure smtp.  Today I gave it another try, finally installed mstmp
and got it working -- I hope.  You will see in a minute.

Regards,

Benno

-- 
http://www.fastmail.fm - A no graphics, no pop-ups email service