From 30e5722f7faf62434b3911eb97ed85ba3475cd67 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 23 Jun 2004 20:31:23 +0000 Subject: [PATCH] ngettext() macro was removed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/function.tex | 27 +++------------------------ docs/latex/wx/ti18n.tex | 2 +- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex index d31df54da0..5503ad64b4 100644 --- a/docs/latex/wx/function.tex +++ b/docs/latex/wx/function.tex @@ -21,7 +21,6 @@ the corresponding topic. \helpref{IMPLEMENT\_CLASS}{implementclass}\\ \helpref{IMPLEMENT\_DYNAMIC\_CLASS2}{implementdynamicclass2}\\ \helpref{IMPLEMENT\_DYNAMIC\_CLASS}{implementdynamicclass}\\ -\helpref{ngettext}{ngettext}\\ \helpref{wxCONCAT}{wxconcat}\\ \helpref{WXDEBUG\_NEW}{debugnew}\\ \helpref{WXTRACELEVEL}{tracelevel}\\ @@ -1408,22 +1407,6 @@ deleted with the {\it delete} operator. This function is deprecated, use \helpref{wxString}{wxstring} class instead. -\membersection{ngettext}\label{ngettext} - -\func{const wxChar *}{ngettext}{\param{const char *}{str}, \param{const char *}{strPlural}, \param{size\_t }{n}} - -This macro expands into a call to plural form version of -\helpref{wxGetTranslation}{wxgettranslation} -function, so it marks the message for the extraction by {\tt xgettext} just as -\helpref{wxTRANSLATE}{wxtranslate} does, but also returns the translation of -the string for the current locale during execution, either singular or plural -form depending on the value of \arg{n}. - -\wxheading{See also} - -\helpref{\_}{underscore} - - \membersection{::wxGetTranslation}\label{wxgettranslation} \func{const char *}{wxGetTranslation}{\param{const char * }{str}} @@ -1447,10 +1430,11 @@ It is also used as the key for the search in the catalog. The \arg{strPlural} parameter is the plural form (in English). The parameter \arg{n} is used to determine the plural form. If no message catalog is found \arg{str} is returned if `n == 1', -otherwise \arg{strPlural}. The \helpref{ngettext}{ngettext} macro is defined -to do the same thing. +otherwise \arg{strPlural}. See \urlref{GNU gettext manual}{http://www.gnu.org/manual/gettext/html\_chapter/gettext\_10.html\#SEC150} for additional information on plural forms handling. +Both versions call \helpref{wxLocale::GetString}{wxlocalegetstring}. + \membersection{::wxIsEmpty}\label{wxisempty} \func{bool}{wxIsEmpty}{\param{const char *}{ p}} @@ -1623,11 +1607,6 @@ the string for the current locale during execution. Don't confuse this macro with \helpref{\_T()}{underscoret}! -\wxheading{See also} - -\helpref{ngettext}{ngettext} - - \membersection{\_T}\label{underscoret} diff --git a/docs/latex/wx/ti18n.tex b/docs/latex/wx/ti18n.tex index 156c754bfb..aaaf06add4 100644 --- a/docs/latex/wx/ti18n.tex +++ b/docs/latex/wx/ti18n.tex @@ -32,7 +32,7 @@ The program i18n involves several steps: \begin{enumerate}\itemsep=0pt \item Translating the strings in the program text using \helpref{wxGetTranslation}{wxgettranslation} or equivalently the -\helpref{\_()}{underscore} and \helpref{ngettext}{ngettext} macros. +\helpref{\_()}{underscore} macro. \item Extracting the strings to be translated from the program: this uses the work done in the previous step because {\tt xgettext} program used for string extraction recognises the standard \_() as well as (using its {\tt -k} option) -- 2.45.2