smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

start passing around the (possibly-bundle-modified) localedir so that we call bindtextdomain() correctly, and thus (hopefully) find message catalogs correctly inside a bundle

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13965 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2013-01-21 23:14:00 +00:00
parent c09dc77dfc
commit 2a2b48ef66
7 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
gtk2_ardour/main.cc
View file

@ -148,6 +148,14 @@ fixup_bundle_environment (int, char* [])
bundle_dir = Glib::path_get_dirname (exec_dir);
/* force localedir into the bundle */
vector<string> lpath;
lpath.push_back (bundle_dir);
lpath.push_back ("share");
lpath.push_back ("locale");
localedir = strdup (Glib::build_filename (lpath).c_str());
export_search_path (bundle_dir, "ARDOUR_DLL_PATH", "/lib");
/* inside an OS X .app bundle, there is no difference
@ -224,6 +232,14 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
std::string dir_path = Glib::path_get_dirname (Glib::path_get_dirname (argv[0]));
std::string userconfigdir = user_config_directory();
/* force localedir into the bundle */
vector<string> lpath;
lpath.push_back (dir_path);
lpath.push_back ("share");
lpath.push_back ("locale");
localedir = strdup (Glib::build_filename (lpath).c_str());
/* note that this function is POSIX/Linux specific, so using / as
a dir separator in this context is just fine.
*/
@ -446,7 +462,7 @@ int main (int argc, char *argv[])
}
try {
ui = new ARDOUR_UI (&argc, &argv);
ui = new ARDOUR_UI (&argc, &argv, localedir);
} catch (failed_constructor& err) {
error << _("could not create ARDOUR GUI") << endmsg;
exit (1);