Update mo2tl, msgfmt for python3

This commit is contained in:
HackerNCoder 2022-11-05 18:51:17 +01:00
parent 09158f0510
commit c7fef05897
2 changed files with 8 additions and 8 deletions

View file

@ -96,7 +96,7 @@ def ugettext_nometadata(translations, lookup):
''' '''
if lookup == '': if lookup == '':
return None return None
return translations.ugettext(lookup) return translations.gettext(lookup)
def mo2tl(projectpath, mofile, renpy_target_language): def mo2tl(projectpath, mofile, renpy_target_language):
if not re.match('^[a-z_]+$', renpy_target_language, re.IGNORECASE): if not re.match('^[a-z_]+$', renpy_target_language, re.IGNORECASE):
@ -136,7 +136,7 @@ def mo2tl(projectpath, mofile, renpy_target_language):
# Setup gettext directory structure # Setup gettext directory structure
localedir = tempfile.mkdtemp() localedir = tempfile.mkdtemp()
if not os.environ.has_key('LANG'): if not 'LANG' in os.environ:
os.environ['LANG'] = 'en_US.UTF-8' os.environ['LANG'] = 'en_US.UTF-8'
msgdir = os.path.join(localedir, msgdir = os.path.join(localedir,
os.environ['LANG'], os.environ['LANG'],
@ -152,7 +152,7 @@ def mo2tl(projectpath, mofile, renpy_target_language):
translations = gettext.translation('game', localedir) translations = gettext.translation('game', localedir)
class NoneOnMissingTranslation: class NoneOnMissingTranslation:
@staticmethod @staticmethod
def ugettext(str): def gettext(str):
return None return None
translations.add_fallback(NoneOnMissingTranslation) translations.add_fallback(NoneOnMissingTranslation)
@ -215,7 +215,7 @@ def mo2tl(projectpath, mofile, renpy_target_language):
out.write(line) out.write(line)
else: else:
# dialog block # dialog block
if not o_blocks_index.has_key(msgid): if not msgid in o_blocks_index:
obsolete = u"# OBSOLETE\n" obsolete = u"# OBSOLETE\n"
if last_comment != obsolete: if last_comment != obsolete:
out.write(obsolete) out.write(obsolete)

View file

@ -87,7 +87,7 @@ def generate():
voffsets += [l2, o2+valuestart] voffsets += [l2, o2+valuestart]
offsets = koffsets + voffsets offsets = koffsets + voffsets
output = struct.pack("Iiiiiii", output = struct.pack("Iiiiiii",
0x950412deL, # Magic 0x950412de, # Magic
0, # Version 0, # Version
len(keys), # # of entries len(keys), # # of entries
7*4, # start of key index 7*4, # start of key index
@ -114,7 +114,7 @@ def make(filename, outfile):
try: try:
lines = open(infile).readlines() lines = open(infile).readlines()
except IOError, msg: except IOError as msg:
print >> sys.stderr, msg print >> sys.stderr, msg
sys.exit(1) sys.exit(1)
@ -201,7 +201,7 @@ def make(filename, outfile):
try: try:
open(outfile,"wb").write(output) open(outfile,"wb").write(output)
except IOError,msg: except IOError as msg:
print >> sys.stderr, msg print >> sys.stderr, msg
@ -209,7 +209,7 @@ def main():
try: try:
opts, args = getopt.getopt(sys.argv[1:], 'hVo:', opts, args = getopt.getopt(sys.argv[1:], 'hVo:',
['help', 'version', 'output-file=']) ['help', 'version', 'output-file='])
except getopt.error, msg: except getopt.error as msg:
usage(1, msg) usage(1, msg)
outfile = None outfile = None