Mattias Engdegård wrote:
>T he conflict message "local %s %s, incoming %s %s upon %s" in
> svn_cl__get_human_readable_tree_conflict_description is not correctly
> prepared
> for localisation.
[...]
Thanks, Mattias. Your patch certainly looks to me like a good improvement.
> The patch assumes that svn_node_none, svn_node_unknown or
> svn_wc_operation_none
> cannot occur here. Please confirm or refute.
I haven't checked whether these can occur in this message. svn_node_unknown
can certainly occur for the local kind of node -- such as in a tree conflict
when a merge tries to edit a path which doesn't exist in the local working
copy. I *think* the node kind that appears in these messages can be 'none' for
this reason I can check this and fix if necessary and commit it, probably on
Monday if nobody does it sooner.
> The produced (English) strings are not changed, although doing so should
> perhaps
> be considered since these particular messages seem to be particularly
> difficult
> to understand.
>
> Implementation-wise, I preferred using switch statements to mucking about
> with
> tables, since it made the code simpler and statically safer (thanks to gcc's
> exhaustiveness check when switching on enums).
Looks good at a quick read-through.
My only other suggestion would be to include the comma in the English strings
instead of in the format string -- _("local file edit,") instead of _("local
file edit") -- so that the other translations can use different (or no)
punctuation.
- Julian
>
> [[[
> Make the conflict message "local %s %s, incoming %s %s upon %s"
> translatable by constructing it from longer parts, each translated,
> instead of single words (some of which were not translated at all).
>
> * subversion/svn/cl-conflicts.c
> (svn_cl__get_human_readable_tree_conflict_description): Build string out
> of translated sub-phrases rather than from single words.
> (local_reason_str, incoming_action_str, operation_str): New.
> (map_conflict_action_human, map_conflict_reason_human,
> action_str, reason_str): Removed.
> ]]]
>
