aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/init
diff options
context:
space:
mode:
authorMike Linksvayer <ml@gondwanaland.com>2012-12-20 12:50:43 -0800
committerMike Linksvayer <ml@gondwanaland.com>2012-12-20 12:50:43 -0800
commit1d0148aef1493467dacb6c39c4e080ee4a5246d2 (patch)
tree5213418660d4e079eb8dac6bc8ea2e4fdc140088 /mediagoblin/init
parent200433dc38a2139462e0331be36ee49a80a81a12 (diff)
parent5c99cd01a70f2d597ac7669e8d944ddf79b05281 (diff)
downloadmediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.tar.lz
mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.tar.xz
mediagoblin-1d0148aef1493467dacb6c39c4e080ee4a5246d2.zip
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Conflicts: docs/source/siteadmin/media-types.rst
Diffstat (limited to 'mediagoblin/init')
-rw-r--r--mediagoblin/init/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py
index 9b0025c9..8d70c4ef 100644
--- a/mediagoblin/init/__init__.py
+++ b/mediagoblin/init/__init__.py
@@ -19,6 +19,7 @@ from beaker.util import parse_cache_config_options
import jinja2
from mediagoblin.tools import staticdirect
+from mediagoblin.tools.translate import set_available_locales
from mediagoblin.init.config import (
read_mediagoblin_config, generate_validation_report)
from mediagoblin import mg_globals
@@ -37,6 +38,11 @@ class ImproperlyConfigured(Error):
pass
+def setup_locales():
+ """Checks which language translations are available and sets them"""
+ set_available_locales()
+
+
def setup_global_and_app_config(config_path):
global_config, validation_result = read_mediagoblin_config(config_path)
app_config = global_config['mediagoblin']