Make sure gettext returns translations in UTF-8 encoding rather than in the current...

Original commit message from CVS:
Patch by: Frederic Crozat <fcrozat@mandriva.org>
* ext/dvdread/dvdreadsrc.c: (plugin_init):
* ext/lame/gstlame.c: (plugin_init):
* gst/asfdemux/gstasf.c: (plugin_init):
Make sure gettext returns translations in UTF-8 encoding rather
than in the current locale encoding (#546822).

diff --git a/ChangeLog b/ChangeLog
index d237e9f..a462e7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-07  Tim-Philipp Müller  <tim.muller at collabora co uk>
+
+       Patch by: Frederic Crozat <fcrozat@mandriva.org>
+
+       * ext/dvdread/dvdreadsrc.c: (plugin_init):
+       * ext/lame/gstlame.c: (plugin_init):
+       * gst/asfdemux/gstasf.c: (plugin_init):
+       Make sure gettext returns translations in UTF-8 encoding rather
+       than in the current locale encoding (#546822).
+
 2008-07-31  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
        * gst/mpegaudioparse/gstmpegaudioparse.c:

diff --git a/common b/common
index e798798..d70ca17 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit e79879859bc866545379eb77e1378a906dc30ebf
+Subproject commit d70ca17ae6fbe6020996e4567275d5e14972ed45

diff --git a/ext/dvdread/dvdreadsrc.c b/ext/dvdread/dvdreadsrc.c
index 79eb980..798126d 100644 (file)
--- a/ext/dvdread/dvdreadsrc.c
+++ b/ext/dvdread/dvdreadsrc.c
@@ -1722,6 +1722,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 */
 
   if (!gst_element_register (plugin, "dvdreadsrc", GST_RANK_SECONDARY,

diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c
index 71744b0..906faae 100644 (file)
--- a/ext/lame/gstlame.c
+++ b/ext/lame/gstlame.c
@@ -1364,6 +1364,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 */
 
   if (!gst_element_register (plugin, "lame", GST_RANK_NONE, GST_TYPE_LAME))

diff --git a/gst/asfdemux/gstasf.c b/gst/asfdemux/gstasf.c
index c09e82f..e3d212b 100644 (file)
--- a/gst/asfdemux/gstasf.c
+++ b/gst/asfdemux/gstasf.c
@@ -38,6 +38,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 */
 
   gst_riff_init ();