diff options
| -rw-r--r-- | conf.py | 2 | ||||
| -rw-r--r-- | conf/conf.cfg-sample | 1 | ||||
| -rw-r--r-- | messages.pot | 10 | ||||
| -rw-r--r-- | pyaggr3g470r/templates/login.html | 3 | ||||
| -rw-r--r-- | pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo | bin | 9187 -> 9296 bytes | |||
| -rw-r--r-- | pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po | 12 | ||||
| -rw-r--r-- | pyaggr3g470r/views.py | 2 |
7 files changed, 26 insertions, 4 deletions
@@ -34,6 +34,7 @@ if not ON_HEROKU: config.read("./conf/conf.cfg") PLATFORM_URL = config.get('misc', 'platform_url') + ADMIN_PLATFORM_EMAIL = config.get('misc', 'admin_platform_email') WHOOSH_ENABLED = True @@ -60,6 +61,7 @@ if not ON_HEROKU: else: PLATFORM_URL = os.environ.get('PLATFORM_URL', 'https://pyaggr3g470r.herokuapp.com/') + ADMIN_PLATFORM_EMAIL = os.environ.get('ADMIN_PLATFORM_EMAIL', '') SQLALCHEMY_DATABASE_URI = os.environ['DATABASE_URL'] diff --git a/conf/conf.cfg-sample b/conf/conf.cfg-sample index 5af7d0af..1dafebcb 100644 --- a/conf/conf.cfg-sample +++ b/conf/conf.cfg-sample @@ -1,5 +1,6 @@ [misc] platform_url = https://pyaggr3g470r.herokuapp.com/ +admin_platform_email = [database] uri = postgres://cedric:password@127.0.0.1:5432/pyAggr3g470r [feedparser] diff --git a/messages.pot b/messages.pot index 49058e79..d7565947 100644 --- a/messages.pot +++ b/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-05-04 22:11+0200\n" +"POT-Creation-Date: 2014-05-05 08:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -462,6 +462,14 @@ msgstr "" msgid "Your Password" msgstr "" +#: pyaggr3g470r/templates/login.html:30 +msgid "Account creation" +msgstr "" + +#: pyaggr3g470r/templates/login.html:30 +msgid "Request an account." +msgstr "" + #: pyaggr3g470r/templates/management.html:5 msgid "Your subscriptions" msgstr "" diff --git a/pyaggr3g470r/templates/login.html b/pyaggr3g470r/templates/login.html index 4f3b6c87..689b259f 100644 --- a/pyaggr3g470r/templates/login.html +++ b/pyaggr3g470r/templates/login.html @@ -26,5 +26,8 @@ {{ form.submit(class_="btn") }} </form> </div> + {% if email != '' %} + <p><a href="mailto:{{ email }}?subject=[pyAggr3g470r] {{ _('Account creation') }}">{{ _('Request an account.') }}</a></p> + {% endif %} </div><!-- /.container --> {% endblock %}
\ No newline at end of file diff --git a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo Binary files differindex 0bba8ddc..788fca40 100644 --- a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo +++ b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo diff --git a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po index 54d12282..51e12053 100644 --- a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po +++ b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-05-04 22:11+0200\n" -"PO-Revision-Date: 2014-05-04 22:11+0100\n" +"POT-Creation-Date: 2014-05-05 08:36+0200\n" +"PO-Revision-Date: 2014-05-05 08:37+0100\n" "Last-Translator: Cédric Bonhomme <cedric@cedricbonhomme.org>\n" "Language-Team: fr <LL@li.org>\n" "Language: fr\n" @@ -469,6 +469,14 @@ msgstr "Votre email" msgid "Your Password" msgstr "Votre mot de passe" +#: pyaggr3g470r/templates/login.html:30 +msgid "Account creation" +msgstr "Ouverture de compte" + +#: pyaggr3g470r/templates/login.html:30 +msgid "Request an account." +msgstr "Demander un compte." + #: pyaggr3g470r/templates/management.html:5 msgid "Your subscriptions" msgstr "Vos abonnements" diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py index d91e209f..ac89f0b8 100644 --- a/pyaggr3g470r/views.py +++ b/pyaggr3g470r/views.py @@ -142,7 +142,7 @@ def login(): identity_changed.send(current_app._get_current_object(), identity=Identity(user.id)) flash(gettext("Logged in successfully."), 'success') return redirect(url_for('home')) - return render_template('login.html', form=form) + return render_template('login.html', form=form, email=conf.ADMIN_PLATFORM_EMAIL) @app.route('/logout/') @login_required |