threads / patch / 55654

patchmerge-ort: split "distinct types" message into two translatable messages

Subject: [PATCH] merge-ort: split "distinct types" message into two translatable messages

## tl;dr

6 messages between May 9, 2021 and May 10, 2021. Diffs are folded; open one to read it.

replies: 5people: 4as markdown or json

Alex Henrie· May 9, 2021, 21:52 UTC · lore

The word "renamed" has two possible translations in many European languages depending on whether one thing was renamed or two things were renamed. Give translators freedom to alter any part of the message to make it sound right in their language.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
 merge-ort.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

Show changes to merge-ort.c +15 −6

diff --git a/merge-ort.c b/merge-ort.c
index 6c2792b10e..745a844b18 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -3050,12 +3050,21 @@ static void process_entry(struct merge_options *opt,
 				rename_b = 1;
 			}
 
-			path_msg(opt, path, 0,
-				 _("CONFLICT (distinct types): %s had different "
-				   "types on each side; renamed %s of them so "
-				   "each can be recorded somewhere."),
-				 path,
-				 (rename_a && rename_b) ? _("both") : _("one"));
+			if (rename_a && rename_b) {
+				path_msg(opt, path, 0,
+					 _("CONFLICT (distinct types): %s had "
+					   "different types on each side; "
+					   "renamed both of them so each can "
+					   "be recorded somewhere."),
+					 path);
+			} else {
+				path_msg(opt, path, 0,
+					 _("CONFLICT (distinct types): %s had "
+					   "different types on each side; "
+					   "renamed one of them so each can be "
+					   "recorded somewhere."),
+					 path);
+			}
 
 			ci->merged.clean = 0;
 			memcpy(new_ci, ci, sizeof(*new_ci));

-- 
2.31.1

Bagas Sanjaya· May 10, 2021, 05:36 UTC · re: Alex Henrie · lore

Re: [PATCH] merge-ort: split "distinct types" message into two translatable messages

On 10/05/21 04.52, Alex Henrie wrote:

> The word "renamed" has two possible translations in many European
> languages depending on whether one thing was renamed or two things were
> renamed. Give translators freedom to alter any part of the message to
> make it sound right in their language.

What are the examples? In French, Spanish, German, Portuguese (pt-PT), or even Slavic (like Russian) or even Hungarian, and etc?

Show 21 quoted lines

> -			path_msg(opt, path, 0,
> -				 _("CONFLICT (distinct types): %s had different "
> -				   "types on each side; renamed %s of them so "
> -				   "each can be recorded somewhere."),
> -				 path,
> -				 (rename_a && rename_b) ? _("both") : _("one"));
> +			if (rename_a && rename_b) {
> +				path_msg(opt, path, 0,
> +					 _("CONFLICT (distinct types): %s had "
> +					   "different types on each side; "
> +					   "renamed both of them so each can "
> +					   "be recorded somewhere."),
> +					 path);
> +			} else {
> +				path_msg(opt, path, 0,
> +					 _("CONFLICT (distinct types): %s had "
> +					   "different types on each side; "
> +					   "renamed one of them so each can be "
> +					   "recorded somewhere."),
> +					 path);
> +			}

Seems OK.

For example, in Indonesian, the first case (both sides are renamed) would be something like: ``` %s punya tipe yang berbeda pada setiap sisi, kedua-duanya dinamai ulang... ``` The second case (only one side) would be something like: ``` %s punya tipe yang berbeda pada setiap sisi, salah satunya dinamai ulang... ``` But the status quo (before this patch) would be translated as: ``` %s punya tipe yang berbeda pada setiap sisi, (kedua-duanya | satu) dari mereka dinamai ulang... ``` On the both sides case of status quo, the personal pronoun `mereka` (they) refers to the conflicted sides, where as on this patch, such conflicted sides are instead be referred as `-nya` suffix on the translation.

I personally avoid using `mereka` atau `ia` as personal pronoun that refer to things, and instead using `itu`.

-- 
An old man doll... just what I always wanted! - Clara

Bagas Sanjaya· May 10, 2021, 05:50 UTC · re: Bagas Sanjaya · lore

Re: [PATCH] merge-ort: split "distinct types" message into two translatable messages

On 10/05/21 12.36, Bagas Sanjaya wrote:

Show 23 quoted lines

> Seems OK.
> 
> For example, in Indonesian, the first case (both sides are renamed) would be
> something like:
> ```
> %s punya tipe yang berbeda pada setiap sisi, kedua-duanya dinamai ulang...
> ```
> The second case (only one side) would be something like:
> ```
> %s punya tipe yang berbeda pada setiap sisi, salah satunya dinamai ulang...
> ```
> But the status quo (before this patch) would be translated as:
> ```
> %s punya tipe yang berbeda pada setiap sisi, (kedua-duanya | satu) dari mereka
> dinamai ulang...
> ```
> On the both sides case of status quo, the personal pronoun `mereka` (they)
> refers to the conflicted sides, where as on this patch, such conflicted sides
> are instead be referred as `-nya` suffix on the translation.
> 
> I personally avoid using `mereka` atau `ia` as personal pronoun that refer
> to things, and instead using `itu`.
>

What I meant was I use `itu` as personal pronoun that refers to things (not people) instead of `mereka` or `ia` as translation of English pronouns "them" and "it".

-- 
An old man doll... just what I always wanted! - Clara

Alex Henrie· May 10, 2021, 16:42 UTC · re: Bagas Sanjaya · lore

Re: [PATCH] merge-ort: split "distinct types" message into two translatable messages

On Sun, May 9, 2021 at 11:36 PM Bagas Sanjaya <bagasdotme@gmail.com> wrote:

Show 9 quoted lines

>
> On 10/05/21 04.52, Alex Henrie wrote:
> > The word "renamed" has two possible translations in many European
> > languages depending on whether one thing was renamed or two things were
> > renamed. Give translators freedom to alter any part of the message to
> > make it sound right in their language.
>
> What are the examples? In French, Spanish, German, Portuguese (pt-PT),
> or even Slavic (like Russian) or even Hungarian, and etc?

The ones I know of are Catalan, German, and Spanish, but I'm sure there are others.

-Alex

Elijah Newren· May 10, 2021, 19:29 UTC · re: Alex Henrie · lore

Re: [PATCH] merge-ort: split "distinct types" message into two translatable messages

On Sun, May 9, 2021 at 2:53 PM Alex Henrie <alexhenrie24@gmail.com> wrote:

Show 45 quoted lines

>
> The word "renamed" has two possible translations in many European
> languages depending on whether one thing was renamed or two things were
> renamed. Give translators freedom to alter any part of the message to
> make it sound right in their language.
>
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
>  merge-ort.c | 21 +++++++++++++++------
>  1 file changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/merge-ort.c b/merge-ort.c
> index 6c2792b10e..745a844b18 100644
> --- a/merge-ort.c
> +++ b/merge-ort.c
> @@ -3050,12 +3050,21 @@ static void process_entry(struct merge_options *opt,
>                                 rename_b = 1;
>                         }
>
> -                       path_msg(opt, path, 0,
> -                                _("CONFLICT (distinct types): %s had different "
> -                                  "types on each side; renamed %s of them so "
> -                                  "each can be recorded somewhere."),
> -                                path,
> -                                (rename_a && rename_b) ? _("both") : _("one"));
> +                       if (rename_a && rename_b) {
> +                               path_msg(opt, path, 0,
> +                                        _("CONFLICT (distinct types): %s had "
> +                                          "different types on each side; "
> +                                          "renamed both of them so each can "
> +                                          "be recorded somewhere."),
> +                                        path);
> +                       } else {
> +                               path_msg(opt, path, 0,
> +                                        _("CONFLICT (distinct types): %s had "
> +                                          "different types on each side; "
> +                                          "renamed one of them so each can be "
> +                                          "recorded somewhere."),
> +                                        path);
> +                       }
>
>                         ci->merged.clean = 0;
>                         memcpy(new_ci, ci, sizeof(*new_ci));
> --
> 2.31.1

I don't know much on the translation side (thanks for fixing it up for me), but looks innocuous and correct from the code side:

Acked-by: Elijah Newren <newren@gmail.com>

Jeff King· May 10, 2021, 22:33 UTC · re: Alex Henrie · lore

Re: [PATCH] merge-ort: split "distinct types" message into two translatable messages

On Sun, May 09, 2021 at 03:52:50PM -0600, Alex Henrie wrote:

> The word "renamed" has two possible translations in many European
> languages depending on whether one thing was renamed or two things were
> renamed. Give translators freedom to alter any part of the message to
> make it sound right in their language.

Makes sense. And in general, I think the advice (e.g., given in gettext's "Preparing Strings" doc) is to avoid the kind of "lego" translation structure we saw in the original (where words like "both" or "none" might need more context than a single %s provides).

Show 21 quoted lines

> -			path_msg(opt, path, 0,
> -				 _("CONFLICT (distinct types): %s had different "
> -				   "types on each side; renamed %s of them so "
> -				   "each can be recorded somewhere."),
> -				 path,
> -				 (rename_a && rename_b) ? _("both") : _("one"));
> +			if (rename_a && rename_b) {
> +				path_msg(opt, path, 0,
> +					 _("CONFLICT (distinct types): %s had "
> +					   "different types on each side; "
> +					   "renamed both of them so each can "
> +					   "be recorded somewhere."),
> +					 path);
> +			} else {
> +				path_msg(opt, path, 0,
> +					 _("CONFLICT (distinct types): %s had "
> +					   "different types on each side; "
> +					   "renamed one of them so each can be "
> +					   "recorded somewhere."),
> +					 path);
> +			}

I wondered if we could be using the Q_() helper here, which distinguishes cases based on quantity. But I don't think this is semantically quite the same thing (it's not "rename" versus "renames", but rather two distinctly interesting cases).

-Peff