| Message ID | 20230323162234.995485-2-oswald.buddenhagen@gmx.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] Capitalization and punctuation fixes to some user visible messages | expand |
Oswald Buddenhagen <oswald.buddenhagen@gmx.de> writes: > N_() is meant to be used on strings that are subsequently _()'d, which > isn't the case here. Correct. But the original does not look particularly a good way to allow people to translate the messages (namely, it splits a sentence in the middle and makes a sentence lego). I wonder if it should prepare two full sentence messages, one for dirty case and the other for non-dirty case? In any case, I think the latter half of this big warning() should be done as an advice message that the user can squelch, so I wouldn't worry too much about it before that happens. Thanks. > Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> > --- > sequencer.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sequencer.c b/sequencer.c > index fda68cd33d..21748bbfb0 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -3628,7 +3628,7 @@ static int do_exec(struct repository *r, const char *command_line) > " git rebase --continue\n" > "\n"), > command_line, > - dirty ? N_("and made changes to the index and/or the " > + dirty ? _("and made changes to the index and/or the " > "working tree.\n") : ""); > if (status == 127) > /* command not found */
On Thu, Mar 23, 2023 at 01:43:03PM -0700, Junio C Hamano wrote: >But the original does not look particularly a good way to >allow people to translate the messages (namely, it splits a sentence >in the middle and makes a sentence lego). > it's not that bad, because the "brick" is inserted at a location that is specified by another translatable string. >I wonder if it should prepare two full sentence messages, one for >dirty case and the other for non-dirty case? > ... so this seems unnecessary if no translator complained yet. >In any case, I think >the latter half of this big warning() should be done as an advice >message that the user can squelch, so I wouldn't worry too much >about it before that happens. > yeah, but unless this is on someone's shortlist, i don't think it makes sense to hold up my fix.
Oswald Buddenhagen <oswald.buddenhagen@gmx.de> writes: > yeah, but unless this is on someone's shortlist, i don't think it > makes sense to hold up my fix. My point was that your "fix" is not really a "fix" that is worth the code churn. Or did I mis-read your patches? Thanks.
On Thu, Mar 23, 2023 at 02:25:04PM -0700, Junio C Hamano wrote: >Oswald Buddenhagen <oswald.buddenhagen@gmx.de> writes: > >> yeah, but unless this is on someone's shortlist, i don't think it >> makes sense to hold up my fix. > >My point was that your "fix" is not really a "fix" that is worth the >code churn. Or did I mis-read your patches? > they all fix actual (minor) bugs: missing i18n, bad grammar (the missing periods between sentences actaully threw me off, which is how i got started on the series at all), and arguably bad capitalization (though obviously, for my own sake i couldn't care less about *that*).
diff --git a/sequencer.c b/sequencer.c index fda68cd33d..21748bbfb0 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3628,7 +3628,7 @@ static int do_exec(struct repository *r, const char *command_line) " git rebase --continue\n" "\n"), command_line, - dirty ? N_("and made changes to the index and/or the " + dirty ? _("and made changes to the index and/or the " "working tree.\n") : ""); if (status == 127) /* command not found */
N_() is meant to be used on strings that are subsequently _()'d, which isn't the case here. Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)