Changeset b1876d3 in git


Ignore:
Timestamp:
04/06/10 13:20:07 (9 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/survex-1_1, svn/tags/1.1.14, svn/tags/1.1.15, svn/tags/1.1.16, svn/tags/1.2.0, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/tags/v1_1_13, svn/trunk, travis-osx
Children:
15322f2
Parents:
4eaa9a3
Message:

src/aven.cc: wxWidgets now has a Slovak translation, so remove the
kludge to substitute Czech if Slovak isn't found.

git-svn-id: file:///home/survex-svn/survex/branches/survex-1_1@3382 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r4eaa9a3 rb1876d3  
     1Fri Jun 04 12:19:18 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * src/aven.cc: wxWidgets now has a Slovak translation, so remove the
     4          kludge to substitute Czech if Slovak isn't found.
     5
    16Fri Jun 04 05:08:14 GMT 2010  Olly Betts <olly@survex.com>
    27
  • src/aven.cc

    r4eaa9a3 rb1876d3  
    156156    wxLog::SetActiveTarget(new MyLogWindow());
    157157
    158     const char *lang = msg_lang2 ? msg_lang2 : msg_lang;
    159158    {
    160         // suppress message box warnings about messages not found
     159        // Suppress message box warnings about messages not found.
    161160        wxLogNull logNo;
    162161        wxLocale *loc = new wxLocale();
    163162        loc->AddCatalogLookupPathPrefix(wxString(msg_cfgpth(), wxConvUTF8));
    164         if (!loc->Init(wxString(msg_lang, wxConvUTF8),
    165                        wxString(lang, wxConvUTF8),
    166                        wxString(msg_lang, wxConvUTF8), TRUE, TRUE)) {
    167             if (lang && strcmp(lang, "sk") == 0) {
    168                // As of 2.6.3, wxWidgets has cs but not sk - the two languages
    169                // are close, so this makes sense...
    170                loc->Init(wxT("cs"), wxT("cs"), wxT("cs"), TRUE, TRUE);
    171             }
    172         }
     163        wxString msg_lang_str(msg_lang, wxConvUTF8);
     164        const char *lang = msg_lang2 ? msg_lang2 : msg_lang;
     165        wxString lang_str(lang, wxConvUTF8);
     166        loc->Init(msg_lang_str, lang_str, msg_lang_str, TRUE, TRUE);
    173167        // The existence of the wxLocale object is enough - no need to keep a
    174168        // pointer to it!
Note: See TracChangeset for help on using the changeset viewer.