[QBZR][Merge] Add unidiff format to diff dialog
Alexander Belchenko
bialix at ukr.net
Tue Oct 16 18:43:10 BST 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Goffredo Baroncelli пишет:
> On Tuesday 16 October 2007, you (Alexander Belchenko) wrote:
>> Goffredo Baroncelli пишет:
> [...]
>> It's looks better but I disagree with this changes:
>>
>> @@ -272,7 +286,7 @@
>> self.append(diff)
>>
>> for path, file_id, kind in delta.added:
>> - diff = FileDiff(_('added'), path)
>> + diff = FileDiff('added', path)
> [...]
>> Don't revert my i18n stuff, please.
>>
>
> In my patch you can see also
>
> @@ -363,12 +377,12 @@
> html1.append('<div style="%s">%s</div>' % (STYLES['title'],
> diff.path))
> html1.append(self._get_metainfo_template() % (STYLES['metainfo'],
> diff.old_date,
> - diff.status,
> + _(diff.status),
>
> So I can do some decision on the basis of the .status value.
> In any case the .status values will be translated before the output phase.
>
> Sorry if I didn't explain this fact enough.
OK, I see now.
With your change I have in side-by-side diff status untraslated, but in unidiff
translated. Both view do wrong things:
1) side-by-side should have translated status
2) unidiff should either have translated phrase: _(modified file), _(added directory), _(deleted
symlink) -- or don't translate them at all. Your patch only translate status, but not entry kind,
so I have:
измененный file (semi-translated to russian)
instead of
modified file (fully utraslated)
or
измененный файл (fully translated)
But you cannot translate status and entry kind independently, because slavonic languages has such
thing like ending and adjective and noun should make agree in terms of gender. Because in ukrainian
language 'file' is masculine, but 'directory' is feminine, and therefore adjective (added, deleted,
renamed) should be translated in different ways for different cases.
> P.S.
> I can't reply directly to your email <bialix_AT_ukr.net>...
Have no idea why. It's free e-mail provider, may be it has technical problems sometimes.
- --
[µ]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHFPguzYr338mxwCURAmX6AJ9RgcFKGKG4+dghLm1L7neQVYZTMgCdHTsA
5dAoxJvkPaLTxLTgAnhsJqQ=
=l4kf
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list