i18n files are installed as part of wxBase (and should be ideally part of separate...

[wxWidgets.git] / src / common / intl.cpp

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 7556b41fb2420c9a4c45139c9a33813ab38a3ede..a5e863883ef101a092fddaf9fdbca443b00e3707 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -44,8 +44,9 @@
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"

-    #include "wx/debug.h"

     #include "wx/utils.h"
     #include "wx/utils.h"

+    #include "wx/app.h"
+    #include "wx/hashmap.h"

 #endif // WX_PRECOMP
 
 #ifndef __WXWINCE__
 #endif // WX_PRECOMP
 
 #ifndef __WXWINCE__


@@ -56,7 +57,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #ifdef HAVE_LANGINFO_H
 #include <ctype.h>
 #include <stdlib.h>
 #ifdef HAVE_LANGINFO_H

-  #include <langinfo.h>
+    #include <langinfo.h>

 #endif
 
 #ifdef __WIN32__
 #endif
 
 #ifdef __WIN32__


@@ -71,14 +72,12 @@
 #include "wx/module.h"
 #include "wx/fontmap.h"
 #include "wx/encconv.h"
 #include "wx/module.h"
 #include "wx/fontmap.h"
 #include "wx/encconv.h"

-#include "wx/hashmap.h"

 #include "wx/ptr_scpd.h"
 #include "wx/ptr_scpd.h"

-#include "wx/app.h"

 #include "wx/apptrait.h"
 #include "wx/stdpaths.h"
 
 #if defined(__WXMAC__)
 #include "wx/apptrait.h"
 #include "wx/stdpaths.h"
 
 #if defined(__WXMAC__)

-  #include  "wx/mac/private.h"  // includes mac headers
+    #include  "wx/mac/private.h"  // includes mac headers

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -1940,9 +1939,9 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
     // check for this
 
     // do we have just the language (or sublang too)?
     // check for this
 
     // do we have just the language (or sublang too)?

-    bool justLang = langFull.Len() == LEN_LANG;
+    bool justLang = langFull.length() == LEN_LANG;

     if ( justLang ||
     if ( justLang ||

-         (langFull.Len() == LEN_FULL && langFull[LEN_LANG] == wxT('_')) )
+         (langFull.length() == LEN_FULL && langFull[LEN_LANG] == wxT('_')) )

     {
         // 0. Make sure the lang is according to latest ISO 639
         //    (this is necessary because glibc uses iw and in instead
     {
         // 0. Make sure the lang is according to latest ISO 639
         //    (this is necessary because glibc uses iw and in instead


@@ -3558,7 +3557,6 @@ void wxLocale::InitLanguagesDB()
    LNG(wxLANGUAGE_SANGHO,                     "sg"   , 0              , 0                                 , "Sangho")
    LNG(wxLANGUAGE_SANSKRIT,                   "sa"   , LANG_SANSKRIT  , SUBLANG_DEFAULT                   , "Sanskrit")
    LNG(wxLANGUAGE_SCOTS_GAELIC,               "gd"   , 0              , 0                                 , "Scots Gaelic")
    LNG(wxLANGUAGE_SANGHO,                     "sg"   , 0              , 0                                 , "Sangho")
    LNG(wxLANGUAGE_SANSKRIT,                   "sa"   , LANG_SANSKRIT  , SUBLANG_DEFAULT                   , "Sanskrit")
    LNG(wxLANGUAGE_SCOTS_GAELIC,               "gd"   , 0              , 0                                 , "Scots Gaelic")

-   LNG(wxLANGUAGE_SERBIAN,                    "sr_YU", LANG_SERBIAN   , SUBLANG_DEFAULT                   , "Serbian")

    LNG(wxLANGUAGE_SERBIAN_CYRILLIC,           "sr_YU", LANG_SERBIAN   , SUBLANG_SERBIAN_CYRILLIC          , "Serbian (Cyrillic)")
    LNG(wxLANGUAGE_SERBIAN_LATIN,              "sr_YU", LANG_SERBIAN   , SUBLANG_SERBIAN_LATIN             , "Serbian (Latin)")
    LNG(wxLANGUAGE_SERBO_CROATIAN,             "sh"   , 0              , 0                                 , "Serbo-Croatian")
    LNG(wxLANGUAGE_SERBIAN_CYRILLIC,           "sr_YU", LANG_SERBIAN   , SUBLANG_SERBIAN_CYRILLIC          , "Serbian (Cyrillic)")
    LNG(wxLANGUAGE_SERBIAN_LATIN,              "sr_YU", LANG_SERBIAN   , SUBLANG_SERBIAN_LATIN             , "Serbian (Latin)")
    LNG(wxLANGUAGE_SERBO_CROATIAN,             "sh"   , 0              , 0                                 , "Serbo-Croatian")