Updated es_ES translation from Manuel AC.

[dcpomatic.git] / src / wx / wx_util.cc

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 1a15b0e9875f91444489ffdb4903b9b848d239b3..515550e5901b91327f49de0942df230bb7d10c55 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -24,9 +24,9 @@
 #include <boost/thread.hpp>
 #include <wx/filepicker.h>
 #include <wx/spinctrl.h>
+#include "lib/config.h"
+#include "lib/util.h"
 #include "wx_util.h"
-#include "config.h"
-#include "util.h"
 
 using namespace std;
 using namespace boost;
@@ -126,7 +126,7 @@ int const ThreadedStaticText::_update_event_id = 10000;
 ThreadedStaticText::ThreadedStaticText (wxWindow* parent, wxString initial, function<string ()> fn)
        : wxStaticText (parent, wxID_ANY, initial)
 {
-       Connect (_update_event_id, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (ThreadedStaticText::thread_finished), 0, this);
+       Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ThreadedStaticText::thread_finished, this, _1), _update_event_id);
        _thread = new thread (bind (&ThreadedStaticText::run, this, fn));
 }
 
@@ -151,6 +151,7 @@ void
 ThreadedStaticText::thread_finished (wxCommandEvent& ev)
 {
        SetLabel (ev.GetString ());
+       Finished ();
 }
 
 string
@@ -259,13 +260,16 @@ dcpomatic_setup_i18n ()
                locale->AddCatalogLookupPathPrefix (std_to_wx (mo_path().string()));
 #endif         
 
+#ifdef DCPOMATIC_POSIX
+               locale->AddCatalogLookupPathPrefix (POSIX_LOCALE_PREFIX);
+#endif
+
                locale->AddCatalog (wxT ("libdcpomatic-wx"));
                locale->AddCatalog (wxT ("dcpomatic"));
                
                if (!locale->IsOk()) {
                        delete locale;
                        locale = new wxLocale (wxLANGUAGE_ENGLISH);
-                       language = wxLANGUAGE_ENGLISH;
                }
        }