X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0c133e13b36a923c65f94499554e432bc3a0daa..da8b1d4b3b535aba94d04494f5b6e2b3e47901ee:/include/wx/intl.h diff --git a/include/wx/intl.h b/include/wx/intl.h index d0b2af9d18..28bb8ce166 100644 --- a/include/wx/intl.h +++ b/include/wx/intl.h @@ -71,13 +71,18 @@ 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, @@ -105,6 +110,7 @@ enum wxLanguage wxLANGUAGE_ARABIC_YEMEN, wxLANGUAGE_ARMENIAN, wxLANGUAGE_ASSAMESE, + wxLANGUAGE_ASTURIAN, wxLANGUAGE_AYMARA, wxLANGUAGE_AZERI, wxLANGUAGE_AZERI_CYRILLIC, @@ -311,7 +317,7 @@ enum wxLanguage wxLANGUAGE_ZHUANG, wxLANGUAGE_ZULU, - // for custom, user-defined languages: + /// For custom, user-defined languages. wxLANGUAGE_USER_DEFINED }; @@ -364,6 +370,10 @@ enum wxLocaleCategory // 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 }; @@ -373,11 +383,21 @@ enum wxLocaleCategory 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 }; @@ -449,7 +469,8 @@ public: // 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; }