X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..05e00ac5ef410707da86d98786cbb268100a7337:/wxPython/src/_intl.i

diff --git a/wxPython/src/_intl.i b/wxPython/src/_intl.i
index ba436a9a61..22f868cf08 100644
--- a/wxPython/src/_intl.i
+++ b/wxPython/src/_intl.i
@@ -308,8 +308,15 @@ class wxLocale
 public:
     // ctor & dtor
     // -----------
-    wxLocale(int language = wxLANGUAGE_DEFAULT,
-             int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
+    %extend {
+        wxLocale(int language = -1,
+                 int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING) {
+            if (language == -1)
+                return new wxLocale();
+            else
+                return new wxLocale(language, flags);
+        }
+    }
 
         // restores old locale
     ~wxLocale();
@@ -317,8 +324,8 @@ public:
     %name(Init1)bool Init(const wxString& szName,
                           const wxString& szShort = wxPyEmptyString,
                           const wxString& szLocale = wxPyEmptyString,
-                          bool bLoadDefault = TRUE,
-                          bool bConvertEncoding = FALSE);
+                          bool bLoadDefault = True,
+                          bool bConvertEncoding = False);
 
     %name(Init2) bool Init(int language = wxLANGUAGE_DEFAULT,
                            int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
@@ -350,7 +357,7 @@ public:
     // is used, the US default value is returned if everything else fails
     // static wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat);
 
-    // return TRUE if the locale was set successfully
+    // return True if the locale was set successfully
     bool IsOk() const;
     %pythoncode { def __nonzero__(self): return self.IsOk() };
 
@@ -381,7 +388,7 @@ public:
     //
     // The loaded catalog will be used for message lookup by GetString().
     //
-    // Returns 'true' if it was successfully loaded
+    // Returns 'True' if it was successfully loaded
     bool AddCatalog(const wxString& szDomain);
 
     // check if the given catalog is loaded
@@ -433,8 +440,8 @@ wxLocale* wxGetLocale();
 
 // get the translation of the string in the current locale
 %nokwargs wxGetTranslation;
-wxString wxGetTranslation(const wxString& sz);
-wxString wxGetTranslation(const wxString& sz1, const wxString& sz2, size_t n);
+wxString wxGetTranslation(const wxString& str);
+wxString wxGetTranslation(const wxString& str, const wxString& strPlural, size_t n);
 
 //---------------------------------------------------------------------------
 %newgroup
@@ -504,7 +511,7 @@ public:
     //     both modes gurantee that output string will have same length
     //     as input string
     //
-    // Returns FALSE if given conversion is impossible, TRUE otherwise
+    // Returns False if given conversion is impossible, True otherwise
     // (conversion may be impossible either if you try to convert
     // to Unicode with non-Unicode build of wxWindows or if input
     // or output encoding is not supported.)
@@ -564,7 +571,7 @@ public:
     // equivalent encodings, regardless the platform, including itself.
     static wxFontEncodingArray GetAllEquivalents(wxFontEncoding enc);
 
-    // Return true if [any text in] one multibyte encoding can be
+    // Return True if [any text in] one multibyte encoding can be
     // converted to another one losslessly.
     //
     // Do not call this with wxFONTENCODING_UNICODE, it doesn't make