moparisthebest
/
wget
mirror of https://github.com/moparisthebest/wget
1
0
Fork 0
Code Issues Releases Wiki Activity

ChangeLog entries for NLS progress-bar changes; use correct conditional checks in progress.c.

This commit is contained in:
Micah Cowan 2008-02-06 16:53:46 -08:00
parent e95867e6cc
commit b9a2f26240
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-02-06 Micah Cowan <micah@cowan.name>
* configure.ac (AC_CHECK_FUNCS): Added check for mbtowc.
2008-02-03 Micah Cowan <micah@cowan.name>
* configure.in: Add checks for wchar.h, wcwidth function (to

9
src/ChangeLog
View File

@ -1,3 +1,12 @@
2008-02-06 Micah Cowan <micah@cowan.name>
* progress.c (countcols): Use strlen() when mbtowc or wcwidth
not available (or not using NLS).
* utils.c: Ensure we use single-byte separators when not doing
NLS progress-bars.
* wget.h: Determine whether to use NLS for progress-bars, based
on whether wcwidth and mbtowc are available.
2008-02-03 Micah Cowan <micah@cowan.name>
* progress.c (create_image): Use number of characters/columns

6
src/progress.c
View File

@ -767,7 +767,7 @@ update_speed_ring (struct bar_progress *bp, wgint howmuch, double dltime)
#endif
}
#if HAVE_MBTOWC && HAVE_WCWIDTH
#if USE_NLS_PROGRESS_BAR
int
count_cols (const char *mbs)
{
@ -795,8 +795,6 @@ count_cols (const char *mbs)
}
#else
# define count_cols(mbs) ((int)(strlen(mbs)))
# undef wcwidth
# define wcwidth(wc) (1)
#endif
/* Translation note: "ETA" is English-centric, but this must
@ -813,7 +811,7 @@ get_eta (void)
int nbytes;
int ncols;
#if HAVE_WCWIDTH && HAVE_MBTOWC
#if USE_NLS_PROGRESS_BAR
eta_trans = _(eta_str);
#else
eta_trans = eta_str;