heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pythonsnake/537_version'

Browse Source 
* pythonsnake/537_version:
  Added "version" before the version
  Fix bug 537
This commit is contained in:
Elrond 2013-02-19 13:34:13 +01:00
commit 0c8073a3a3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/templates/mediagoblin/base.html
View File

@ -116,7 +116,7 @@
{% block mediagoblin_footer %} {% block mediagoblin_footer %}
<footer> <footer>
{% trans -%} {% 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 %} {%- endtrans %}
{% trans source_link=app_config['source_link'] -%} {% 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. 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.

2
mediagoblin/tools/template.py
View File

@ -25,6 +25,7 @@ from werkzeug.urls import url_quote_plus
from mediagoblin import mg_globals from mediagoblin import mg_globals
from mediagoblin import messages from mediagoblin import messages
from mediagoblin import _version
from mediagoblin.tools import common from mediagoblin.tools import common
from mediagoblin.tools.translate import get_gettext_translation from mediagoblin.tools.translate import get_gettext_translation
from mediagoblin.tools.pluginapi import get_hook_templates 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['fetch_messages'] = messages.fetch_messages
template_env.globals['app_config'] = mg_globals.app_config template_env.globals['app_config'] = mg_globals.app_config
template_env.globals['global_config'] = mg_globals.global_config template_env.globals['global_config'] = mg_globals.global_config
template_env.globals['version'] = _version.__version__
template_env.filters['urlencode'] = url_quote_plus template_env.filters['urlencode'] = url_quote_plus