X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..0c05fdf3570e8066b8a9a16627562e544306a678:/include/wx/intl.h diff --git a/include/wx/intl.h b/include/wx/intl.h index add1baa455..8a72c61796 100644 --- a/include/wx/intl.h +++ b/include/wx/intl.h @@ -2,7 +2,8 @@ // Name: wx/intl.h // Purpose: Internationalization and localisation for wxWindows // Author: Vadim Zeitlin -// Modified by: +// Modified by: Michael N. Filippov +// (2003/09/30 - plural forms support) // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin @@ -12,7 +13,7 @@ #ifndef _WX_INTL_H_ #define _WX_INTL_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "intl.h" #endif @@ -31,10 +32,11 @@ // macros // ---------------------------------------------------------------------------- -// gettext() style macro (notice that xgettext should be invoked with "-k_" -// option to extract the strings inside _() from the sources) +// 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 _(str) wxGetTranslation(_T(str)) + #define _(s) wxGetTranslation(_T(s)) #endif // another one which just marks the strings for extraction, but doesn't @@ -45,9 +47,9 @@ // forward decls // ---------------------------------------------------------------------------- -class WXDLLEXPORT_BASE wxLocale; -class WXDLLEXPORT_BASE wxMsgCatalog; -class WXDLLEXPORT_BASE wxLanguageInfoArray; +class WXDLLIMPEXP_BASE wxLocale; +class WXDLLIMPEXP_BASE wxMsgCatalog; +class WXDLLIMPEXP_BASE wxLanguageInfoArray; // ============================================================================ // locale support @@ -308,7 +310,7 @@ enum wxLanguage // translation information // ---------------------------------------------------------------------------- -struct WXDLLEXPORT_BASE wxLanguageInfo +struct WXDLLIMPEXP_BASE wxLanguageInfo { int Language; // wxLanguage id wxString CanonicalName; // Canonical name, e.g. fr_FR @@ -362,36 +364,43 @@ enum wxLocaleInitFlags wxLOCALE_CONV_ENCODING = 0x0002 // convert encoding on the fly? }; -class WXDLLEXPORT_BASE wxLocale +class WXDLLIMPEXP_BASE wxLocale { public: // ctor & dtor // ----------- // 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(); - // the same as a function (returns TRUE on success) + Init(language, flags); + } + + // 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); @@ -414,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 @@ -474,6 +483,7 @@ public: // retrieve the translation for a string in all loaded domains unless // the szDomain parameter is specified (and then only this domain is // searched) + // n - additional parameter for PluralFormsParser // // return original string if translation is not available // (in this case an error message is generated the first time @@ -483,6 +493,11 @@ public: // added later override those added before. const wxChar *GetString(const wxChar *szOrigString, const wxChar *szDomain = (const wxChar *) 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; // Returns the current short name for the locale const wxString& GetName() const { return m_strShort; } @@ -501,6 +516,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 @@ -512,6 +530,8 @@ private: bool m_bConvertEncoding; + bool m_initialized; + static wxLanguageInfoArray *ms_languagesDB; DECLARE_NO_COPY_CLASS(wxLocale) @@ -522,7 +542,7 @@ private: // ---------------------------------------------------------------------------- // get the current locale object (note that it may be NULL!) -extern WXDLLEXPORT_BASE wxLocale* wxGetLocale(); +extern WXDLLIMPEXP_BASE wxLocale* wxGetLocale(); // get the translation of the string in the current locale inline const wxChar *wxGetTranslation(const wxChar *sz) @@ -533,13 +553,24 @@ inline const wxChar *wxGetTranslation(const wxChar *sz) else return sz; } +inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2, + size_t n) +{ + wxLocale *pLoc = wxGetLocale(); + if (pLoc) + return pLoc->GetString(sz1, sz2, n); + else + return n == 1 ? sz1 : sz2; +} #else // !wxUSE_INTL // the macros should still be defined - otherwise compilation would fail -#if !defined(WXINTL_NO_GETTEXT_MACRO) && !defined(_) - #define _(str) (_T(str)) +#if !defined(WXINTL_NO_GETTEXT_MACRO) + #if !defined(_) + #define _(s) (_T(s)) + #endif #endif #define wxTRANSLATE(str) _T(str) @@ -552,8 +583,13 @@ inline const wxChar *wxGetTranslation(const wxChar *sz) // 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_