diff options
| author | Arun <engineerarun@gmail.com> | 2023-09-15 07:35:53 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-15 07:35:53 +0530 |
| commit | b24ef9c7b7b259a99f670446b37f994e612a3297 (patch) | |
| tree | c785bfe2b502f5fd0e1592642f931f8ef51b213b | |
| parent | 14fb6bdd0dfcad8d42a8122876809f7d040b7a4c (diff) | |
| parent | d12741897f632f948745e0cb7bb398bb168fa542 (diff) | |
Merge pull request #695 from LeXofLeviafan/flask-babel
[bukuserver] added support for flask-babel
| -rw-r--r-- | bukuserver/README.md | 2 | ||||
| -rw-r--r-- | bukuserver/requirements.txt | 2 | ||||
| -rw-r--r-- | bukuserver/server.py | 10 | ||||
| -rw-r--r-- | setup.py | 5 |
4 files changed, 12 insertions, 7 deletions
diff --git a/bukuserver/README.md b/bukuserver/README.md index 77c0ebb..816ab19 100644 --- a/bukuserver/README.md +++ b/bukuserver/README.md @@ -132,6 +132,8 @@ Note: Valid boolean values are `true`, `false`, `1`, `0` (case-insensitive). Note: if input is invalid, the default value will be used if defined +Note: `BUKUSERVER_LOCALE` requires either `flask_babel` or `flask_babelex` installed + e.g. to set bukuserver to show 100 item per page run the following command ``` diff --git a/bukuserver/requirements.txt b/bukuserver/requirements.txt index bf62429..5c1eacc 100644 --- a/bukuserver/requirements.txt +++ b/bukuserver/requirements.txt @@ -1,5 +1,5 @@ arrow>=1.2.2 -Flask-Admin>=1.6.0 +Flask-Admin>=1.6.1 Flask-API>=3.0.post1 Flask-Bootstrap>=3.3.7.1 flask-paginate>=2022.1.8 diff --git a/bukuserver/server.py b/bukuserver/server.py index 0405adb..2ec33a4 100644 --- a/bukuserver/server.py +++ b/bukuserver/server.py @@ -68,9 +68,13 @@ def get_bool_from_env_var(key: str, default_value: bool) -> bool: def init_locale(app): - try: - from flask_babelex import Babel - Babel(app).localeselector(lambda: app.config['BUKUSERVER_LOCALE']) + try: # as per Flask-Admin-1.6.1 + try: + from flask_babelex import Babel + Babel(app).localeselector(lambda: app.config['BUKUSERVER_LOCALE']) + except ImportError: + from flask_babel import Babel + Babel().init_app(app, locale_selector=lambda: app.config['BUKUSERVER_LOCALE']) except Exception: app.logger.warning('failed to init locale') @@ -31,14 +31,13 @@ tests_require = [ 'setuptools>=41.0.1', 'vcrpy>=1.13.0', 'lxml', - 'flask_babelex', - 'pytz', + 'flask_babel', ] server_require = [ "arrow>=1.2.2", - "Flask-Admin>=1.6.0", + "Flask-Admin>=1.6.1", "Flask-API>=3.0.post1", "Flask-Bootstrap>=3.3.7.1", "flask-paginate>=2022.1.8", |