From e6fdb9502498a04f22ab42c1ff1b5d33d1a43152 Mon Sep 17 00:00:00 2001
From: Taybin Rutkin <taybin@taybin.com>
Date: Tue, 24 Oct 2006 15:38:46 +0000
Subject: Fix for internationalize.  Now use the I18N() macro.

git-svn-id: svn://localhost/ardour2/trunk@1004 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/i18n.h             | 2 ++
 libs/ardour/sndfile_helpers.cc | 2 +-
 libs/pbd/convert.cc            | 4 ++--
 libs/pbd/pbd/convert.h         | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'libs')

diff --git a/libs/ardour/i18n.h b/libs/ardour/i18n.h
index 71a3dccab8..5d68c79edd 100644
--- a/libs/ardour/i18n.h
+++ b/libs/ardour/i18n.h
@@ -2,6 +2,7 @@
 #define __i18n_h__
 
 #include <pbd/compose.h>
+#include <pbd/convert.h>
 #include "gettext.h"
 
 #include <vector>
@@ -10,5 +11,6 @@
 #define _(Text)  dgettext (PACKAGE,Text)
 #define N_(Text) gettext_noop (Text)
 #define X_(Text) Text
+#define I18N(Array) PBD::internationalize (PACKAGE, Array)
 
 #endif // __i18n_h__
diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc
index b308a74c36..14bf361831 100644
--- a/libs/ardour/sndfile_helpers.cc
+++ b/libs/ardour/sndfile_helpers.cc
@@ -110,7 +110,7 @@ sndfile_file_ending_from_string (string str)
 	static vector<string> file_endings;
 
 	if (file_endings.empty()) {
-		file_endings = PBD::internationalize((const char **) sndfile_file_endings_strings);
+		file_endings = I18N((const char **) sndfile_file_endings_strings);
 	}
 
 	for (int n = 0; sndfile_header_formats_strings[n]; ++n) {
diff --git a/libs/pbd/convert.cc b/libs/pbd/convert.cc
index 60d39c91e2..3b709d8e42 100644
--- a/libs/pbd/convert.cc
+++ b/libs/pbd/convert.cc
@@ -106,12 +106,12 @@ atof (const string& s)
 }
 
 vector<string>
-internationalize (const char **array)
+internationalize (const char *package_name, const char **array)
 {
 	vector<string> v;
 
 	for (uint32_t i = 0; array[i]; ++i) {
-		v.push_back (_(array[i]));
+		v.push_back (dgettext(package_name, array[i]));
 	}
 
 	return v;
diff --git a/libs/pbd/pbd/convert.h b/libs/pbd/pbd/convert.h
index 12e63ba6fc..e838b756bc 100644
--- a/libs/pbd/pbd/convert.h
+++ b/libs/pbd/pbd/convert.h
@@ -33,7 +33,7 @@ void   url_decode (std::string&);
 
 std::string length2string (const int32_t frames, const float sample_rate);
 
-std::vector<std::string> internationalize (const char **);
+std::vector<std::string> internationalize (const char *, const char **);
 
 } //namespace PBD
 
-- 
cgit v1.2.3