From ed4418603e14c5db2be5cda2be42b28430fff8a5 Mon Sep 17 00:00:00 2001 From: Adrian Moennich Date: Wed, 11 Mar 2015 17:40:41 +0100 Subject: [PATCH] Chat: Use new i18n functions --- chat/MANIFEST.in | 1 + chat/indico_chat/__init__.py | 21 +++++++++++++++++++++ chat/indico_chat/controllers/base.py | 4 +++- chat/indico_chat/controllers/event.py | 3 +-- chat/indico_chat/controllers/logs.py | 2 +- chat/indico_chat/controllers/management.py | 2 +- chat/indico_chat/forms.py | 2 +- chat/indico_chat/plugin.py | 2 +- chat/indico_chat/util.py | 3 ++- 9 files changed, 32 insertions(+), 8 deletions(-) diff --git a/chat/MANIFEST.in b/chat/MANIFEST.in index ef3cc6e..451e480 100644 --- a/chat/MANIFEST.in +++ b/chat/MANIFEST.in @@ -1,3 +1,4 @@ graft indico_chat/static graft indico_chat/migrations graft indico_chat/templates +graft indico_chat/translations diff --git a/chat/indico_chat/__init__.py b/chat/indico_chat/__init__.py index e69de29..3e522bc 100644 --- a/chat/indico_chat/__init__.py +++ b/chat/indico_chat/__init__.py @@ -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 . + +from __future__ import unicode_literals + +from indico.util.i18n import make_bound_gettext + +_ = make_bound_gettext('chat') diff --git a/chat/indico_chat/controllers/base.py b/chat/indico_chat/controllers/base.py index 6de87b3..18d7025 100644 --- a/chat/indico_chat/controllers/base.py +++ b/chat/indico_chat/controllers/base.py @@ -14,12 +14,14 @@ # You should have received a copy of the GNU General Public License # along with Indico; if not, see . +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 diff --git a/chat/indico_chat/controllers/event.py b/chat/indico_chat/controllers/event.py index 629ad1a..28cff14 100644 --- a/chat/indico_chat/controllers/event.py +++ b/chat/indico_chat/controllers/event.py @@ -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 diff --git a/chat/indico_chat/controllers/logs.py b/chat/indico_chat/controllers/logs.py index 0d6df03..2374d67 100644 --- a/chat/indico_chat/controllers/logs.py +++ b/chat/indico_chat/controllers/logs.py @@ -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 diff --git a/chat/indico_chat/controllers/management.py b/chat/indico_chat/controllers/management.py index dc3eeb5..0573a41 100644 --- a/chat/indico_chat/controllers/management.py +++ b/chat/indico_chat/controllers/management.py @@ -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 diff --git a/chat/indico_chat/forms.py b/chat/indico_chat/forms.py index a46bbd3..8eb9070 100644 --- a/chat/indico_chat/forms.py +++ b/chat/indico_chat/forms.py @@ -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 diff --git a/chat/indico_chat/plugin.py b/chat/indico_chat/plugin.py index 21da71e..c261cd5 100644 --- a/chat/indico_chat/plugin.py +++ b/chat/indico_chat/plugin.py @@ -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 diff --git a/chat/indico_chat/util.py b/chat/indico_chat/util.py index 51faa9b..67e9225 100644 --- a/chat/indico_chat/util.py +++ b/chat/indico_chat/util.py @@ -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