From e8b7c2a3e9c9aa9f88d989cc02431e9185202d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Sat, 29 Jul 2006 11:20:30 +0000
Subject: [PATCH] Make custom error messages translatable.

Original commit message from CVS:
* ext/dvdread/dvdreadsrc.c: (plugin_init):
* po/POTFILES.in:
Make custom error messages translatable.
* gst/asfdemux/gstasf.c: (plugin_init):
Remove setlocale() call, doesn't seem to be needed or recommended for
plugins, at least not according to gstreamer/docs/random/i18n.
---
 ChangeLog                | 10 ++++++++++
 common                   |  2 +-
 ext/dvdread/dvdreadsrc.c | 10 +++++++---
 gst/asfdemux/gstasf.c    |  3 ++-
 po/POTFILES.in           |  1 +
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3f5f020079..7248fc4e63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-07-29  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/dvdread/dvdreadsrc.c: (plugin_init):
+	* po/POTFILES.in:
+	  Make custom error messages translatable.
+
+	* gst/asfdemux/gstasf.c: (plugin_init):
+	  Remove setlocale() call, doesn't seem to be needed or recommended for
+	  plugins, at least not according to gstreamer/docs/random/i18n.
+
 2006-07-28  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst/asfdemux/Makefile.am:
diff --git a/common b/common
index ef97fb3278..e9ea99f6e8 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit ef97fb3278d98a1fdb32e5c6b2a7467116ffc160
+Subproject commit e9ea99f6e89d7e1af3a0a859bfeb0ed6ecf2e3a9
diff --git a/ext/dvdread/dvdreadsrc.c b/ext/dvdread/dvdreadsrc.c
index fd7f013a4a..4cc0d0934a 100644
--- a/ext/dvdread/dvdreadsrc.c
+++ b/ext/dvdread/dvdreadsrc.c
@@ -32,9 +32,7 @@
 
 #include "dvdreadsrc.h"
 
-/* #include <gst/gst-i18n-plugin.h> */
-/* FIXME: remove once GETTEXT_PACKAGE etc. is set */
-#define _(s) s
+#include <gst/gst-i18n-plugin.h>
 
 GST_DEBUG_CATEGORY_STATIC (gstgst_dvd_read_src_debug);
 #define GST_CAT_DEFAULT (gstgst_dvd_read_src_debug)
@@ -1403,6 +1401,12 @@ gst_dvd_read_src_do_init (GType dvdreadsrc_type)
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
+#ifdef ENABLE_NLS
+  GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
+      LOCALEDIR);
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+#endif /* ENABLE_NLS */
+
   GST_DEBUG_CATEGORY_INIT (gstgst_dvd_read_src_debug, "dvdreadsrc", 0,
       "DVD reader element based on dvdreadsrc");
 
diff --git a/gst/asfdemux/gstasf.c b/gst/asfdemux/gstasf.c
index e7dcaec0f8..3eedbd8d0d 100644
--- a/gst/asfdemux/gstasf.c
+++ b/gst/asfdemux/gstasf.c
@@ -32,7 +32,8 @@ static gboolean
 plugin_init (GstPlugin * plugin)
 {
 #ifdef ENABLE_NLS
-  setlocale (LC_ALL, "");
+  GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
+      LOCALEDIR);
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 #endif /* ENABLE_NLS */
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d46424900a..11f52306ff 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,5 @@
 # not activated yet:
 # ext/dvdnav/dvdnavsrc.c
 
+ext/dvdread/dvdreadsrc.c
 gst/asfdemux/gstasfdemux.c