ardour/livetrax
13
0
Fork 0
Code

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

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1004 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Taybin Rutkin 2006-10-24 15:38:46 +00:00
parent bbbc28d3e5
commit e6fdb95024
9 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/add_route_dialog.cc
View File

@ -66,11 +66,11 @@ AddRouteDialog::AddRouteDialog ()
routes_spinner (routes_adjustment) routes_spinner (routes_adjustment)
{ {
if (channel_combo_strings.empty()) { 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()) { if (track_mode_strings.empty()) {
track_mode_strings = PBD::internationalize (track_mode_names); track_mode_strings = I18N (track_mode_names);
} }
set_name ("AddRouteDialog"); set_name ("AddRouteDialog");

13
gtk2_ardour/editor.cc
View File

@ -91,7 +91,6 @@ using namespace Glib;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
using namespace Editing; using namespace Editing;
using PBD::internationalize;
using PBD::atoi; using PBD::atoi;
const double Editor::timebar_height = 15.0; const double Editor::timebar_height = 15.0;
@ -1997,7 +1996,7 @@ void
Editor::set_snap_to (SnapType st) Editor::set_snap_to (SnapType st)
{ {
snap_type = 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]); snap_type_selector.set_active_text (txt[(int)st]);
instant_save (); instant_save ();
@ -2019,7 +2018,7 @@ void
Editor::set_snap_mode (SnapMode mode) Editor::set_snap_mode (SnapMode mode)
{ {
snap_mode = 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]); snap_mode_selector.set_active_text (txt[(int)mode]);
instant_save (); instant_save ();
@ -2587,7 +2586,7 @@ Editor::setup_toolbar ()
zoom_focus_selector.set_name ("ZoomFocusSelector"); zoom_focus_selector.set_name ("ZoomFocusSelector");
Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, "Focus Center", 2+FUDGE, 0); 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)); 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")); ARDOUR_UI::instance()->tooltips().set_tip (zoom_focus_selector, _("Zoom focus"));
@ -2601,13 +2600,13 @@ Editor::setup_toolbar ()
snap_type_selector.set_name ("SnapTypeSelector"); snap_type_selector.set_name ("SnapTypeSelector");
Gtkmm2ext::set_size_request_to_display_given_text (snap_type_selector, "SMPTE Seconds", 2+FUDGE, 10); 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)); 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")); ARDOUR_UI::instance()->tooltips().set_tip (snap_type_selector, _("Unit to snap cursors and ranges to"));
snap_mode_selector.set_name ("SnapModeSelector"); snap_mode_selector.set_name ("SnapModeSelector");
Gtkmm2ext::set_size_request_to_display_given_text (snap_mode_selector, "Magnetic Snap", 2+FUDGE, 10); 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_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_mode_selection_done));
snap_box.pack_start (edit_cursor_clock, false, false); snap_box.pack_start (edit_cursor_clock, false, false);
@ -3673,7 +3672,7 @@ Editor::get_valid_views (TimeAxisView* track, RouteGroup* group)
void void
Editor::set_zoom_focus (ZoomFocus f) 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]); zoom_focus_selector.set_active_text (txt[(int)f]);
if (zoom_focus != f) { if (zoom_focus != f) {

18
gtk2_ardour/export_dialog.cc
View File

@ -53,8 +53,6 @@ using namespace PBD;
using namespace sigc; using namespace sigc;
using namespace Gtk; using namespace Gtk;
using PBD::internationalize;
static const gchar *sample_rates[] = { static const gchar *sample_rates[] = {
N_("22.05kHz"), N_("22.05kHz"),
N_("44.1kHz"), N_("44.1kHz"),
@ -212,28 +210,28 @@ ExportDialog::ExportDialog(PublicEditor& e)
takes a reference. 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); Gtkmm2ext::set_popdown_strings (sample_rate_combo, pop_strings);
sample_rate_combo.set_active_text (pop_strings.front()); 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); Gtkmm2ext::set_popdown_strings (src_quality_combo, pop_strings);
src_quality_combo.set_active_text (pop_strings.front()); 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); Gtkmm2ext::set_popdown_strings (dither_type_combo, pop_strings);
dither_type_combo.set_active_text (pop_strings.front()); 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); Gtkmm2ext::set_popdown_strings (channel_count_combo, pop_strings);
channel_count_combo.set_active_text (pop_strings.front()); 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); Gtkmm2ext::set_popdown_strings (header_format_combo, pop_strings);
header_format_combo.set_active_text (pop_strings.front()); 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); Gtkmm2ext::set_popdown_strings (bitdepth_format_combo, pop_strings);
bitdepth_format_combo.set_active_text (pop_strings.front()); 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); Gtkmm2ext::set_popdown_strings (endian_format_combo, pop_strings);
endian_format_combo.set_active_text (pop_strings.front()); 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); Gtkmm2ext::set_popdown_strings (cue_file_combo, pop_strings);
cue_file_combo.set_active_text (pop_strings.front()); cue_file_combo.set_active_text (pop_strings.front());

2
gtk2_ardour/i18n.h
View File

@ -2,6 +2,7 @@
#define __i18n_h__ #define __i18n_h__
#include <pbd/compose.h> #include <pbd/compose.h>
#include <pbd/convert.h>
#include "gettext.h" #include "gettext.h"
#include <vector> #include <vector>
@ -10,5 +11,6 @@
#define _(Text) dgettext (PACKAGE,Text) #define _(Text) dgettext (PACKAGE,Text)
#define N_(Text) gettext_noop (Text) #define N_(Text) gettext_noop (Text)
#define X_(Text) Text #define X_(Text) Text
#define I18N(Array) internationalize (PACKAGE, Array)
#endif // __i18n_h__ #endif // __i18n_h__

2
gtk2_ardour/sfdb_ui.cc
View File

@ -356,7 +356,7 @@ SoundFileOmega::SoundFileOmega (string title, ARDOUR::Session* s)
split_check (_("Split Channels")) split_check (_("Split Channels"))
{ {
if (mode_strings.empty()) { 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, ARDOUR_UI::instance()->tooltips().set_tip(split_check,

2
libs/ardour/i18n.h
View File

@ -2,6 +2,7 @@
#define __i18n_h__ #define __i18n_h__
#include <pbd/compose.h> #include <pbd/compose.h>
#include <pbd/convert.h>
#include "gettext.h" #include "gettext.h"
#include <vector> #include <vector>
@ -10,5 +11,6 @@
#define _(Text) dgettext (PACKAGE,Text) #define _(Text) dgettext (PACKAGE,Text)
#define N_(Text) gettext_noop (Text) #define N_(Text) gettext_noop (Text)
#define X_(Text) Text #define X_(Text) Text
#define I18N(Array) PBD::internationalize (PACKAGE, Array)
#endif // __i18n_h__ #endif // __i18n_h__

2
libs/ardour/sndfile_helpers.cc
View File

@ -110,7 +110,7 @@ sndfile_file_ending_from_string (string str)
static vector<string> file_endings; static vector<string> file_endings;
if (file_endings.empty()) { 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) { for (int n = 0; sndfile_header_formats_strings[n]; ++n) {

4
libs/pbd/convert.cc
View File

@ -106,12 +106,12 @@ atof (const string& s)
} }
vector<string> vector<string>
internationalize (const char **array) internationalize (const char *package_name, const char **array)
{ {
vector<string> v; vector<string> v;
for (uint32_t i = 0; array[i]; ++i) { for (uint32_t i = 0; array[i]; ++i) {
v.push_back (_(array[i])); v.push_back (dgettext(package_name, array[i]));
} }
return v; return v;

2
libs/pbd/pbd/convert.h
View File

@ -33,7 +33,7 @@ void url_decode (std::string&);
std::string length2string (const int32_t frames, const float sample_rate); 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 } //namespace PBD