github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-27 07:48:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary _domain variable

Browse Source
This commit is contained in:
Keith Mitchell
2012-08-13 11:28:08 -07:00
parent 01146c301e
commit 98f781957b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
r2/r2/lib/translation.py
View File

@@ -23,6 +23,7 @@
import json
import os
import pylons
import pylons.config
from pylons.i18n.translation import translation, LanguageError, NullTranslations
try:
@@ -33,16 +34,12 @@ else:
I18N_PATH = os.path.dirname(reddit_i18n.__file__)
_domain = 'r2'
def _get_translator(lang, graceful_fail=False, **kwargs):
from pylons import config as conf
"""Utility method to get a valid translator object from a language name"""
if not isinstance(lang, list):
lang = [lang]
try:
translator = translation(conf['pylons.package'], I18N_PATH,
translator = translation(pylons.config['pylons.package'], I18N_PATH,
languages=lang, **kwargs)
except IOError, ioe:
if graceful_fail:
@@ -75,7 +72,9 @@ def set_lang(lang, graceful_fail=False, fallback_lang=None, **kwargs):
registry.replace(pylons.translator, translator)
def load_data(lang_path, domain=_domain, extension='data'):
def load_data(lang_path, domain=None, extension='data'):
if domain is None:
domain = pylons.config['pylons.package']
filename = os.path.join(lang_path, domain + '.' + extension)
with open(filename) as datafile:
data = json.load(datafile)