From 59778d4124e2038a0885a6e7021d0ce492ad9239 Mon Sep 17 00:00:00 2001 From: David Bryan Date: Mon, 28 Oct 2019 23:35:13 +0000 Subject: [PATCH] Babel is still broken. --- babel.cfg | 3 +++ config.py | 9 +++++++++ proxmark3-web.py | 20 +++++++++++--------- 3 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 babel.cfg create mode 100644 config.py diff --git a/babel.cfg b/babel.cfg new file mode 100644 index 0000000..f0234b3 --- /dev/null +++ b/babel.cfg @@ -0,0 +1,3 @@ +[python: **.py] +[jinja2: **/templates/**.html] +extensions=jinja2.ext.autoescape,jinja2.ext.with_ diff --git a/config.py b/config.py new file mode 100644 index 0000000..8b1b0df --- /dev/null +++ b/config.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- +# ... +# available languages +LANGUAGES = { + 'en': 'English', + 'de': 'German', + 'ja': 'Japanese', + 'es': 'EspaƱol' +} diff --git a/proxmark3-web.py b/proxmark3-web.py index dec8fd3..64f1722 100755 --- a/proxmark3-web.py +++ b/proxmark3-web.py @@ -74,20 +74,24 @@ if(True): #Set up the Database for storing cards app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////' + db_file app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False - app.config['BABEL_DEFAULT_LOCALE'] = 'de' db = SQLAlchemy(app) + app.config['BABEL_DEFAULT_LOCALE'] = "de" + app.config['BABEL_DEFAULT_TIMEZONE'] = "UTC" babel = Babel(app) - #from app import views - @babel.localeselector - def get_locale(): + #@babel.localeselector + #def get_locale(): # Basic method, can be used as a fallback if a user's profile does not specify a language, # or a user hasn't yet registered. - result = request.accept_languages.best_match(LANGUAGES.keys()) + #user = getattr(g, 'user', None) + #if user is not None: + #return user.locale + + #return request.accept_languages.best_match(LANGUAGES.keys()) # will return language code (en/es/etc). - return 'es' - return result +# return 'es' +# return result # Database Classes class card_tbl(db.Model): @@ -232,8 +236,6 @@ if(True): @app.route('/card/') def card_mod(card_id): - #card_id = request.args.get('card_id') - #del_card_id = card_tbl.query.filter_by(card_id=card_id).all() delCard = card_tbl.query.filter_by(id=card_id).first() db.session.delete(delCard) db.session.commit()