[Fixes #9862] Thesaurus label are not available with default language (…

…#9864)

* [Fixes #9861]Cannot open metadata detail with thesaurus installed

* [Fixes #9862] Thesaurus label are not available with default language

Co-authored-by: Giovanni Allegri <giohappy@gmail.com>
Co-authored-by: Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com>

geonode/base/forms.py

@@ -51,7 +51,7 @@
 from geonode.base.fields import MultiThesauriField
 from geonode.documents.models import Document
 from geonode.layers.models import Dataset
-from geonode.base.utils import validate_extra_metadata, remove_country_from_lanugecode
+from geonode.base.utils import validate_extra_metadata, remove_country_from_languagecode
 
 logger = logging.getLogger(__name__)
 
@@ -351,7 +351,7 @@ def _get_thesauro_keyword_label(item, lang):
         # try find results found for given language e.g. (en-us) if no results found remove country code from language to (en) and try again
         qs_keyword_ids = ThesaurusKeywordLabel.objects.filter(lang=lang, keyword_id__in=keyword_id_for_given_thesaurus).values("keyword_id")
         if len(qs_keyword_ids) == 0:
-            lang = remove_country_from_lanugecode(lang)
+            lang = remove_country_from_languagecode(lang)
             qs_keyword_ids = ThesaurusKeywordLabel.objects.filter(lang=lang, keyword_id__in=keyword_id_for_given_thesaurus).values("keyword_id")
 
         not_qs_ids = ThesaurusKeywordLabel.objects.exclude(keyword_id__in=qs_keyword_ids).order_by("keyword_id").distinct("keyword_id").values("keyword_id")

geonode/base/utils.py

@@ -191,8 +191,7 @@ def validate_extra_metadata(data, instance):
     return data
 
 
-@staticmethod
-def remove_country_from_lanugecode(language: str):
+def remove_country_from_languagecode(language: str):
     """ Remove country code (us) from language name (en-us)
     >>> remove_country_from_lanugecode("en-us")
     'en'

geonode/base/views.py

@@ -48,7 +48,7 @@
 from geonode.resource.manager import resource_manager
 from geonode.security.utils import get_visible_resources
 from geonode.notifications_helper import send_notification
-from geonode.base.utils import OwnerRightsRequestViewUtils, remove_country_from_lanugecode
+from geonode.base.utils import OwnerRightsRequestViewUtils, remove_country_from_languagecode
 from geonode.base.forms import UserAndGroupPermissionsForm
 
 from geonode.base.forms import (
@@ -310,7 +310,7 @@ def get_queryset(self):
         # try find results found for given language e.g. (en-us) if no results found remove country code from language to (en) and try again
         qs_keyword_ids = ThesaurusKeywordLabel.objects.filter(lang=lang, keyword_id__in=keyword_id_for_given_thesaurus).values("keyword_id")
         if len(qs_keyword_ids) == 0:
-            lang = remove_country_from_lanugecode(lang)
+            lang = remove_country_from_languagecode(lang)
             qs_keyword_ids = ThesaurusKeywordLabel.objects.filter(lang=lang, keyword_id__in=keyword_id_for_given_thesaurus).values("keyword_id")
 
         not_qs_ids = ThesaurusKeywordLabel.objects.exclude(keyword_id__in=qs_keyword_ids).order_by("keyword_id").distinct("keyword_id").values("keyword_id")

requirements.txt

@@ -23,7 +23,7 @@ wrapt==1.14.1
 jsonschema==4.14.0
 zipstream-new==1.1.8
 schema==0.7.5
-rdflib==6.2.0
+rdflib==6.1.1
 smart_open==6.1.0
 
 # Django Apps

setup.cfg

@@ -49,7 +49,7 @@ install_requires =
     jsonschema==4.14.0
     zipstream-new==1.1.8
     schema==0.7.5
-    rdflib==6.2.0
+    rdflib==6.1.1
     smart_open==6.1.0
 
     # Django Apps