From: Tiago Melo <tmelo@suse.com>
Date: Wed, 27 May 2020 12:51:04 +0000 (+0000)
Subject: mgr/dashboard: Fix dashboard languages make configuration
X-Git-Tag: v16.1.0~2184^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d2a1ed3a427bcfb9c6c0fa737efbdf270385793b;p=ceph.git

mgr/dashboard: Fix dashboard languages make configuration

We have to manually pass DASHBOARD_FRONTEND_LANGS to the build command of the
dashboard.

This was a regression introduced in 1a6a8381a55e59a3c5e6b7fbc6c525f0cac2b854.

Fixes: https://tracker.ceph.com/issues/45720

Signed-off-by: Tiago Melo <tmelo@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
index 1861d3c738f2..e94817d4fa13 100644
--- a/src/pybind/mgr/dashboard/CMakeLists.txt
+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
@@ -92,7 +92,7 @@ endif()
 
 add_npm_command(
   OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/dist"
-  COMMAND npm run build:localize -- ${npm_args}
+  COMMAND DASHBOARD_FRONTEND_LANGS="${DASHBOARD_FRONTEND_LANGS}" npm run build:localize -- ${npm_args}
   DEPENDS ${frontend_src} frontend/node_modules
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
   COMMENT "dashboard frontend is being created"