X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/849a28d0da2d036a78c7252c2baa42e8aee8a65d..d51305e81eb593bedd92cda864671e15209c268f:/include/wx/intl.h?ds=sidebyside diff --git a/include/wx/intl.h b/include/wx/intl.h index da18e33025..87c60ae32f 100644 --- a/include/wx/intl.h +++ b/include/wx/intl.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/intl.h -// Purpose: Internationalization and localisation for wxWindows +// Purpose: Internationalization and localisation for wxWidgets // Author: Vadim Zeitlin // Modified by: Michael N. Filippov // (2003/09/30 - plural forms support) @@ -32,13 +32,11 @@ // macros // ---------------------------------------------------------------------------- -// gettext() style macros (notice that xgettext should be invoked with -// --keyword="_" --keyword="_N:1,2" --keyword="N_" options +// gettext() style macros (notice that xgettext should be invoked with +// --keyword="_" --keyword="wxGetTranslation:1,2" options // to extract the strings from the sources) #ifndef WXINTL_NO_GETTEXT_MACRO - #define _(s) wxGetTranslation(_T(s)) - #define _N(s1, s2, n) wxGetTranslation(_T(s1), _T(s2), n) - #define N_(s) _T(s) + #define _(s) wxGetTranslation(_T(s)) #endif // another one which just marks the strings for extraction, but doesn't @@ -50,8 +48,8 @@ // ---------------------------------------------------------------------------- class WXDLLIMPEXP_BASE wxLocale; -class WXDLLIMPEXP_BASE wxMsgCatalog; class WXDLLIMPEXP_BASE wxLanguageInfoArray; +class wxMsgCatalog; // ============================================================================ // locale support @@ -373,29 +371,36 @@ public: // ----------- // call Init() if you use this ctor - wxLocale(); + wxLocale() { DoCommonInit(); } + // the ctor has a side effect of changing current locale wxLocale(const wxChar *szName, // name (for messages) const wxChar *szShort = (const wxChar *) NULL, // dir prefix (for msg files) const wxChar *szLocale = (const wxChar *) NULL, // locale (for setlocale) - bool bLoadDefault = TRUE, // preload wxstd.mo? - bool bConvertEncoding = FALSE) // convert Win<->Unix if neccessary? + bool bLoadDefault = true, // preload wxstd.mo? + bool bConvertEncoding = false) // convert Win<->Unix if neccessary? { + DoCommonInit(); + Init(szName, szShort, szLocale, bLoadDefault, bConvertEncoding); } wxLocale(int language, // wxLanguage id or custom language int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING) - { Init(language, flags); } + { + DoCommonInit(); + + Init(language, flags); + } - // the same as a function (returns TRUE on success) + // the same as a function (returns true on success) bool Init(const wxChar *szName, const wxChar *szShort = (const wxChar *) NULL, const wxChar *szLocale = (const wxChar *) NULL, - bool bLoadDefault = TRUE, - bool bConvertEncoding = FALSE); + bool bLoadDefault = true, + bool bConvertEncoding = false); - // same as second ctor (returns TRUE on success) + // same as second ctor (returns true on success) bool Init(int language = wxLANGUAGE_DEFAULT, int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING); @@ -418,7 +423,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 { return m_pszOldLocale != NULL; } // returns locale name @@ -450,6 +455,8 @@ public: // // Returns 'true' if it was successfully loaded bool AddCatalog(const wxChar *szDomain); + bool AddCatalog(const wxChar *szDomain, + wxLanguage msgIdLanguage, const wxChar *msgIdCharset); // check if the given catalog is loaded bool IsLoaded(const wxChar *szDomain) const; @@ -487,16 +494,20 @@ public: // domains are searched in the last to first order, i.e. catalogs // added later override those added before. const wxChar *GetString(const wxChar *szOrigString, - const wxChar *szDomain = (const wxChar *) NULL) const; + const wxChar *szDomain = NULL) const; // plural form version of the same: const wxChar *GetString(const wxChar *szOrigString, const wxChar *szOrigString2, size_t n, - const wxChar *szDomain = (const wxChar *) NULL) const; + const wxChar *szDomain = NULL) const; // Returns the current short name for the locale const wxString& GetName() const { return m_strShort; } + // return the contents of .po file header + wxString GetHeaderValue( const wxChar* szHeader, + const wxChar* szDomain = NULL ) const; + // These two methods are for internal use only. First one creates // ms_languagesDB if it doesn't already exist, second one destroys // it. @@ -511,6 +522,9 @@ private: // m_langugagesInfo, called by InitLanguagesDB static void InitLanguagesDB(); + // initialize the member fields to default values + void DoCommonInit(); + wxString m_strLocale, // this locale name m_strShort; // short name for the locale int m_language; // this locale wxLanguage value @@ -522,6 +536,8 @@ private: bool m_bConvertEncoding; + bool m_initialized; + static wxLanguageInfoArray *ms_languagesDB; DECLARE_NO_COPY_CLASS(wxLocale) @@ -557,10 +573,10 @@ inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2, // the macros should still be defined - otherwise compilation would fail -#if !defined(WXINTL_NO_GETTEXT_MACRO) && !defined(_) - #define _(s) (_T(s)) - #define _N(s1, s2, n) ((n) == 1 ? _T(s1) : _T(s2)) - #define N_(s) _T(s) +#if !defined(WXINTL_NO_GETTEXT_MACRO) + #if !defined(_) + #define _(s) (_T(s)) + #endif #endif #define wxTRANSLATE(str) _T(str) @@ -573,8 +589,13 @@ inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2, // define this one just in case it occurs somewhere (instead of preferred // wxTRANSLATE) too -#if !defined(WXINTL_NO_GETTEXT_MACRO) && !defined(gettext_noop) - #define gettext_noop(str) _T(str) +#if !defined(WXINTL_NO_GETTEXT_MACRO) + #if !defined(gettext_noop) + #define gettext_noop(str) _T(str) + #endif + #if !defined(N_) + #define N_(s) _T(s) + #endif #endif #endif // _WX_INTL_H_