diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2013-02-19 13:34:13 +0100 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2013-02-19 13:34:13 +0100 |
| commit | 0c8073a3a39ce9b4b006e6b2960d6591ddf24aa7 (patch) | |
| tree | e56d778ccc98be9e2d54f2e729d0491e9c0e0284 | |
| parent | df5b142ab9bfc590f17768079104f6cfa2cd7bba (diff) | |
| parent | 1bd9ee4112ad493b775dfaf68b7f1b55e4352075 (diff) | |
| download | mediagoblin-0c8073a3a39ce9b4b006e6b2960d6591ddf24aa7.tar.lz mediagoblin-0c8073a3a39ce9b4b006e6b2960d6591ddf24aa7.tar.xz mediagoblin-0c8073a3a39ce9b4b006e6b2960d6591ddf24aa7.zip | |
Merge remote-tracking branch 'pythonsnake/537_version'
* pythonsnake/537_version:
Added "version" before the version
Fix bug 537
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 2 | ||||
| -rw-r--r-- | mediagoblin/tools/template.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 34986fdb..48ab750f 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -116,7 +116,7 @@ {% block mediagoblin_footer %} <footer> {% trans -%} - Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project. + Powered by <a href="http://mediagoblin.org" title='Version {{ version }}'>MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project. {%- endtrans %} {% trans source_link=app_config['source_link'] -%} Released under the <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html">AGPL</a>. <a href="{{ source_link }}">Source code</a> available. diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py index a58dd2ca..74d811eb 100644 --- a/mediagoblin/tools/template.py +++ b/mediagoblin/tools/template.py @@ -25,6 +25,7 @@ from werkzeug.urls import url_quote_plus from mediagoblin import mg_globals from mediagoblin import messages +from mediagoblin import _version from mediagoblin.tools import common from mediagoblin.tools.translate import get_gettext_translation from mediagoblin.tools.pluginapi import get_hook_templates @@ -68,6 +69,7 @@ def get_jinja_env(template_loader, locale): template_env.globals['fetch_messages'] = messages.fetch_messages template_env.globals['app_config'] = mg_globals.app_config template_env.globals['global_config'] = mg_globals.global_config + template_env.globals['version'] = _version.__version__ template_env.filters['urlencode'] = url_quote_plus |