From 426721f717d3bb2ff4fe6249500a7f1992c246a6 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Thu, 7 Aug 2008 16:11:00 +0000 Subject: [PATCH] Make sure gettext returns translations in UTF-8 encoding rather than in the current locale encoding (#546822). Original commit message from CVS: Patch by: Frederic Crozat * ext/esd/gstesd.c: (plugin_init): * ext/flac/gstflac.c: (plugin_init): * ext/shout2/gstshout2.c: (plugin_init): * ext/wavpack/gstwavpack.c: (plugin_init): * sys/oss/gstossaudio.c: (plugin_init): * sys/v4l2/gstv4l2.c: (plugin_init): Make sure gettext returns translations in UTF-8 encoding rather than in the current locale encoding (#546822). --- ChangeLog | 13 +++++++++++++ ext/esd/gstesd.c | 1 + ext/flac/gstflac.c | 1 + ext/shout2/gstshout2.c | 1 + ext/wavpack/gstwavpack.c | 1 + sys/oss/gstossaudio.c | 1 + sys/v4l2/gstv4l2.c | 1 + 7 files changed, 19 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5c87959..f49fed4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2008-08-07 Tim-Philipp Müller + + Patch by: Frederic Crozat + + * ext/esd/gstesd.c: (plugin_init): + * ext/flac/gstflac.c: (plugin_init): + * ext/shout2/gstshout2.c: (plugin_init): + * ext/wavpack/gstwavpack.c: (plugin_init): + * sys/oss/gstossaudio.c: (plugin_init): + * sys/v4l2/gstv4l2.c: (plugin_init): + Make sure gettext returns translations in UTF-8 encoding rather + than in the current locale encoding (#546822). + 2008-08-07 Sebastian Dröge * ext/flac/gstflacdec.c: diff --git a/ext/esd/gstesd.c b/ext/esd/gstesd.c index 71fc30b..dc65001 100644 --- a/ext/esd/gstesd.c +++ b/ext/esd/gstesd.c @@ -47,6 +47,7 @@ plugin_init (GstPlugin * plugin) #ifdef ENABLE_NLS setlocale (LC_ALL, ""); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); #endif /* ENABLE_NLS */ return TRUE; diff --git a/ext/flac/gstflac.c b/ext/flac/gstflac.c index 7d76a41..a198279 100644 --- a/ext/flac/gstflac.c +++ b/ext/flac/gstflac.c @@ -35,6 +35,7 @@ plugin_init (GstPlugin * plugin) GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE, LOCALEDIR); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); #endif if (!gst_element_register (plugin, "flacenc", GST_RANK_NONE, diff --git a/ext/shout2/gstshout2.c b/ext/shout2/gstshout2.c index 1285ced..4a10317 100644 --- a/ext/shout2/gstshout2.c +++ b/ext/shout2/gstshout2.c @@ -758,6 +758,7 @@ plugin_init (GstPlugin * plugin) #ifdef ENABLE_NLS setlocale (LC_ALL, ""); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); #endif /* ENABLE_NLS */ return gst_element_register (plugin, "shout2send", GST_RANK_NONE, diff --git a/ext/wavpack/gstwavpack.c b/ext/wavpack/gstwavpack.c index 580d658..6045717 100644 --- a/ext/wavpack/gstwavpack.c +++ b/ext/wavpack/gstwavpack.c @@ -41,6 +41,7 @@ plugin_init (GstPlugin * plugin) GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE, LOCALEDIR); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); #endif return (gst_wavpack_parse_plugin_init (plugin) diff --git a/sys/oss/gstossaudio.c b/sys/oss/gstossaudio.c index 69c6745..aa70b09 100644 --- a/sys/oss/gstossaudio.c +++ b/sys/oss/gstossaudio.c @@ -48,6 +48,7 @@ plugin_init (GstPlugin * plugin) GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE, LOCALEDIR); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); #endif /* ENABLE_NLS */ return TRUE; diff --git a/sys/v4l2/gstv4l2.c b/sys/v4l2/gstv4l2.c index a65f7c1..15602b9 100644 --- a/sys/v4l2/gstv4l2.c +++ b/sys/v4l2/gstv4l2.c @@ -56,6 +56,7 @@ plugin_init (GstPlugin * plugin) #ifdef ENABLE_NLS setlocale (LC_ALL, ""); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); #endif /* ENABLE_NLS */ return TRUE; -- 2.7.4