i18n: remote: allow translations to reorder message

Git fork

Before this patch, translations couldn't place the branch name
where it was better fit in the message "and with remote <branch_name>".
Allow translations that, instead of forcing the branch name to display
right of the message.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Vasco Almeida and committed by

Junio C Hamano 9 years ago a1b467a4 7ba7b9ab

+3 -4

1 changed file

expand all

unified split

builtin

remote.c

+3 -4

builtin/remote.c

··· 952 952 struct show_info *show_info = cb_data; 953 953 struct branch_info *branch_info = item->util; 954 954 struct string_list *merge = &branch_info->merge; 955 - const char *also; 955 + int width = show_info->width + 4; 956 956 int i; 957 957 958 958 if (branch_info->rebase && branch_info->merge.nr > 1) { ··· 969 969 return 0; 970 970 } else if (show_info->any_rebase) { 971 971 printf_ln(_(" merges with remote %s"), merge->items[0].string); 972 - also = _(" and with remote"); 972 + width++; 973 973 } else { 974 974 printf_ln(_("merges with remote %s"), merge->items[0].string); 975 - also = _(" and with remote"); 976 975 } 977 976 for (i = 1; i < merge->nr; i++) 978 - printf(" %-*s %s %s\n", show_info->width, "", also, 977 + printf(_("%-*s and with remote %s\n"), width, "", 979 978 merge->items[i].string); 980 979 981 980 return 0;