Commit ed5205fe authored by Christophe Mutricy's avatar Christophe Mutricy

Use dgettext() (aka _() ) rather than gettext().

parent 636e7566
...@@ -1208,7 +1208,6 @@ VLC_EXPORT( unsigned, vlc_CPU, ( void ) ); ...@@ -1208,7 +1208,6 @@ VLC_EXPORT( unsigned, vlc_CPU, ( void ) );
#else #else
# define _(String) (String) # define _(String) (String)
# define N_(String) (String) # define N_(String) (String)
# define gettext(String) (String)
#endif #endif
/***************************************************************************** /*****************************************************************************
......
...@@ -353,7 +353,7 @@ config_Write (FILE *file, const char *type, const char *desc, ...@@ -353,7 +353,7 @@ config_Write (FILE *file, const char *type, const char *desc,
if (desc == NULL) if (desc == NULL)
desc = "?"; desc = "?";
if (fprintf (file, "# %s (%s)\n%s%s=", desc, gettext (type), if (fprintf (file, "# %s (%s)\n%s%s=", desc, _(type),
comment ? "#" : "", name) < 0) comment ? "#" : "", name) < 0)
return -1; return -1;
......
...@@ -200,8 +200,8 @@ int vlc_config_set (module_config_t *restrict item, int id, ...) ...@@ -200,8 +200,8 @@ int vlc_config_set (module_config_t *restrict item, int id, ...)
const char *text = va_arg (ap, const char *); const char *text = va_arg (ap, const char *);
const char *longtext = va_arg (ap, const char *); const char *longtext = va_arg (ap, const char *);
item->psz_text = text ? strdup (gettext (text)) : NULL; item->psz_text = text ? strdup ( _(text)) : NULL;
item->psz_longtext = longtext ? strdup (gettext (text)) : NULL; item->psz_longtext = longtext ? strdup ( _(text)) : NULL;
ret = 0; ret = 0;
break; break;
} }
...@@ -352,7 +352,7 @@ int vlc_config_set (module_config_t *restrict item, int id, ...) ...@@ -352,7 +352,7 @@ int vlc_config_set (module_config_t *restrict item, int id, ...)
if (text != NULL) if (text != NULL)
{ {
for (size_t i = 0; i < len; i++) for (size_t i = 0; i < len; i++)
dtext[i] = text[i] ? strdup (gettext (text[i])) : NULL; dtext[i] = text[i] ? strdup ( _(text[i])) : NULL;
dtext[len] = NULL; dtext[len] = NULL;
item->ppsz_list_text = dtext; item->ppsz_list_text = dtext;
...@@ -389,7 +389,7 @@ int vlc_config_set (module_config_t *restrict item, int id, ...) ...@@ -389,7 +389,7 @@ int vlc_config_set (module_config_t *restrict item, int id, ...)
item->ppsz_action_text = tabtext; item->ppsz_action_text = tabtext;
if (name) if (name)
tabtext[item->i_action] = strdup (gettext (name)); tabtext[item->i_action] = strdup ( _(name));
else else
tabtext[item->i_action] = NULL; tabtext[item->i_action] = NULL;
tabtext[item->i_action + 1] = NULL; tabtext[item->i_action + 1] = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment