1
0
Fork 0

i18n Python scripts: minor changes

- Remove unnecessary imports

  These imports were a leftover from early versions; now, they are done
  in modules such as flightgear.meta.i18n and don't need to be in the
  calling scripts anymore.

- Fix an exception message
This commit is contained in:
Florent Rougon 2017-09-15 18:13:54 +02:00
parent 6b970f8e02
commit 54d6196698
4 changed files with 1 additions and 17 deletions

View file

@ -24,11 +24,6 @@ import locale
import os import os
import sys import sys
try:
import xml.etree.ElementTree as et
except ImportError:
import elementtree.ElementTree as et
import flightgear.meta.logging import flightgear.meta.logging
import flightgear.meta.i18n as fg_i18n import flightgear.meta.i18n as fg_i18n

View file

@ -24,11 +24,6 @@ import locale
import os import os
import sys import sys
try:
import xml.etree.ElementTree as et
except ImportError:
import elementtree.ElementTree as et
import flightgear.meta.logging import flightgear.meta.logging
import flightgear.meta.i18n as fg_i18n import flightgear.meta.i18n as fg_i18n

View file

@ -25,11 +25,6 @@ import locale
import os import os
import sys import sys
try:
import xml.etree.ElementTree as et
except ImportError:
import elementtree.ElementTree as et
import flightgear.meta.logging import flightgear.meta.logging
import flightgear.meta.i18n as fg_i18n import flightgear.meta.i18n as fg_i18n

View file

@ -684,8 +684,7 @@ class Translation:
def mergeMasterForCategory(self, masterTransl, cat, logger=dummyLogger): def mergeMasterForCategory(self, masterTransl, cat, logger=dummyLogger):
if cat not in masterTransl: if cat not in masterTransl:
raise BadAPIUse("Bad API use: category {!r} not in " \ raise BadAPIUse("category {!r} not in 'masterTransl'".format(cat))
"'masterTransl'".format(cat))
elif cat not in self: elif cat not in self:
# Category appeared in 'masterTransl' that wasn't in 'self' # Category appeared in 'masterTransl' that wasn't in 'self'
self.resetCategory(cat) self.resetCategory(cat)