From c92a965fbcd30bed1bc0cd832d1eed88fa425fac Mon Sep 17 00:00:00 2001 From: Adrian Moennich Date: Wed, 11 Mar 2015 18:39:46 +0100 Subject: [PATCH] Search/Invenio: Use new i18n functions --- search_invenio/MANIFEST.in | 1 + .../indico_search_invenio/__init__.py | 21 +++++++++++++++++++ search_invenio/indico_search_invenio/forms.py | 3 ++- .../indico_search_invenio/plugin.py | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/search_invenio/MANIFEST.in b/search_invenio/MANIFEST.in index 764608e..d6ce2a4 100644 --- a/search_invenio/MANIFEST.in +++ b/search_invenio/MANIFEST.in @@ -1,3 +1,4 @@ graft indico_search_invenio/static graft indico_search_invenio/templates +graft indico_search_invenio/translations include indico_search_invenio/marc2short.xsl diff --git a/search_invenio/indico_search_invenio/__init__.py b/search_invenio/indico_search_invenio/__init__.py index e69de29..3902866 100644 --- a/search_invenio/indico_search_invenio/__init__.py +++ b/search_invenio/indico_search_invenio/__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('search_invenio') diff --git a/search_invenio/indico_search_invenio/forms.py b/search_invenio/indico_search_invenio/forms.py index 645cf42..0790401 100644 --- a/search_invenio/indico_search_invenio/forms.py +++ b/search_invenio/indico_search_invenio/forms.py @@ -18,9 +18,10 @@ from __future__ import unicode_literals from wtforms.fields.core import SelectField -from indico.util.i18n import _ from indico_search import SearchForm +from indico_search_invenio import _ + COLLECTION_CHOICES = [('', _('Both (Events + Contributions)')), ('events', _('Events')), diff --git a/search_invenio/indico_search_invenio/plugin.py b/search_invenio/indico_search_invenio/plugin.py index ebb3848..fc961fb 100644 --- a/search_invenio/indico_search_invenio/plugin.py +++ b/search_invenio/indico_search_invenio/plugin.py @@ -21,11 +21,11 @@ from wtforms.fields.html5 import URLField, IntegerField from wtforms.validators import URL, NumberRange from indico.core.plugins import IndicoPluginBlueprint -from indico.util.i18n import _ from indico.web.forms.base import IndicoForm from indico_search import SearchPluginBase from indico_search.views import WPSearchCategory, WPSearchConference +from indico_search_invenio import _ from indico_search_invenio.engine import InvenioSearchEngine from indico_search_invenio.forms import InvenioSearchForm