Inline localized name building into the cached response builders

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: aapeliv

app/backend/src/couchers/i18n/localize.py

@@ -4,7 +4,7 @@
 """
 
 import re
-from collections.abc import Mapping, Sequence
+from collections.abc import Sequence
 from datetime import date, datetime, time, tzinfo
 from typing import cast
 
@@ -13,7 +13,7 @@
 from babel.dates import get_datetime_format, get_timezone_name, match_skeleton, parse_pattern
 from babel.lists import format_list
 
-from couchers.resources import get_language_dict, get_region_code_iso3166_alpha3_to_alpha2, get_region_dict
+from couchers.resources import get_region_code_iso3166_alpha3_to_alpha2
 
 
 def localize_list(items: Sequence[str], locale: babel.Locale) -> str:
@@ -57,28 +57,6 @@ def try_localize_region_name_from_iso3166(code: str, locale: babel.Locale) -> st
     return region_name
 
 
-def get_localized_language_names(locale: babel.Locale) -> Mapping[str, str]:
-    """
-    Maps every allowed language code to its standalone display name in the given locale
-    (falling back to English), ordered by code.
-    """
-    return {
-        code: try_localize_language_name_from_iso639(code, locale, standalone=True) or english_name
-        for code, english_name in sorted(get_language_dict().items())
-    }
-
-
-def get_localized_region_names(locale: babel.Locale) -> Mapping[str, str]:
-    """
-    Maps every region alpha3 code to its display name in the given locale
-    (falling back to English), ordered by code.
-    """
-    return {
-        alpha3: try_localize_region_name_from_iso3166(alpha3, locale) or english_name
-        for alpha3, english_name in sorted(get_region_dict().items())
-    }
-
-
 def localize_date(
     value: date, locale: babel.Locale, *, abbrev: bool = False, with_year: bool = True, with_day_of_week: bool = False
 ) -> str:

app/backend/src/couchers/servicers/resources.py

@@ -6,9 +6,9 @@
 from sqlalchemy.orm import Session
 
 from couchers.context import CouchersContext
-from couchers.i18n.localize import get_localized_language_names, get_localized_region_names
+from couchers.i18n.localize import try_localize_language_name_from_iso639, try_localize_region_name_from_iso3166
 from couchers.proto import resources_pb2, resources_pb2_grpc
-from couchers.resources import get_badge_dict, get_icon, get_terms_of_service
+from couchers.resources import get_badge_dict, get_icon, get_language_dict, get_region_dict, get_terms_of_service
 
 logger = logging.getLogger(__name__)
 
@@ -28,8 +28,11 @@
 def _get_regions_res(locale: babel.Locale) -> resources_pb2.GetRegionsRes:
     return resources_pb2.GetRegionsRes(
         regions=[
-            resources_pb2.Region(alpha3=alpha3, name=name)
-            for alpha3, name in get_localized_region_names(locale).items()
+            resources_pb2.Region(
+                alpha3=alpha3,
+                name=try_localize_region_name_from_iso3166(alpha3, locale) or english_name,
+            )
+            for alpha3, english_name in sorted(get_region_dict().items())
         ]
     )
 
@@ -38,7 +41,11 @@ def _get_regions_res(locale: babel.Locale) -> resources_pb2.GetRegionsRes:
 def _get_languages_res(locale: babel.Locale) -> resources_pb2.GetLanguagesRes:
     return resources_pb2.GetLanguagesRes(
         languages=[
-            resources_pb2.Language(code=code, name=name) for code, name in get_localized_language_names(locale).items()
+            resources_pb2.Language(
+                code=code,
+                name=try_localize_language_name_from_iso639(code, locale, standalone=True) or english_name,
+            )
+            for code, english_name in sorted(get_language_dict().items())
         ]
     )