diff --git a/bin/netsvc.py b/bin/netsvc.py index f44d0e0f8a0..1f1904ac179 100644 --- a/bin/netsvc.py +++ b/bin/netsvc.py @@ -92,7 +92,7 @@ def init_logger(): logger = logging.getLogger() # create a format for log messages and dates - formatter = logging.Formatter('[%(asctime)s] %(levelname)s:%(name)s:%(message)s', '%a %b %d %Y %H:%M:%S') + formatter = logging.Formatter('[%(asctime)s] %(levelname)s:%(name)s:%(message)s', '%Y-%m-%d %H:%M:%S') if tools.config['syslog']: # SysLog Handler diff --git a/bin/tools/translate.py b/bin/tools/translate.py index 4345a865ffa..8238180df49 100644 --- a/bin/tools/translate.py +++ b/bin/tools/translate.py @@ -606,7 +606,7 @@ def trans_load_data(db_name, fileobj, fileformat, lang, strict=False, lang_name= }) # Here we try to reset the locale regardless. try: - locale.setlocale(locale.LC_ALL, str(lc + '.' + encoding)) + locale.resetlocale(locale.LC_ALL) except: pass lang_ids = lang_obj.search(cr, uid, [])