added gettext plural forms support (patch #785660 with modifications)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index b26bd9d119312dccaedef715e2f798ba0e208205..d8778620606d883c320ac5c0cd6dbcece3996ebf 100644 (file)
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -1399,6 +1399,8 @@ This function is deprecated, use \helpref{wxString}{wxstring} class instead.
 
 \func{const char *}{wxGetTranslation}{\param{const char * }{str}}
 
+\func{const char *}{wxGetTranslation}{\param{const char * }{str}, \param{const char * }{strPlural}, \param{size\_t }{n}}
+
 This function returns the translation of string {\it str} in the current
 \helpref{locale}{wxlocale}. If the string is not found in any of the loaded
 message catalogs (see \helpref{internationalization overview}{internationalization}), the
@@ -1408,6 +1410,10 @@ is used very often, an alternative (and also common in Unix world) syntax is
 provided: the \helpref{\_()}{underscore} macro is defined to do the same thing
 as wxGetTranslation.
 
+The second form is used when retrieving translation of string that has
+different singular and plural form in English or different plural forms in some
+other language. \arg{strPlural} is plural form of the string in English and
+\arg{n} is used to determine the plural form.
 
 \membersection{::wxIsEmpty}\label{wxisempty}
 

diff --git a/docs/latex/wx/locale.tex b/docs/latex/wx/locale.tex
index ed44298e9e6b8b921ead93d5c87edfebe70045bf..151f4c65e5c740a438a9a224aee18c64c43fd523 100644 (file)
--- a/docs/latex/wx/locale.tex
+++ b/docs/latex/wx/locale.tex
@@ -474,6 +474,8 @@ the Init() function).
 
 \constfunc{const char*}{GetString}{\param{const char }{*szOrigString}, \param{const char }{*szDomain = NULL}}
 
+\constfunc{const char*}{GetString}{\param{const char }{*szOrigString}, \param{const char }{*szOrigString2}, \param{size\_t }{n}, \param{const char }{*szDomain = NULL}}
+
 Retrieves the translation for a string in all loaded domains unless the szDomain
 parameter is specified (and then only this catalog/domain is searched).
 
@@ -481,6 +483,11 @@ Returns original string if translation is not available
 (in this case an error message is generated the first time
 a string is not found; use \helpref{wxLogNull}{wxlogoverview} to suppress it).
 
+The second form is used when retrieving translation of string that has
+different singular and plural form in English or different plural forms in some
+other language. \arg{szOrigString2} is plural form of the string in English and
+\arg{n} is used to determine the plural form.
+
 \wxheading{Remarks}
 
 Domains are searched in the last to first order, i.e. catalogs