mirror of
https://github.com/fish-shell/fish-shell
synced 2025-01-15 14:34:05 +00:00
Remove checks for gettext presense in mimedb.c and set_color.c. If gettext is unavailable, a fallback is provided.
darcs-hash:20060828105806-ac50b-47f092813ed70a03477d66c377edbe24f2aedf40.gz
This commit is contained in:
parent
7310596dab
commit
23152ae8a6
2 changed files with 0 additions and 12 deletions
6
mimedb.c
6
mimedb.c
|
@ -135,14 +135,10 @@ static int launch_len=0;
|
||||||
*/
|
*/
|
||||||
static int launch_pos=0;
|
static int launch_pos=0;
|
||||||
|
|
||||||
#if HAVE_GETTEXT
|
|
||||||
/**
|
/**
|
||||||
gettext alias
|
gettext alias
|
||||||
*/
|
*/
|
||||||
#define _(string) gettext(string)
|
#define _(string) gettext(string)
|
||||||
#else
|
|
||||||
#define _(string) (string)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Dynamically generated function, made from the documentation in doc_src.
|
Dynamically generated function, made from the documentation in doc_src.
|
||||||
|
@ -1145,10 +1141,8 @@ static void clear_entry( void *key, void *val )
|
||||||
static void locale_init()
|
static void locale_init()
|
||||||
{
|
{
|
||||||
setlocale( LC_ALL, "" );
|
setlocale( LC_ALL, "" );
|
||||||
#if HAVE_GETTEXT
|
|
||||||
bindtextdomain( PACKAGE_NAME, LOCALEDIR );
|
bindtextdomain( PACKAGE_NAME, LOCALEDIR );
|
||||||
textdomain( PACKAGE_NAME );
|
textdomain( PACKAGE_NAME );
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -56,11 +56,7 @@
|
||||||
*/
|
*/
|
||||||
#define GETOPT_STRING "b:hvocu"
|
#define GETOPT_STRING "b:hvocu"
|
||||||
|
|
||||||
#if HAVE_GETTEXT
|
|
||||||
#define _(string) gettext(string)
|
#define _(string) gettext(string)
|
||||||
#else
|
|
||||||
#define _(string) (string)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
char *col[]=
|
char *col[]=
|
||||||
{
|
{
|
||||||
|
@ -141,10 +137,8 @@ static void check_locale_init()
|
||||||
|
|
||||||
is_init = 1;
|
is_init = 1;
|
||||||
setlocale( LC_ALL, "" );
|
setlocale( LC_ALL, "" );
|
||||||
#if HAVE_GETTEXT
|
|
||||||
bindtextdomain( PACKAGE_NAME, LOCALEDIR );
|
bindtextdomain( PACKAGE_NAME, LOCALEDIR );
|
||||||
textdomain( PACKAGE_NAME );
|
textdomain( PACKAGE_NAME );
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue