Skip to content

Commit 4da88c8

Browse files
committed
refactor: treat language remapping better
1 parent 62df4be commit 4da88c8

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

bot.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from subscriptions import Subscriptions
2121
from team_expando import TeamExpander
2222
from tower_data import TowerOfDoomData
23-
from translations import LANGUAGES
23+
from translations import LANGUAGES, LANGUAGE_CODE_MAPPING
2424
from util import bool_to_emoticon, chunks, pluralize_author
2525
from views import Views
2626

@@ -288,21 +288,18 @@ async def show_spoilers(self, message, prefix, lang, filter):
288288

289289
async def show_uptime(self, message, prefix, lang):
290290
e = discord.Embed(title='Uptime', color=self.WHITE)
291-
if lang == 'cn':
292-
lang = 'zh'
291+
lang = LANGUAGE_CODE_MAPPING.get(lang, lang)
292+
bot_offline = datetime.timedelta(seconds=self.downtimes)
293293
if lang != 'en':
294294
_t = humanize.i18n.activate(lang)
295-
now = datetime.datetime.now()
296-
bot_uptime = now - self.bot_start
297-
bot_offline = datetime.timedelta(seconds=self.downtimes)
298-
uptime = f'{humanize.naturaltime(self.bot_start)} ({humanize.naturaldelta(bot_uptime)})'
295+
uptime = f'{humanize.naturaltime(self.bot_start)}'
299296
e.add_field(name='Bot running since', value=uptime, inline=False)
300297
if bot_offline:
301298
e.add_field(name='Offline for', value=humanize.naturaldelta(bot_offline), inline=False)
299+
humanize.i18n.deactivate()
302300
bot_runtime = (datetime.datetime.now() - self.bot_start).seconds
303301
availability = (bot_runtime - self.downtimes) / bot_runtime
304302
e.add_field(name='Availability', value=f'{availability:.3%}')
305-
humanize.i18n.deactivate()
306303
await self.answer(message, e)
307304

308305
async def show_events(self, message, prefix, lang):

translations.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
'cn': 'Chinese',
1313
}
1414

15+
LANGUAGE_CODE_MAPPING = {
16+
'ру': 'ru',
17+
'cn': 'zh',
18+
}
19+
1520
LANG_FILES = [f'GemsOfWar_{language}.json' for language in LANGUAGES.values()]
1621

1722

0 commit comments

Comments
 (0)