X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22f3361e1cf25c52a2da8fdfc5cb081809e18fb9..61f3e0f5c172147d5ba76fc7f099472c1e05aba4:/include/wx/intl.h diff --git a/include/wx/intl.h b/include/wx/intl.h index 2f50345325..c784562899 100644 --- a/include/wx/intl.h +++ b/include/wx/intl.h @@ -2,17 +2,18 @@ // 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 -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #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 wxLocale; -class WXDLLEXPORT wxMsgCatalog; -class WXDLLEXPORT 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 wxLanguageInfo +struct WXDLLIMPEXP_BASE wxLanguageInfo { int Language; // wxLanguage id wxString CanonicalName; // Canonical name, e.g. fr_FR @@ -362,7 +364,7 @@ enum wxLocaleInitFlags wxLOCALE_CONV_ENCODING = 0x0002 // convert encoding on the fly? }; -class WXDLLEXPORT wxLocale +class WXDLLIMPEXP_BASE wxLocale { public: // ctor & dtor @@ -455,6 +457,17 @@ public: // Returns NULL if no info found, pointer must *not* be deleted by caller static const wxLanguageInfo *GetLanguageInfo(int lang); + // Returns language name in English or empty string if the language + // is not in database + static wxString GetLanguageName(int lang); + + // Find the language for the given locale string which may be either a + // canonical ISO 2 letter language code ("xx"), a language code followed by + // the country code ("xx_XX") or a Windows full language name ("Xxxxx...") + // + // Returns NULL if no info found, pointer must *not* be deleted by caller + static const wxLanguageInfo *FindLanguageInfo(const wxString& locale); + // Add custom language to the list of known languages. // Notes: 1) wxLanguageInfo contains platform-specific data // 2) must be called before Init to have effect @@ -463,6 +476,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 @@ -472,6 +486,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 +520,8 @@ private: bool m_bConvertEncoding; + bool m_initialized; + static wxLanguageInfoArray *ms_languagesDB; DECLARE_NO_COPY_CLASS(wxLocale) @@ -511,7 +532,7 @@ private: // ---------------------------------------------------------------------------- // get the current locale object (note that it may be NULL!) -extern WXDLLEXPORT wxLocale* wxGetLocale(); +extern WXDLLIMPEXP_BASE wxLocale* wxGetLocale(); // get the translation of the string in the current locale inline const wxChar *wxGetTranslation(const wxChar *sz) @@ -522,13 +543,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) (str) +#if !defined(WXINTL_NO_GETTEXT_MACRO) + #if !defined(_) + #define _(s) (_T(s)) + #endif #endif #define wxTRANSLATE(str) _T(str) @@ -541,8 +573,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_