From 7cb46c476bb797f21a9cae4fe11600500937aac7 Mon Sep 17 00:00:00 2001
From: Gergely Polonkai <gergely@polonkai.eu>
Date: Mon, 2 Jul 2018 13:04:05 +0200
Subject: [PATCH] [Bugfix] Move from Flask-Babel to Flask-BabelEx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It is used internally by Flask-Security anyway, so it’s one less package to install.  Also, using
Flask-Babel causes trouble with Flask-Security…
---
 Pipfile               |  2 +-
 Pipfile.lock          | 14 ++------------
 calsocial/__init__.py |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Pipfile b/Pipfile
index 1f96643..87a8e5c 100644
--- a/Pipfile
+++ b/Pipfile
@@ -11,7 +11,7 @@ python-dotenv = "*"
 flask-security = "*"
 sqlalchemy-utils = "*"
 bcrypt = "*"
-flask-babel = "*"
+flask-babelex = "*"
 python-dateutil = "*"
 
 [dev-packages]
diff --git a/Pipfile.lock b/Pipfile.lock
index 0b6ab05..b813a4c 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "c71655288783b8802460a7706e1fede0917e345fd286f9aeb89d42dceb950e49"
+            "sha256": "6a3ccbef568786e9db9f07399ebc254400d2aede9986ce7c69090f2d0c250037"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -66,7 +66,6 @@
         },
         "cffi": {
             "hashes": [
-                "sha256:11d30fc490bbe4d110fb7bfead0f10208275978ced3bce77f202224a0a9b448c",
                 "sha256:151b7eefd035c56b2b2e1eb9963c90c6302dc15fbd8c1c0a83a163ff2c7d7743",
                 "sha256:1553d1e99f035ace1c0544050622b7bc963374a00c467edafac50ad7bd276aef",
                 "sha256:1b0493c091a1898f1136e3f4f991a784437fac3673780ff9de3bcf46c80b6b50",
@@ -75,7 +74,6 @@
                 "sha256:3c85641778460581c42924384f5e68076d724ceac0f267d66c757f7535069c93",
                 "sha256:3eb6434197633b7748cea30bf0ba9f66727cdce45117a712b29a443943733257",
                 "sha256:495c5c2d43bf6cebe0178eb3e88f9c4aa48d8934aa6e3cddb865c058da76756b",
-                "sha256:4b3d70782d55aa38949e4b66d51c461c053b729baa53d94bb8a3a92c1d1d5b88",
                 "sha256:4c91af6e967c2015729d3e69c2e51d92f9898c330d6a851bf8f121236f3defd3",
                 "sha256:57b2533356cb2d8fac1555815929f7f5f14d68ac77b085d2326b571310f34f6e",
                 "sha256:770f3782b31f50b68627e22f91cb182c48c47c02eb405fd689472aa7b7aa16dc",
@@ -99,7 +97,6 @@
                 "sha256:ecbb7b01409e9b782df5ded849c178a0aa7c906cf8c5a67368047daab282b184",
                 "sha256:ed01918d545a38998bfa5902c7c00e0fee90e957ce036a4000a88e3fe2264917",
                 "sha256:edabd457cd23a02965166026fd9bfd196f4324fe6032e866d0f3bd0301cd486f",
-                "sha256:facc52ea162864a51556925bfa09d8c8c131349aeabfce2da4a43198e36fba5c",
                 "sha256:fdf1c1dc5bafc32bc5d08b054f94d659422b05aba244d6be4ddc1c72d9aa70fb"
             ],
             "version": "==1.11.5"
@@ -119,18 +116,11 @@
             "index": "pypi",
             "version": "==1.0.2"
         },
-        "flask-babel": {
-            "hashes": [
-                "sha256:462a3c599b0ccf426ca1757cc612f1db383844efd346d14170da04c8c76dd521",
-                "sha256:c0d75710bd4b0fe866f9f2347de6e19208712f9cec006436b4c1c15d4cb0c939"
-            ],
-            "index": "pypi",
-            "version": "==0.11.2"
-        },
         "flask-babelex": {
             "hashes": [
                 "sha256:cf79cdedb5ce860166120136b0e059e9d97b8df07a3bc2411f6243de04b754b4"
             ],
+            "index": "pypi",
             "version": "==0.9.3"
         },
         "flask-login": {
diff --git a/calsocial/__init__.py b/calsocial/__init__.py
index 4222a9e..655b58c 100644
--- a/calsocial/__init__.py
+++ b/calsocial/__init__.py
@@ -19,7 +19,7 @@ from functools import wraps
 import os
 
 from flask import Flask, current_app, redirect, render_template, url_for
-from flask_babel import Babel, get_locale as babel_get_locale
+from flask_babelex import Babel, get_locale as babel_get_locale
 from flask_security import SQLAlchemyUserDatastore, current_user, login_required
 
 
-- 
2.45.2