i18n: look translation of both "DEPRECATED" and "(DEPRECATED)" up Since 44cc9f63a2f1, deprecated commands, options and so on are detected by "(DEPRECATED)" instead of "DEPRECATED". "hg.pot" generated from recent source files doesn't contain msgid "DEPRECATED", and looking the translation of "DEPRECATED" up in up-to-date *.po files works incorrectly. But on the other hand, there are still old *.po files, which contain msgid "DEPRECATED" but not "(DEPRECATED)". Looking the translation of "(DEPRECATED)" up in such old *.po files also works incorrectly. This patch resolves this problem by looking translation of both "DEPRECATED" and "(DEPRECATED)" up. This should work correctly, because previous patch makes "deprecated" checker be applied only on translations, of which msgid contains exact "(DEPRECATED)" string. 'p.msgstr' examination in 'deprecatedsetup()' is needed to ignore untranslated entries. This also makes 'deprecatedpe.msgstr' examination in 'deprecated()' meaningless.

     1

import os

     2

from mercurial import ui, commands, extensions

     3

     4

ignore = set(['highlight', 'win32text', 'factotum'])

     5

     6

if os.name != 'nt':

     7

    ignore.add('win32mbcs')

     8

     9

disabled = [ext for ext in extensions.disabled().keys() if ext not in ignore]

    10

    11

hgrc = open(os.environ["HGRCPATH"], 'w')

    12

hgrc.write('[extensions]\n')

    13

    14

for ext in disabled:

    15

    hgrc.write(ext + '=\n')

    16

    17

hgrc.close()

    18

    19

u = ui.ui()

    20

extensions.loadall(u)

    21

    22

globalshort = set()

    23

globallong = set()

    24

for option in commands.globalopts:

    25

    option[0] and globalshort.add(option[0])

    26

    option[1] and globallong.add(option[1])

    27

    28

for cmd, entry in commands.table.iteritems():

    29

    seenshort = globalshort.copy()

    30

    seenlong = globallong.copy()

    31

    for option in entry[1]:

    32

        if (option[0] and option[0] in seenshort) or \

    33

           (option[1] and option[1] in seenlong):

    34

            print "command '" + cmd + "' has duplicate option " + str(option)

    35

        seenshort.add(option[0])

    36

        seenlong.add(option[1])