From aaf4e154d628916789c429969640631b65efc81c Mon Sep 17 00:00:00 2001
From: yashlamba <yashlamba2000@gmail.com>
Date: Thu, 15 Aug 2024 12:33:05 +0200
Subject: [PATCH] subjects: minor fixes

---
 invenio_vocabularies/config.py                  | 2 +-
 invenio_vocabularies/contrib/subjects/config.py | 2 +-
 invenio_vocabularies/contrib/subjects/schema.py | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/invenio_vocabularies/config.py b/invenio_vocabularies/config.py
index 04c1058e..ef121034 100644
--- a/invenio_vocabularies/config.py
+++ b/invenio_vocabularies/config.py
@@ -117,7 +117,7 @@
     "funders",
     "subjects",
 ]
-"""Configure CUSTOM_VOCABULARY_TYPES to differentiate output. Is used in VocabulariesServiceConfig."""
+"""List of custom vocabulary types."""
 
 VOCABULARIES_DATASTREAM_READERS = {
     "csv": CSVReader,
diff --git a/invenio_vocabularies/contrib/subjects/config.py b/invenio_vocabularies/contrib/subjects/config.py
index 706eaf73..5041e9cf 100644
--- a/invenio_vocabularies/contrib/subjects/config.py
+++ b/invenio_vocabularies/contrib/subjects/config.py
@@ -46,7 +46,7 @@ class SubjectsSearchOptions(SearchOptions):
         ),
         "subject": dict(
             title=_("Name"),
-            fields=["indexed_at"],
+            fields=["subject_sort"],
         ),
         "newest": dict(
             title=_("Newest"),
diff --git a/invenio_vocabularies/contrib/subjects/schema.py b/invenio_vocabularies/contrib/subjects/schema.py
index 07de71ee..df711d3e 100644
--- a/invenio_vocabularies/contrib/subjects/schema.py
+++ b/invenio_vocabularies/contrib/subjects/schema.py
@@ -10,10 +10,8 @@
 
 """Subjects schema."""
 
-from functools import partial
 
-from flask import current_app
-from invenio_i18n import lazy_gettext as _
+from invenio_i18n import get_locale
 from marshmallow import fields, pre_load
 from marshmallow_utils.fields import SanitizedUnicode
 
@@ -39,7 +37,7 @@ class SubjectSchema(BaseVocabularySchema):
     @pre_load
     def add_subject_from_title(self, data, **kwargs):
         """Add subject from title if not present."""
-        locale = current_app.config.get("BABEL_DEFAULT_LOCALE", "en")
+        locale = get_locale().language
         if "subject" not in data:
             data["subject"] = data["title"].get(locale) or data["title"].values()[0]
         return data