Localize query result in API

camptocamp · Jun 26, 2020 · f06587e · f06587e
1 parent 39a2611
commit f06587e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/api/src/Map.js b/api/src/Map.js
@@ -470,32 +470,34 @@ class Map {
       }
       const geometryName = feature.getGeometryName();
       const properties = feature.getProperties();
-      let contentHTML = '';
-      if (table) {
-        contentHTML += '<table><tbody>';
-        for (const key in properties) {
-          if (!EXCLUDE_PROPERTIES.includes(key) && key !== geometryName && properties[key] !== undefined) {
-            contentHTML += '<tr>';
-            contentHTML += `<th>${key}</th>`;
-            contentHTML += `<td>${properties[key]}</td>`;
-            contentHTML += '</tr>';
+      themes.getLocalePromise().then((translations) => {
+        let contentHTML = '';
+        if (table) {
+          contentHTML += '<table><tbody>';
+          for (const key in properties) {
+            if (!EXCLUDE_PROPERTIES.includes(key) && key !== geometryName && properties[key] !== undefined) {
+              contentHTML += '<tr>';
+              contentHTML += `<th>${translations[key] || key}</th>`;
+              contentHTML += `<td>${properties[key]}</td>`;
+              contentHTML += '</tr>';
+            }
           }
+          contentHTML += '</tbody></table>';
+        } else {
+          contentHTML += `<div><b>${properties.title}</b></div>`;
+          contentHTML += `<p>${properties.description}</p>`;
         }
-        contentHTML += '</tbody></table>';
-      } else {
-        contentHTML += `<div><b>${properties.title}</b></div>`;
-        contentHTML += `<p>${properties.description}</p>`;
-      }
-      const element = this.overlay_.getElement();
-      if (!element) {
-        throw new Error('Missing element');
-      }
-      const content = element.querySelector('.ol-popup-content');
-      if (!content) {
-        throw new Error('Missing content');
-      }
-      content.innerHTML = contentHTML;
-      this.overlay_.setPosition(position);
+        const element = this.overlay_.getElement();
+        if (!element) {
+          throw new Error('Missing element');
+        }
+        const content = element.querySelector('.ol-popup-content');
+        if (!content) {
+          throw new Error('Missing content');
+        }
+        content.innerHTML = contentHTML;
+        this.overlay_.setPosition(position);
+      });
     }
   }
 

diff --git a/api/src/Themes.js b/api/src/Themes.js
@@ -58,7 +58,7 @@ let localePromise;
  * @hidden
  * @return {Promise<Object<string, string>>} Promise
  */
-function getLocalePromise() {
+export function getLocalePromise() {
   if (!constants.localeUrl) {
     // Fallback to an empty dict
     return Promise.resolve({});