kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-28 15:30:10 +02:00
Code Activity

Merge branch 'encoding-warning' into 'master'

Browse Source 
log a warning when encoding is not set to utf-8

Closes #617

See merge request fdroid/fdroidserver!619
This commit is contained in:
Hans-Christoph Steiner 2019-02-01 13:16:50 +00:00
commit 9bc81f2689
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fdroid
View File

@ -19,6 +19,7 @@
import sys import sys
import os import os
import locale
import logging import logging
import fdroidserver.common import fdroidserver.common
@ -120,7 +121,8 @@ def main():
logging.basicConfig(format=logformat, level=loglevel) logging.basicConfig(format=logformat, level=loglevel)
if verbose and quiet: if verbose and quiet:
logging.critical("Specifying --verbose and --quiet and the same time is silly") logging.critical(_("Conflicting arguments: '--verbose' and '--quiet' "
"can not be specified at the same time."))
sys.exit(1) sys.exit(1)
# temporary workaround until server.py becomes deploy.py # temporary workaround until server.py becomes deploy.py
@ -134,6 +136,12 @@ def main():
del sys.argv[1] del sys.argv[1]
mod = __import__('fdroidserver.' + command, None, None, [command]) mod = __import__('fdroidserver.' + command, None, None, [command])
system_langcode, system_encoding = locale.getdefaultlocale()
if system_encoding.lower() not in ('utf-8', 'utf8'):
logging.warn(_("Encoding is set to '{enc}' fdroid might run "
"into encoding issues. Please set it to 'UTF-8' "
"for best results.".format(enc=system_encoding)))
try: try:
mod.main() mod.main()
# These are ours, contain a proper message and are "expected" # These are ours, contain a proper message and are "expected"