subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ivan Zhakov <i...@visualsvn.com>
Subject Re: [PATCH v3] Conflict option labels
Date Fri, 14 Oct 2016 09:43:00 GMT
On 13 October 2016 at 17:26, Patrick Steinhardt <ps@pks.im> wrote:
> Hi,
>
> the third version re-adds the result pool to
> `svn_client_conflict_option_get_lazel`.
>
[...]
> @@ -582,15 +604,16 @@ prompt_string(const resolver_option_t *options,
>          }
>        else
>          {
> -          opt = options++;
> -          if (! opt->code)
> +          if (i >= options->nelts)
>              break;
> +          opt = APR_ARRAY_IDX(options, i, client_option_t *);
> +          i++;
>          }
>
>        if (! first)
>          result = apr_pstrcat(pool, result, ",", SVN_VA_NULL);
>        s = apr_psprintf(pool, " (%s) %s", opt->code,
> -                       opt->short_desc ? _(opt->short_desc) : opt->long_desc);
> +                       opt->label ? _(opt->label) : opt->long_desc);
The opt->label is already localized, so _() is not needed.

Beside of that patch looks fine and I'm ready to commit it in current
state. Stefan, do you have any comments on the patch?

-- 
Ivan Zhakov

Mime
View raw message