[Fixes #13800] Refact metadata i18n mechanism - use new gettext

Author: etj

geonode/base/i18n.py

@@ -128,7 +128,12 @@ class LabelResolver:
     CACHE_KEY_LABELS = "labels"
 
     def gettext(self, key, lang=None, fallback=True):
+        """
+        Return the translated text in the label Thesaurus, falling back to the PO/MO translation.
+        If fallback=False only search in the label Thesaurus, and may return None if not found
+        """
         lang = lang or get_language()
+        # TODO: implement the OVR search
         return self.get_labels(lang).get(key, None) or (_(key) if fallback else None)
 
     def get_labels(self, lang):

geonode/metadata/handlers/abstract.py

@@ -23,11 +23,8 @@
 
 from typing_extensions import deprecated
 
-from django.utils.translation import gettext as _
-
 from geonode.base.models import ResourceBase
-from geonode.base.i18n import OVR_SUFFIX
-from geonode.metadata.manager import CONTEXT_KEY_LABELS
+from geonode.base.i18n import OVR_SUFFIX, labelResolver
 
 logger = logging.getLogger(__name__)
 
@@ -163,37 +160,26 @@ def _set_error(errors: dict, path: list, msg: str):
 
     @staticmethod
     def localize_message(context: dict, msg_code: str, msg_info: dict):
-        msg_loc: str = MetadataHandler._get_tkl_labels(context, None, msg_code)
+        msg_loc: str = labelResolver.gettext(msg_code)
         if msg_loc:
             tokens = defaultdict(lambda: "N/A", msg_info or {})
             return msg_loc.format_map(tokens)
         else:
             logger.warning(f"Missing i18n entry for key '{msg_code}' -- info is {msg_info}")
             return f"{msg_code}:{msg_info}"
 
-    @staticmethod
-    def _localize_label(context, lang: str, text: str):
-        # TODO: deprecate and use LabelResolver.gettext(...fallback=true)
-        label = MetadataHandler._get_tkl_labels(context, lang, text)
-        return label or _(text)
-
-    @staticmethod
-    def _get_tkl_labels(context, lang: str | None, text: str):
-        # TODO: deprecate and use LabelResolver.gettext(...fallback=false)
-        return context.get(CONTEXT_KEY_LABELS, {}).get(text, None)
-
     @staticmethod
     def _localize_subschema_labels(context, subschema: dict, lang: str, property_name: str = None):
         for annotation_name, synt in (
             ("title", ""),
             ("description", "__descr"),
         ):
-            if ovr := MetadataHandler._get_tkl_labels(context, lang, f"{property_name}{synt}{OVR_SUFFIX}"):
+            if ovr := labelResolver.gettext(f"{property_name}{synt}{OVR_SUFFIX}", lang, fallback=False):
                 subschema[annotation_name] = ovr
             elif annotation_name in subschema:
-                subschema[annotation_name] = MetadataHandler._localize_label(context, lang, subschema[annotation_name])
+                subschema[annotation_name] = labelResolver.gettext(subschema[annotation_name], lang)
             elif property_name:  # arrays may not have a name
-                label = MetadataHandler._get_tkl_labels(context, lang, f"{property_name}{synt}")
+                label = labelResolver.gettext(f"{property_name}{synt}", lang, fallback=False)
                 if label:
                     subschema[annotation_name] = label
 

geonode/metadata/handlers/contact.py

@@ -24,6 +24,7 @@
 from django.contrib.auth import get_user_model
 from django.utils.translation import gettext as _
 
+from geonode.base.i18n import labelResolver
 from geonode.metadata.handlers.abstract import MetadataHandler
 from geonode.people import Roles
 from geonode.resource.manager import resource_manager
@@ -66,7 +67,7 @@ def update_schema(self, jsonschema, context, lang=None):
             if role.is_multivalue:
                 contact = {
                     "type": "array",
-                    "title": self._localize_label(context, lang, role.label) + card,
+                    "title": labelResolver.gettext(role.label, lang) + card,
                     "minItems": minitems,
                     "items": {
                         "type": "object",
@@ -86,7 +87,7 @@ def update_schema(self, jsonschema, context, lang=None):
             else:
                 contact = {
                     "type": "object",
-                    "title": self._localize_label(context, lang, role.label) + card,
+                    "title": labelResolver.gettext(role.label, lang) + card,
                     "properties": {
                         "id": {
                             "type": "string",

geonode/metadata/handlers/sparse.py

@@ -26,7 +26,7 @@
 from geonode.metadata.exceptions import UnsetFieldException
 from geonode.metadata.models import SparseField
 
-from geonode.base.i18n import get_localized_tkeywords
+from geonode.base.i18n import get_localized_tkeywords, labelResolver
 
 logger = logging.getLogger(__name__)
 
@@ -78,7 +78,7 @@ def _recurse_localization(self, context, schema, lang, field_name=None):
                 self._recurse_localization(context, subschema, lang, prop_name)
         for item in schema.get("oneOf", []):
             if title := item.get("title", None):
-                item["title"] = MetadataHandler._localize_label(context, lang, title)
+                item["title"] = labelResolver.gettext(title, lang)
 
     def _recurse_thesauri_autocomplete(self, d, lang):
         if isinstance(d, dict):

geonode/metadata/manager.py

@@ -27,13 +27,12 @@
 from geonode.indexing.manager import index_manager
 from geonode.metadata.handlers.abstract import MetadataHandler
 from geonode.metadata.exceptions import UnsetFieldException
-from geonode.base.i18n import I18nCache
+from geonode.base.i18n import i18nCache
 from geonode.metadata.settings import MODEL_SCHEMA
 
 logger = logging.getLogger(__name__)
 
 CACHE_KEY_SCHEMA = "schema"
-CONTEXT_KEY_LABELS = "labels"
 
 
 class MetadataManager:
@@ -48,7 +47,6 @@ class MetadataManager:
     def __init__(self):
         self.root_schema = MODEL_SCHEMA
         self.handlers = {}
-        self._i18n_cache = I18nCache()
 
     def add_handler(self, handler_id, handler):
         self.handlers[handler_id] = handler()
@@ -61,7 +59,7 @@ def post_init(self):
             handler.post_init()
 
     def _init_schema_context(self, lang):
-        return {CONTEXT_KEY_LABELS: self._i18n_cache.get_labels(lang)}
+        return {}
 
     def build_schema(self, lang=None):
         logger.debug(f"build_schema {lang}")
@@ -86,12 +84,12 @@ def build_schema(self, lang=None):
 
     def get_schema(self, lang=None):
         lang = str(lang)
-        thesaurus_date, schema = self._i18n_cache.get_entry(lang, CACHE_KEY_SCHEMA)
+        thesaurus_date, schema = i18nCache.get_entry(lang, CACHE_KEY_SCHEMA)
         if schema is None:
             logger.info(f"Building schema for {lang}")
             schema = self.build_schema(lang)
             logger.debug("Schema built")
-            self._i18n_cache.set(lang, CACHE_KEY_SCHEMA, schema, thesaurus_date)
+            i18nCache.set(lang, CACHE_KEY_SCHEMA, schema, thesaurus_date)
         return schema
 
     def build_schema_instance(self, resource, lang=None):

geonode/metadata/tests/test_handlers.py

@@ -61,7 +61,6 @@
 from geonode.metadata.handlers.thesaurus import TKeywordsHandler
 from geonode.metadata.handlers.contact import ContactHandler, ROLE_NAMES_MAP
 from geonode.metadata.handlers.sparse import SparseHandler, sparse_field_registry
-from geonode.metadata.manager import CONTEXT_KEY_LABELS
 from geonode.metadata.models import SparseField
 from geonode.metadata.settings import MODEL_SCHEMA
 from geonode.metadata.exceptions import UnsetFieldException
@@ -1376,7 +1375,7 @@ def test_tkeywords_handler_update_schema_with_thesauri(self, mock_collect_thesau
         mocked_endpoint.side_effect = lambda name, kwargs: f"/mocked/url/{kwargs['thesaurusid']}"
 
         # Call the method
-        updated_schema = self.tkeywords_handler.update_schema(schema, context={CONTEXT_KEY_LABELS: {}}, lang="en")
+        updated_schema = self.tkeywords_handler.update_schema(schema, context={}, lang="en")
 
         # Assert tkeywords property is added
         tkeywords = updated_schema["properties"].get("tkeywords")
@@ -1428,7 +1427,7 @@ def test_tkeywords_handler_update_schema_no_thesauri(self, mock_collect_thesauri
         mock_collect_thesauri.return_value = {}
 
         # Call the method
-        updated_schema = self.tkeywords_handler.update_schema(schema, context={CONTEXT_KEY_LABELS: {}}, lang="en")
+        updated_schema = self.tkeywords_handler.update_schema(schema, context={}, lang="en")
 
         # Assert tkeywords property is hidden
         tkeywords = updated_schema["properties"].get("tkeywords")
@@ -1675,7 +1674,6 @@ def test_sparse_handler_update_resource(self):
                     }
                 }
             },
-            CONTEXT_KEY_LABELS: {},
         }
 
         # Test string field

geonode/metadata/tests/tests.py

@@ -31,7 +31,7 @@
 
 from rest_framework.test import APITestCase
 from geonode.metadata.settings import MODEL_SCHEMA
-from geonode.metadata.manager import metadata_manager, CONTEXT_KEY_LABELS, CACHE_KEY_SCHEMA
+from geonode.metadata.manager import metadata_manager, CACHE_KEY_SCHEMA
 from geonode.base.i18n import I18nCache
 from geonode.metadata.api.views import (
     ProfileAutocomplete,
@@ -916,7 +916,7 @@ def test_update_schema_instance_no_errors(self, mock_get_schema):
         mock_request.data = {"field1": "new_value1", "new_field2": "new_value2"}
         mock_request.user = self.test_user_1
 
-        expected_context = {CONTEXT_KEY_LABELS: {}, "user": self.test_user_1}
+        expected_context = {"user": self.test_user_1}
 
         mock_get_schema.return_value = self.fake_schema
 

uwsgi.ini

@@ -1,10 +1,11 @@
 [uwsgi]
 # uwsgi-socket = 0.0.0.0:8000
 http-socket = 0.0.0.0:8000
-logto = /var/log/geonode.log
+logto = /tmp/geonode.log
 # pidfile = /tmp/geonode.pid
 
-chdir = /usr/src/geonode/
+;chdir = /usr/src/geonode/
+chdir = /home/etj/prj/geonode/geonode5/geonode
 module = geonode.wsgi:application
 
 strict = false