Fix for internationalize. Now use the I18N() macro.

git-svn-id: svn://localhost/ardour2/trunk@1004 d708f5d6-7413-0410-9779-e7cbd77b26cf

9 files changed, 25 insertions, 24 deletions

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index 7e89489afd..1dcddaa830 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -66,11 +66,11 @@ AddRouteDialog::AddRouteDialog ()
 	  routes_spinner (routes_adjustment)
 {
 	if (channel_combo_strings.empty()) {
-		channel_combo_strings = PBD::internationalize (channel_setup_names);
+		channel_combo_strings = I18N (channel_setup_names);
 	}
 
 	if (track_mode_strings.empty()) {
-		track_mode_strings = PBD::internationalize (track_mode_names);
+		track_mode_strings = I18N (track_mode_names);
 	}
 
 	set_name ("AddRouteDialog");
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index eb3c3ac212..994275468a 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -91,7 +91,6 @@ using namespace Glib;
 using namespace Gtkmm2ext;
 using namespace Editing;
 
-using PBD::internationalize;
 using PBD::atoi;
 
 const double Editor::timebar_height = 15.0;
@@ -1997,7 +1996,7 @@ void
 Editor::set_snap_to (SnapType st)
 {
 	snap_type = st;
-	vector<string> txt = internationalize (snap_type_strings);
+	vector<string> txt = I18N (snap_type_strings);
 	snap_type_selector.set_active_text (txt[(int)st]);
 
 	instant_save ();
@@ -2019,7 +2018,7 @@ void
 Editor::set_snap_mode (SnapMode mode)
 {
 	snap_mode = mode;
-	vector<string> txt = internationalize (snap_mode_strings);
+	vector<string> txt = I18N (snap_mode_strings);
 	snap_mode_selector.set_active_text (txt[(int)mode]);
 
 	instant_save ();
@@ -2587,7 +2586,7 @@ Editor::setup_toolbar ()
 	
 	zoom_focus_selector.set_name ("ZoomFocusSelector");
 	Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, "Focus Center", 2+FUDGE, 0);
-	set_popdown_strings (zoom_focus_selector, internationalize (zoom_focus_strings));
+	set_popdown_strings (zoom_focus_selector, I18N (zoom_focus_strings));
 	zoom_focus_selector.signal_changed().connect (mem_fun(*this, &Editor::zoom_focus_selection_done));
 	ARDOUR_UI::instance()->tooltips().set_tip (zoom_focus_selector, _("Zoom focus"));
 
@@ -2601,13 +2600,13 @@ Editor::setup_toolbar ()
 
 	snap_type_selector.set_name ("SnapTypeSelector");
 	Gtkmm2ext::set_size_request_to_display_given_text (snap_type_selector, "SMPTE Seconds", 2+FUDGE, 10);
-	set_popdown_strings (snap_type_selector, internationalize (snap_type_strings));
+	set_popdown_strings (snap_type_selector, I18N (snap_type_strings));
 	snap_type_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_type_selection_done));
 	ARDOUR_UI::instance()->tooltips().set_tip (snap_type_selector, _("Unit to snap cursors and ranges to"));
 
 	snap_mode_selector.set_name ("SnapModeSelector");
 	Gtkmm2ext::set_size_request_to_display_given_text (snap_mode_selector, "Magnetic Snap", 2+FUDGE, 10);
-	set_popdown_strings (snap_mode_selector, internationalize (snap_mode_strings));
+	set_popdown_strings (snap_mode_selector, I18N (snap_mode_strings));
 	snap_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_mode_selection_done));
 
 	snap_box.pack_start (edit_cursor_clock, false, false);
@@ -3673,7 +3672,7 @@ Editor::get_valid_views (TimeAxisView* track, RouteGroup* group)
 void
 Editor::set_zoom_focus (ZoomFocus f)
 {
-	vector<string> txt = internationalize (zoom_focus_strings);
+	vector<string> txt = I18N (zoom_focus_strings);
 	zoom_focus_selector.set_active_text (txt[(int)f]);
 	
 	if (zoom_focus != f) {
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index e5493a2272..31f30e09a6 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -53,8 +53,6 @@ using namespace PBD;
 using namespace sigc;
 using namespace Gtk;
 
-using PBD::internationalize;
-
 static const gchar *sample_rates[] = {
 	N_("22.05kHz"),
 	N_("44.1kHz"),
@@ -212,28 +210,28 @@ ExportDialog::ExportDialog(PublicEditor& e)
 	   takes a reference. 
 	*/
 
-	vector<string> pop_strings = internationalize(sample_rates);
+	vector<string> pop_strings = I18N (sample_rates);
 	Gtkmm2ext::set_popdown_strings (sample_rate_combo, pop_strings);
 	sample_rate_combo.set_active_text (pop_strings.front());
-	pop_strings = internationalize(src_quality);
+	pop_strings = I18N (src_quality);
 	Gtkmm2ext::set_popdown_strings (src_quality_combo, pop_strings);
 	src_quality_combo.set_active_text (pop_strings.front());
-	pop_strings = internationalize(dither_types);
+	pop_strings = I18N (dither_types);
 	Gtkmm2ext::set_popdown_strings (dither_type_combo, pop_strings);
 	dither_type_combo.set_active_text (pop_strings.front());
-	pop_strings = internationalize(channel_strings);
+	pop_strings = I18N (channel_strings);
 	Gtkmm2ext::set_popdown_strings (channel_count_combo, pop_strings);
 	channel_count_combo.set_active_text (pop_strings.front());
-	pop_strings = internationalize((const char **) sndfile_header_formats_strings);
+	pop_strings = I18N ((const char **) sndfile_header_formats_strings);
 	Gtkmm2ext::set_popdown_strings (header_format_combo, pop_strings);
 	header_format_combo.set_active_text (pop_strings.front());
-	pop_strings = internationalize((const char **) sndfile_bitdepth_formats_strings);
+	pop_strings = I18N ((const char **) sndfile_bitdepth_formats_strings);
 	Gtkmm2ext::set_popdown_strings (bitdepth_format_combo, pop_strings);
 	bitdepth_format_combo.set_active_text (pop_strings.front());
-	pop_strings = internationalize((const char **) sndfile_endian_formats_strings);
+	pop_strings = I18N ((const char **) sndfile_endian_formats_strings);
 	Gtkmm2ext::set_popdown_strings (endian_format_combo, pop_strings);
 	endian_format_combo.set_active_text (pop_strings.front());
-	pop_strings = internationalize(cue_file_types);
+	pop_strings = I18N (cue_file_types);
 	Gtkmm2ext::set_popdown_strings (cue_file_combo, pop_strings);
 	cue_file_combo.set_active_text (pop_strings.front());
 
diff --git a/gtk2_ardour/i18n.h b/gtk2_ardour/i18n.h
index 71a3dccab8..d3a8e70cb2 100644
--- a/gtk2_ardour/i18n.h
+++ b/gtk2_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) internationalize (PACKAGE, Array)
 
 #endif // __i18n_h__
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 98966c8ad0..6fc758fa35 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -356,7 +356,7 @@ SoundFileOmega::SoundFileOmega (string title, ARDOUR::Session* s)
 	  split_check (_("Split Channels"))
 {
 	if (mode_strings.empty()) {
-		mode_strings = PBD::internationalize (import_mode_strings);
+		mode_strings = I18N (import_mode_strings);
 	}
 
 	ARDOUR_UI::instance()->tooltips().set_tip(split_check, 
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