[PATCH v5 01/38] i18n: builtin/remote.c: fix mark for translation
- From
Vasco Almeida <vascomalmeida@sapo.pt>
- Date
- Jun 17, 2016, 20:20 UTC
- Message-ID
- <1466194887-18236-2-git-send-email-vascomalmeida@sapo.pt>
- In-Reply-To
- <1466194887-18236-1-git-send-email-vascomalmeida@sapo.pt>
The second string inside _() was not being extracted for translation by xgettext, meaning that, although the string was passed to gettext, there was no translation available.
Mark each individual string instead of marking the result of ternary if.
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> --- builtin/remote.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/remote.c b/builtin/remote.c index d33766b..ae74da6 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -963,9 +963,9 @@ static int show_local_info_item(struct string_list_item *item, void *cb_data) printf(" %-*s ", show_info->width, item->string); if (branch_info->rebase) { - printf_ln(_(branch_info->rebase == INTERACTIVE_REBASE ? - "rebases interactively onto remote %s" : - "rebases onto remote %s"), merge->items[0].string); + printf_ln(branch_info->rebase == INTERACTIVE_REBASE + ? _("rebases interactively onto remote %s") + : _("rebases onto remote %s"), merge->items[0].string); return 0; } else if (show_info->any_rebase) { printf_ln(_(" merges with remote %s"), merge->items[0].string);
-- 2.6.6