// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// WARNING: Parts of this file are generated. See misc/languages/README for
+// details.
+
#ifndef _WX_INTL_H_
#define _WX_INTL_H_
// --keyword="_" --keyword="wxPLURAL:1,2" options
// to extract the strings from the sources)
#ifndef WXINTL_NO_GETTEXT_MACRO
- #define _(s) wxGetTranslation(_T(s))
- #define wxPLURAL(sing, plur, n) wxGetTranslation(_T(sing), _T(plur), n)
+ #define _(s) wxGetTranslation((s))
+ #define wxPLURAL(sing, plur, n) wxGetTranslation((sing), (plur), n)
#endif
// another one which just marks the strings for extraction, but doesn't
// perform the translation (use -kwxTRANSLATE with xgettext!)
-#define wxTRANSLATE(str) _T(str)
+#define wxTRANSLATE(str) str
// ----------------------------------------------------------------------------
// forward decls
// ----------------------------------------------------------------------------
-class WXDLLIMPEXP_BASE wxLocale;
-class WXDLLIMPEXP_BASE wxLanguageInfoArray;
+class WXDLLIMPEXP_FWD_BASE wxLocale;
+class WXDLLIMPEXP_FWD_BASE wxLanguageInfoArray;
class wxMsgCatalog;
// ============================================================================
// --- --- --- generated code begins here --- --- ---
-// This enum is generated by misc/languages/genlang.py
-// When making changes, please put them into misc/languages/langtabl.txt
+/**
+ The languages supported by wxLocale.
+
+ This enum is generated by misc/languages/genlang.py
+ When making changes, please put them into misc/languages/langtabl.txt
+*/
enum wxLanguage
{
- // user's default/preffered language as got from OS:
+ /// User's default/preffered language as got from OS.
wxLANGUAGE_DEFAULT,
- // unknown language, if wxLocale::GetSystemLanguage fails:
+
+ /// Unknown language, returned if wxLocale::GetSystemLanguage fails.
wxLANGUAGE_UNKNOWN,
wxLANGUAGE_ABKHAZIAN,
wxLANGUAGE_ARABIC_YEMEN,
wxLANGUAGE_ARMENIAN,
wxLANGUAGE_ASSAMESE,
+ wxLANGUAGE_ASTURIAN,
wxLANGUAGE_AYMARA,
wxLANGUAGE_AZERI,
wxLANGUAGE_AZERI_CYRILLIC,
wxLANGUAGE_ROMANIAN,
wxLANGUAGE_RUSSIAN,
wxLANGUAGE_RUSSIAN_UKRAINE,
+ wxLANGUAGE_SAMI,
wxLANGUAGE_SAMOAN,
wxLANGUAGE_SANGHO,
wxLANGUAGE_SANSKRIT,
wxLANGUAGE_UZBEK,
wxLANGUAGE_UZBEK_CYRILLIC,
wxLANGUAGE_UZBEK_LATIN,
+ wxLANGUAGE_VALENCIAN,
wxLANGUAGE_VIETNAMESE,
wxLANGUAGE_VOLAPUK,
wxLANGUAGE_WELSH,
wxLANGUAGE_ZHUANG,
wxLANGUAGE_ZULU,
- // for custom, user-defined languages:
+ /// For custom, user-defined languages.
wxLANGUAGE_USER_DEFINED
};
{
int Language; // wxLanguage id
wxString CanonicalName; // Canonical name, e.g. fr_FR
-#ifdef __WIN32__
+#ifdef __WXMSW__
wxUint32 WinLang, // Win32 language identifiers
WinSublang;
-#endif // __WIN32__
+#endif // __WXMSW__
wxString Description; // human-readable name of the language
wxLayoutDirection LayoutDirection;
+
+#ifdef __WXMSW__
+ // return the LCID corresponding to this language
+ wxUint32 GetLCID() const;
+#endif // __WXMSW__
+
+ // return the locale name corresponding to this language usable with
+ // setlocale() on the current system
+ wxString GetLocaleName() const;
};
+// for Unix systems GetLocaleName() is trivial so implement it inline here, for
+// MSW it's implemented in intl.cpp
+#ifndef __WXMSW__
+inline wxString wxLanguageInfo::GetLocaleName() const { return CanonicalName; }
+#endif // !__WXMSW__
+
// ----------------------------------------------------------------------------
// wxLocaleCategory: the category of locale settings
// ----------------------------------------------------------------------------
// monetary value
wxLOCALE_CAT_MONEY,
+ // default category for wxLocaleInfo values which only apply to a single
+ // category (e.g. wxLOCALE_SHORT_DATE_FMT)
+ wxLOCALE_CAT_DEFAULT,
+
wxLOCALE_CAT_MAX
};
enum wxLocaleInfo
{
- // the thounsands separator
+ // the thousands separator (for wxLOCALE_CAT_NUMBER or MONEY)
wxLOCALE_THOUSANDS_SEP,
- // the character used as decimal point
- wxLOCALE_DECIMAL_POINT
+ // the character used as decimal point (for wxLOCALE_CAT_NUMBER or MONEY)
+ wxLOCALE_DECIMAL_POINT,
+
+ // the stftime()-formats used for short/long date and time representations
+ // (under some platforms short and long date formats are the same)
+ //
+ // NB: these elements should appear in this order, code in GetInfo() relies
+ // on it
+ wxLOCALE_SHORT_DATE_FMT,
+ wxLOCALE_LONG_DATE_FMT,
+ wxLOCALE_DATE_TIME_FMT,
+ wxLOCALE_TIME_FMT
};
enum wxLocaleInitFlags
{
- wxLOCALE_LOAD_DEFAULT = 0x0001, // load wxwin.mo?
- wxLOCALE_CONV_ENCODING = 0x0002 // convert encoding on the fly?
+ wxLOCALE_DONT_LOAD_DEFAULT = 0x0000, // don't load wxwin.mo
+ wxLOCALE_LOAD_DEFAULT = 0x0001 // load wxwin.mo?
+#if WXWIN_COMPATIBILITY_2_8
+ ,wxLOCALE_CONV_ENCODING = 0x0002 // no longer used, simply remove
+ // it from the existing code
+#endif
};
class WXDLLIMPEXP_BASE wxLocale
wxLocale(const wxString& name, // name (for messages)
const wxString& shortName = wxEmptyString, // dir prefix (for msg files)
const wxString& locale = wxEmptyString, // locale (for setlocale)
- bool bLoadDefault = true, // preload wxstd.mo?
- bool bConvertEncoding = false) // convert Win<->Unix if necessary?
+ bool bLoadDefault = true // preload wxstd.mo?
+#if WXWIN_COMPATIBILITY_2_8
+ ,bool bConvertEncoding = true // convert Win<->Unix if necessary?
+#endif
+ )
{
DoCommonInit();
+#if WXWIN_COMPATIBILITY_2_8
Init(name, shortName, locale, bLoadDefault, bConvertEncoding);
+#else
+ Init(name, shortName, locale, bLoadDefault);
+#endif
}
wxLocale(int language, // wxLanguage id or custom language
- int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING)
+ int flags = wxLOCALE_LOAD_DEFAULT)
{
DoCommonInit();
bool Init(const wxString& name,
const wxString& shortName = wxEmptyString,
const wxString& locale = wxEmptyString,
- bool bLoadDefault = true,
- bool bConvertEncoding = false);
+ bool bLoadDefault = true
+#if WXWIN_COMPATIBILITY_2_8
+ ,bool bConvertEncoding = true
+#endif
+ );
// same as second ctor (returns true on success)
bool Init(int language = wxLANGUAGE_DEFAULT,
- int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
+ int flags = wxLOCALE_LOAD_DEFAULT);
// restores old locale
virtual ~wxLocale();
// get the values of the given locale-dependent datum: the current locale
// is used, the US default value is returned if everything else fails
- static wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat);
+ static wxString GetInfo(wxLocaleInfo index,
+ wxLocaleCategory cat = wxLOCALE_CAT_DEFAULT);
// return true if the locale was set successfully
bool IsOk() const { return m_pszOldLocale != NULL; }
size_t n,
const wxString& domain = wxEmptyString) const;
+ // this is hack to work around a problem with wxGetTranslation() which
+ // returns const wxString& and not wxString, so when it returns untranslated
+ // string, it needs to have a copy of it somewhere
+ static const wxString& GetUntranslatedString(const wxString& str);
+
// Returns the current short name for the locale
const wxString& GetName() const { return m_strShort; }
m_strShort; // short name for the locale
int m_language; // this locale wxLanguage value
- const wxChar *m_pszOldLocale; // previous locale from setlocale()
+ const char *m_pszOldLocale; // previous locale from setlocale()
wxLocale *m_pOldLocale; // previous wxLocale
wxMsgCatalog *m_pMsgCat; // pointer to linked list of catalogs
- bool m_bConvertEncoding;
-
bool m_initialized;
static wxLanguageInfoArray *ms_languagesDB;
- DECLARE_NO_COPY_CLASS(wxLocale)
+ wxDECLARE_NO_COPY_CLASS(wxLocale);
};
// ----------------------------------------------------------------------------
if (pLoc)
return pLoc->GetString(str, domain);
else
- return str;
+ // NB: this function returns reference to a string, so we have to keep
+ // a copy of it somewhere
+ return wxLocale::GetUntranslatedString(str);
}
inline const wxString& wxGetTranslation(const wxString& str1,
const wxString& str2,
if (pLoc)
return pLoc->GetString(str1, str2, n, domain);
else
- return n == 1 ? str1 : str2;
+ // NB: this function returns reference to a string, so we have to keep
+ // a copy of it somewhere
+ return n == 1
+ ? wxLocale::GetUntranslatedString(str1)
+ : wxLocale::GetUntranslatedString(str2);
}
#else // !wxUSE_INTL
#if !defined(WXINTL_NO_GETTEXT_MACRO)
#if !defined(_)
- #define _(s) (_T(s))
+ #define _(s) (s)
#endif
- #define wxPLURAL(sing, plur, n) ((n) == 1 ? _T(sing) : _T(plur))
+ #define wxPLURAL(sing, plur, n) ((n) == 1 ? (sing) : (plur))
#endif
-#define wxTRANSLATE(str) _T(str)
+#define wxTRANSLATE(str) str
-inline const wxString& wxGetTranslation(const wxString& str,
- const wxString& WXUNUSED(domain) = wxEmptyString)
-{
- return str;
-}
+// NB: we use a template here in order to avoid using
+// wxLocale::GetUntranslatedString() above, which would be required if
+// we returned const wxString&; this way, the compiler should be able to
+// optimize wxGetTranslation() away
+
+template<typename TString>
+inline TString wxGetTranslation(TString str)
+ { return str; }
+
+template<typename TString, typename TDomain>
+inline TString wxGetTranslation(TString str, TDomain WXUNUSED(domain))
+ { return str; }
+
+template<typename TString, typename TDomain>
+inline TString wxGetTranslation(TString str1, TString str2, size_t n)
+ { return n == 1 ? str1 : str2; }
+
+template<typename TString, typename TDomain>
+inline TString wxGetTranslation(TString str1, TString str2, size_t n,
+ TDomain WXUNUSED(domain))
+ { return n == 1 ? str1 : str2; }
#endif // wxUSE_INTL/!wxUSE_INTL
// wxTRANSLATE) too
#if !defined(WXINTL_NO_GETTEXT_MACRO)
#if !defined(gettext_noop)
- #define gettext_noop(str) _T(str)
+ #define gettext_noop(str) (str)
#endif
#if !defined(N_)
- #define N_(s) _T(s)
+ #define N_(s) (s)
#endif
#endif
projects / wxWidgets.git / blobdiff