Merge pull request #2369 from hypothesis/move-i18n-helper

Move I18N helpers into h.i18n module

h/accounts/schemas.py

@@ -5,9 +5,11 @@
 import deform
 from pyramid.session import check_csrf_token
 
-from h.models import _
+from h import i18n
 from h.accounts.models import User
 
+_ = i18n.TranslationString
+
 USERNAME_BLACKLIST = None
 
 

h/accounts/views.py

@@ -10,8 +10,8 @@
 
 from h.resources import Application
 from h.notification.models import Subscriptions
-from h.models import _
 from h import accounts
+from h import i18n
 from h.accounts.models import User
 from h.accounts.models import Activation
 from h.accounts.events import ActivationEvent
@@ -22,6 +22,8 @@
 from h.accounts import schemas
 from h import session
 
+_ = i18n.TranslationString
+
 
 def ajax_form(request, result):
     if isinstance(result, httpexceptions.HTTPRedirection):

h/claim/views.py

@@ -4,11 +4,12 @@
 from pyramid import httpexceptions as exc
 from pyramid.view import view_config
 
-from . import schemas
-from ..models import _
-from ..accounts.models import User
-from ..accounts.events import LoginEvent
+from h import i18n
+from h.accounts.models import User
+from h.accounts.events import LoginEvent
+from h.claim import schemas
 
+_ = i18n.TranslationString
 
 log = logging.getLogger(__name__)
 

h/i18n.py

@@ -0,0 +1,3 @@
+from pyramid.i18n import TranslationStringFactory
+
+TranslationString = TranslationStringFactory('hypothesis')

h/models.py

@@ -1,11 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 from annotator import annotation, document
-from pyramid.i18n import TranslationStringFactory
 from pyramid.security import Allow, Authenticated, Everyone, ALL_PERMISSIONS
 
-_ = TranslationStringFactory(__package__)
-
 
 class Annotation(annotation.Annotation):
     def __acl__(self):