Merge remote-tracking branch 'origin/master' into master
BIN
locale/widgets/de.png
Normal file
After Width: | Height: | Size: 2.6 KiB |
BIN
locale/widgets/en.png
Normal file
After Width: | Height: | Size: 2.6 KiB |
BIN
locale/widgets/pl.png
Normal file
After Width: | Height: | Size: 3.2 KiB |
BIN
locale/widgets/pt-br.png
Normal file
After Width: | Height: | Size: 2.5 KiB |
BIN
locale/widgets/zh-hant.png
Normal file
After Width: | Height: | Size: 2.5 KiB |
|
@ -16,9 +16,9 @@ do
|
||||||
msgmerge -o locale/$language/LC_MESSAGES/wiki.po ~/PycharmProjects/RcGcDw/locale/$language/LC_MESSAGES/rc.po locale/$language/LC_MESSAGES/wiki.po
|
msgmerge -o locale/$language/LC_MESSAGES/wiki.po ~/PycharmProjects/RcGcDw/locale/$language/LC_MESSAGES/rc.po locale/$language/LC_MESSAGES/wiki.po
|
||||||
msgmerge -o locale/$language/LC_MESSAGES/misc.po ~/PycharmProjects/RcGcDw/locale/$language/LC_MESSAGES/misc.po locale/$language/LC_MESSAGES/misc.po
|
msgmerge -o locale/$language/LC_MESSAGES/misc.po ~/PycharmProjects/RcGcDw/locale/$language/LC_MESSAGES/misc.po locale/$language/LC_MESSAGES/misc.po
|
||||||
done
|
done
|
||||||
for language in en fr de pl pt_BR ru es tr nl zh_Hans zh_Hant
|
for language in locale/*/LC_MESSAGES
|
||||||
do
|
do
|
||||||
wget https://weblate.frisk.space/widgets/wiki-bot/$language/discord/svg-badge.svg
|
wget https://weblate.frisk.space/widgets/rcgcdw/$(basename ${language//\/LC_MESSAGES/})/-/svg-badge.svg
|
||||||
convert -size 111x20 svg-badge.svg translation-pngs/wiki-bot-${language//_/-}.png
|
convert -background none svg-badge.svg locale/widgets/$(basename ${language//\/LC_MESSAGES/}).png
|
||||||
rm svg-badge.svg
|
rm svg-badge.svg
|
||||||
done
|
done
|
||||||
|
|
|
@ -48,7 +48,7 @@ class Wiki:
|
||||||
response = await session.get(url_path, params=params)
|
response = await session.get(url_path, params=params)
|
||||||
ratelimiter.timeout_add(1.0)
|
ratelimiter.timeout_add(1.0)
|
||||||
except (aiohttp.ClientConnectionError, aiohttp.ServerTimeoutError, asyncio.TimeoutError):
|
except (aiohttp.ClientConnectionError, aiohttp.ServerTimeoutError, asyncio.TimeoutError):
|
||||||
logger.exception("A connection error occurred while requesting {}".format(url_path))
|
logger.error("A connection error occurred while requesting {}".format(url_path))
|
||||||
raise WikiServerError
|
raise WikiServerError
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ class Wiki:
|
||||||
request.raise_for_status()
|
request.raise_for_status()
|
||||||
json_request = await request.json(encoding="UTF-8")
|
json_request = await request.json(encoding="UTF-8")
|
||||||
except (aiohttp.ClientConnectionError, aiohttp.ServerTimeoutError, asyncio.TimeoutError):
|
except (aiohttp.ClientConnectionError, aiohttp.ServerTimeoutError, asyncio.TimeoutError):
|
||||||
logger.exception("Reached connection error for request on link {url}".format(url=url))
|
logger.error("Reached connection error for request on link {url}".format(url=url))
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
for item in keys:
|
for item in keys:
|
||||||
|
|
Before Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 2.4 KiB |