Chat: Use new i18n functions

This commit is contained in:
Adrian Moennich 2015-03-11 17:40:41 +01:00
parent 818e7aa90c
commit ed4418603e
9 changed files with 32 additions and 8 deletions

View File

@ -1,3 +1,4 @@
graft indico_chat/static
graft indico_chat/migrations
graft indico_chat/templates
graft indico_chat/translations

View File

@ -0,0 +1,21 @@
# This file is part of Indico.
# Copyright (C) 2002 - 2015 European Organization for Nuclear Research (CERN).
#
# Indico is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 3 of the
# License, or (at your option) any later version.
#
# Indico is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Indico; if not, see <http://www.gnu.org/licenses/>.
from __future__ import unicode_literals
from indico.util.i18n import make_bound_gettext
_ = make_bound_gettext('chat')

View File

@ -14,12 +14,14 @@
# You should have received a copy of the GNU General Public License
# along with Indico; if not, see <http://www.gnu.org/licenses/>.
from __future__ import unicode_literals
from flask import session, request
from indico.core.errors import IndicoError
from indico.util.i18n import _
from MaKaC.webinterface.rh.conferenceModif import RHConferenceModifBase
from indico_chat import _
from indico_chat.models.chatrooms import ChatroomEventAssociation
from indico_chat.util import is_chat_admin

View File

@ -18,11 +18,10 @@ from __future__ import unicode_literals
from flask_pluginengine import current_plugin
from indico.core.errors import IndicoError
from indico.util.i18n import _
from MaKaC.webinterface.rh.conferenceDisplay import RHConferenceBaseDisplay
from indico_chat import _
from indico_chat.models.chatrooms import ChatroomEventAssociation
from indico_chat.views import WPChatEventPage

View File

@ -24,10 +24,10 @@ from werkzeug.utils import secure_filename
from indico.core.config import Config
from indico.core.plugins import url_for_plugin
from indico.util.i18n import _
from MaKaC.common.log import ModuleNames
from MaKaC.conference import LocalFile
from indico_chat import _
from indico_chat.controllers.base import RHEventChatroomMixin, RHChatManageEventBase
from indico_chat.views import WPChatEventMgmt
from indico_chat.xmpp import retrieve_logs

View File

@ -24,10 +24,10 @@ from indico.core.db.sqlalchemy.util.models import attrs_changed
from indico.core.errors import IndicoError
from indico.core.plugins import url_for_plugin
from indico.util.date_time import now_utc
from indico.util.i18n import _
from indico.util.string import to_unicode
from indico.web.forms.base import FormDefaults
from indico_chat import _
from indico_chat.controllers.base import RHChatManageEventBase, RHEventChatroomMixin
from indico_chat.forms import AddChatroomForm, EditChatroomForm
from indico_chat.models.chatrooms import ChatroomEventAssociation, Chatroom

View File

@ -23,8 +23,8 @@ from wtforms.validators import DataRequired, ValidationError
from indico.web.forms.base import IndicoForm, generated_data
from indico.web.forms.validators import UsedIf
from indico.util.i18n import _
from indico_chat import _
from indico_chat.models.chatrooms import Chatroom
from indico_chat.xmpp import generate_jid, room_exists

View File

@ -27,7 +27,6 @@ from wtforms.validators import DataRequired
from indico.core import signals
from indico.core.db import db
from indico.core.plugins import IndicoPlugin, url_for_plugin
from indico.util.i18n import _
from indico.util.user import principals_merge_users
from indico.web.forms.base import IndicoForm
from indico.web.forms.fields import PrincipalField, MultipleItemsField, EmailListField, IndicoPasswordField
@ -36,6 +35,7 @@ from MaKaC.conference import EventCloner
from MaKaC.webinterface.displayMgr import EventMenuEntry
from MaKaC.webinterface.wcomponents import SideMenuItem
from indico_chat import _
from indico_chat.blueprint import blueprint
from indico_chat.models.chatrooms import ChatroomEventAssociation
from indico_chat.notifications import notify_deleted

View File

@ -17,9 +17,10 @@
from __future__ import unicode_literals
from indico.core.errors import IndicoError
from indico.util.i18n import _
from indico.util.user import retrieve_principals
from indico_chat import _
def check_config(quiet=False):
"""Checks if all required config options are set