Merge branch 'master' into uk_translation

virajut · Nov 23, 2019 · 9977f03 · 9977f03
2 parents 3d79edd + 5da7dbf
commit 9977f03
Show file tree

Hide file tree

Showing 18 changed files with 1,126 additions and 1,044 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -22,7 +22,9 @@ For all of the above we finally had to break compatibility with **v0.6 (stable)*
 For non-customized Flask-User apps, the porting is relatively straightforward.
 See the 'Porting from v0.6 to v1.0+' section in our docs.
 
-* v1.0.2.1 - Add Slovak and Ukrainian translations.
+* v1.0.2.1:
+    * Added Slovak and Ukrainian translations.
+    * Fixed bug in "Password Changed" email template.
 * v1.0.2.0 - Production/Stable release. Dropped support for Python 2.6 and 3.3.
 * v1.0.1.5 - Removed callbacks/auth0.
 * v1.0.1.4 - Fixed calls to get_primary_user_email_object().

diff --git a/docs/source/faq.rst b/docs/source/faq.rst
@@ -5,18 +5,22 @@ F.A.Q.
 | **Q: Can I see a preview?**
 | A: Yes you can: `Flask-User Demo <https://flask-user-demo.herokuapp.com/>`_
 
+| **Q: What's the relationship between Flask-User and Flask-Login?**
+| A: Flask-User manages **users** and uses Flask-Login to manage **user sessions**.
+| Flask-User is built on top of Flask-Login to provide the register/login/change forms and to manages the email verification, the user authentication and the user authorization.
+
 | **Q: What are the differences between Flask-User and Flask-Security?**
 | A: The main reason why I wrote Flask-User was because I found it difficult to customize
   Flask-Security messages and functionality (in 2013) and because it didn't offer
   Username login, multiple emails per user, and Internationalization.
 
-Flask-Security has been around since at least March 2012
-and additionally offers Json/AJAX, MongoDB, Peewee, and Basic HTTP Authentication.
-
 Flask-User has been designed with :doc:`Full customization <customizing>` in mind
 and additionally offers Username login and Internationalization.
 It exists since December 2013 and contains 661 statements with a 98% test coverage.
 
+Flask-Security has been around since at least March 2012
+and additionally offers Json/AJAX, MongoDB, Peewee, and Basic HTTP Authentication.
+
 | **Q: Can users login with usernames and email addresses?**
 | A: Yes.
   Flask-User can be configured to enable usernames, email addresses or both.

diff --git a/fabfile.py b/fabfile.py
@@ -14,7 +14,7 @@ def runapp(appname):
 def babel(command):
     # Generate the .pot file from source code files
     if command=='extract':
-        local('pybabel extract -F flask_user/translations/babel.cfg -k lazy_gettext -c NOTE -o flask_user/translations/flask_user.pot flask_user flask_user')
+        local('pybabel extract -F flask_user/translations/babel.cfg -k lazy_gettext -c NOTE -o flask_user/translations/flask_user.pot --project Flask-User --version v1.0.0.0 flask_user flask_user')
 
     # Update .po files from the .pot file
     elif command=='update':

diff --git a/flask_user/templates/flask_user/emails/password_changed_message.txt b/flask_user/templates/flask_user/emails/password_changed_message.txt
@@ -3,10 +3,8 @@
 {% block message %}
 Your password has been changed.
 
-{% if user_manager.enable_forgot_password -%}
+{% if user_manager.USER_ENABLE_FORGOT_PASSWORD -%}
 If you did not initiate this password change, click the link below to reset it.
     {{ url_for('user.forgot_password', _external=True) }}
 {% endif -%}
 {% endblock %}
-
-