fix: Add translation support for closing window (#640)

* chore: Made closing text translatable * chore: closing text update clean up * Use IPC for updating the closing screen message * Remove extra show call * Remove unused variable Co-authored-by: ErikSin <67773827+ErikSin@users.noreply.github.com>
digidem · Dec 14, 2021 · 2c8123c · 2c8123c
1 parent 133534e
commit 2c8123c
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 3 deletions.
diff --git a/messages/main/en.json b/messages/main/en.json
@@ -101,5 +101,6 @@
   "convert-button": "Copy to Editor",
   "convert-number": "You have filtered your data to show {count} observations",
   "convert-detail": "{count} of these are not yet in Map Editor. Click OK to move these {count} observations to Map Editor.",
-  "convert-nothing": "These are all already in the Map Editor."
+  "convert-nothing": "These are all already in the Map Editor.",
+  "closing-screen": "Mapeo is closing..."
 }
diff --git a/src/main/index.js b/src/main/index.js
@@ -197,6 +197,15 @@ async function startup ({
     try {
       if (winMain && winMain.webContents) {
         winMain.webContents.send.apply(winMain.webContents, args)
+
+        if (
+          winClosing &&
+          winClosing.webContents &&
+          args[0].startsWith('CLOSING:')
+        ) {
+          winClosing.webContents.send.apply(winClosing.webContents, args)
+        }
+
         return true
       } else return false
     } catch (e) {

diff --git a/src/main/ipc.js b/src/main/ipc.js
@@ -84,12 +84,17 @@ module.exports = function (ipcSend) {
   ipcMain.on('set-locale', function (ev, locale) {
     app.translations = i18n.setLocale(locale)
     i18n.save()
+    ipcSend('CLOSING:update-message', i18n.t('closing-screen'))
   })
 
   ipcMain.on('get-locale', function (ev) {
     ev.returnValue = i18n.locale
   })
 
+  ipcMain.handle('CLOSING:get-message', function () {
+    return i18n.t('closing-screen')
+  })
+
   ipcMain.on('save-file', function () {
     var metadata = userConfig.getSettings('metadata')
     var ext = metadata ? metadata.dataset_id : 'mapeodata'

diff --git a/src/main/windows.js b/src/main/windows.js
@@ -86,6 +86,9 @@ function ClosingWindow () {
     center: true,
     frame: false,
     show: false,
-    alwaysOnTop: true
+    alwaysOnTop: true,
+    webPreferences: {
+      preload: path.join(__dirname, '../../static/closingPreload.js')
+    }
   })
 }
diff --git a/static/closing.html b/static/closing.html
@@ -37,12 +37,13 @@
         font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
           Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
         color: white;
+        text-align: center;
       }
     </style>
   </head>
   <body>
     <div class="root">
-      <h1>
+      <h1 id="closingText">
         Esperando que termina Mapeo... 
       </h1>
     </div>

diff --git a/static/closingPreload.js b/static/closingPreload.js
@@ -0,0 +1,11 @@
+const { ipcRenderer } = require('electron')
+
+window.addEventListener('DOMContentLoaded', () => {
+  ipcRenderer.invoke('CLOSING:get-message').then(updateDom)
+  ipcRenderer.on('CLOSING:update-message', (ev, message) => updateDom(message))
+})
+
+function updateDom (message) {
+  const closingH1 = document.getElementById('closingText')
+  if (closingH1) closingH1.textContent = message
+}