mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch: align per-ref summary report in UTF-8 locales

Browse Source 
fetch does printf("%-*s", width, "foo") where "foo" can be a utf-8
string, but width is in bytes, not columns. For ASCII it's fine as one
byte takes one column. For utf-8, this may result in misaligned ref
summary table.

Introduce gettext_width() function that returns the string length in
columns (currently only supports utf-8 locales). Make the code use
TRANSPORT_SUMMARY(x) where the length is compensated properly in
non-English locales.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2012-09-04 17:39:35 +07:00
committed by Junio C Hamano
parent b52183179b
commit 754395d305
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gettext.c
View File

@ -4,6 +4,8 @@
#include "git-compat-util.h"
#include "gettext.h"
#include "strbuf.h"
#include "utf8.h"
#ifndef NO_GETTEXT
# include <locale.h>
@ -27,10 +29,9 @@ int use_gettext_poison(void)
#endif
#ifndef NO_GETTEXT
static const char *charset;
static void init_gettext_charset(const char *domain)
{
const char *charset;
/*
This trick arranges for messages to be emitted in the user's
requested encoding, but avoids setting LC_CTYPE from the
@ -128,4 +129,14 @@ void git_setup_gettext(void)
init_gettext_charset("git");
textdomain("git");
}
/* return the number of columns of string 's' in current locale */
int gettext_width(const char *s)
{
static int is_utf8 = -1;
if (is_utf8 == -1)
is_utf8 = !strcmp(charset, "UTF-8");
return is_utf8 ? utf8_strwidth(s) : strlen(s);
}
#endif