On Tue, May 27, 2008 at 6:54 PM, <jensseidel_at_tigris.org> wrote:
> Author: jensseidel
> Date: Tue May 27 15:54:29 2008
> New Revision: 31484
>
> Log:
> Use workaround for an xgettext limitation.
>
> * subversion/svn/main.c,
> tools/po/po-update.sh,
> configure.ac:
> xgettext fails to look up macros in some messages so that these are not put
> into PO files and that's why untranslated. This patch explicitly adds
> duplicates of these strings with manually expanded macros.
>
> Modified:
> trunk/configure.ac
> trunk/subversion/svn/main.c
> trunk/tools/po/po-update.sh
>
> Modified: trunk/configure.ac
> URL: http://svn.collab.net/viewvc/svn/trunk/configure.ac?pathrev=31484&r1=31483&r2=31484
> ==============================================================================
> --- trunk/configure.ac Tue May 27 14:50:34 2008 (r31483)
> +++ trunk/configure.ac Tue May 27 15:54:29 2008 (r31484)
> @@ -402,6 +402,7 @@ fi
>
> AH_BOTTOM(
> #define N_(x) x
> +#define GETTEXT_NOOP(x)
> #ifdef ENABLE_NLS
> #include <locale.h>
> #include <libintl.h>
>
> Modified: trunk/subversion/svn/main.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/main.c?pathrev=31484&r1=31483&r2=31484
> ==============================================================================
> --- trunk/subversion/svn/main.c Tue May 27 14:50:34 2008 (r31483)
> +++ trunk/subversion/svn/main.c Tue May 27 15:54:29 2008 (r31484)
> @@ -104,6 +104,30 @@ typedef enum {
> opt_reintegrate
> } svn_cl__longopt_t;
>
> +/* The following strings occur in svn_cl__options using macros such as
> + * SVN_CL__SHOW_REVS_MERGED. xgettext fails to look up these macros so
> + * that these messages are not put into PO files and that's why
> + * untranslated without the following.
> + *
> + * xgettext claims bogusly: "This implementation of xgettext is able to process
> + * a few awkward cases, like strings in preprocessor macros, ANSI concatenation
> + * of adjacent strings, and escaped end of lines for continued strings."
> + */
> +
> + GETTEXT_NOOP("specify which collection of revisions to display\n"
> + " "
> + "('" "merged" "',"
> + " '" "eligible" "')");
> + GETTEXT_NOOP("specify automatic conflict resolution action\n"
> + " "
> + "('" "postpone" "',"
> + " '" "base" "',"
> + " '" "mine-full" "',"
> + " '" "theirs-full" "',"
> + "\n "
> + " '" "edit" "',"
> + " '" "launch" "')");
> +
> /* Option codes and descriptions for the command line client.
> *
> * The entire list must be terminated with an entry of nulls.
> @@ -257,6 +281,9 @@ const apr_getopt_option_t svn_cl__option
> " "
> "history")},
> {"accept", opt_accept, 1,
> + /** once you change this string adapt the duplicate
> + * above as well!
> + */
> N_("specify automatic conflict resolution action\n"
> " "
> "('" SVN_CL__ACCEPT_POSTPONE "',"
> @@ -270,6 +297,9 @@ const apr_getopt_option_t svn_cl__option
> " '" SVN_CL__ACCEPT_EDIT "',"
> " '" SVN_CL__ACCEPT_LAUNCH "')")},
> {"show-revs", opt_show_revs, 1,
> + /** once you change this string adapt the duplicate
> + * above as well!
> + */
> N_("specify which collection of revisions to display\n"
> " "
> "('" SVN_CL__SHOW_REVS_MERGED "',"
>
> Modified: trunk/tools/po/po-update.sh
> URL: http://svn.collab.net/viewvc/svn/trunk/tools/po/po-update.sh?pathrev=31484&r1=31483&r2=31484
> ==============================================================================
> --- trunk/tools/po/po-update.sh Tue May 27 14:50:34 2008 (r31483)
> +++ trunk/tools/po/po-update.sh Tue May 27 15:54:29 2008 (r31484)
> @@ -38,7 +38,7 @@ make_pot()
> -name bindings -prune -or \
> -name "*.c" -print -or \
> -name "svn_error_codes.h" -print | \
> - $XGETTEXT --sort-by-file -k_ -kN_ -kSVN_ERRDEF:3 \
> + $XGETTEXT --sort-by-file -k_ -kN_ -kSVN_ERRDEF:3 -kGETTEXT_NOOP \
> --flag=_:1:pass-c-format \
> --flag=N_:1:pass-c-format \
> --flag=svn_cmdline_printf:2:c-format \
Hi Jens,
Not sure if you realized this yet, but this change breaks the build on
Win32: http://www.mobsol.be/buildbot/win32-xp%20VS2005/builds/463/step-Build/0.
You define the GETTEXT_NOOP macro in configure.ac, which is not used
on Windows.
Paul
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-28 02:58:12 CEST