SRV-795 feat - reading language from url

apache · Sep 18, 2024 · 41989a6 · 41989a6
1 parent c428108
commit 41989a6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/superset-frontend/src/constants.ts b/superset-frontend/src/constants.ts
@@ -111,6 +111,14 @@ export const URL_PARAMS = {
     name: 'focused_chart',
     type: 'number',
   },
+  language: {
+    name: 'lang',
+    type: 'string'
+  },
+  currency: {
+    name: 'currency',
+    type: 'string'
+  }
 } as const;
 
 export const RESERVED_CHART_URL_PARAMS: string[] = [

diff --git a/superset/security/manager.py b/superset/security/manager.py
@@ -2652,7 +2652,7 @@ def has_guest_access(self, dashboard: "Dashboard") -> bool:
             return False
 
         dashboards = [
-            r for r in user.resources if r["type"] == GuestTokenResourceType.DASHBOARD
+            r for r in user.resources if r["type"] == GuestTokenResourceType.DASHBOARD.value
         ]
 
         # TODO (embedded): remove this check once uuids are rolled out

diff --git a/superset/views/base.py b/superset/views/base.py
@@ -33,6 +33,7 @@
     redirect,
     Response,
     session,
+    request
 )
 from flask_appbuilder import BaseView, expose, Model, ModelView
 from flask_appbuilder.actions import action
@@ -347,8 +348,11 @@ def cached_common_bootstrap_data(  # pylint: disable=unused-argument
 
 
 def common_bootstrap_payload() -> dict[str, Any]:
+    locale = get_locale()
+    if request.args.get('lang'):
+        locale = Locale.parse(request.args.get('lang'))
     return {
-        **cached_common_bootstrap_data(utils.get_user_id(), get_locale()),
+        **cached_common_bootstrap_data(utils.get_user_id(), locale),
         "flash_messages": get_flashed_messages(with_categories=True),
     }