fix: Update import/export labels for territory data (#486)

* Update import data menu item label * update territory export button label
digidem · Jun 16, 2021 · fa94e46 · fa94e46
1 parent e4be8d3
commit fa94e46
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/messages/main/en.json b/messages/main/en.json
@@ -92,7 +92,7 @@
   "welcome-screen-3-open-map": "Use settings for OpenStreetMap",
   "generating-indexes-title": "Indexes",
   "generating-indexes-body": "Regenerating indexes",
-  "menu-import-data": "Import data...",
+  "menu-import-data": "Import Territory data...",
   "menu-import-data-dialog": "Choose a file to import...",
   "menu-import-data-success": "Import complete!",
   "menu-import-data-error": "Error on import",

diff --git a/messages/renderer/en.json b/messages/renderer/en.json
@@ -44,19 +44,19 @@
   },
   "renderer.components.MapEditor.ExportButton.exportGeoJson": {
     "description": "Menu item for exporting GeoJSON",
-    "message": "Export GeoJSON…"
+    "message": "Export Territory Data as GeoJSON…"
   },
   "renderer.components.MapEditor.ExportButton.exportShapefile": {
     "description": "Menu item for exporting Shapefile",
-    "message": "Export Shapefile…"
+    "message": "Export Territory Data as Shapefile…"
   },
   "renderer.components.MapEditor.ExportButton.okButton": {
     "description": "OK button after successful export",
     "message": "OK"
   },
   "renderer.components.MapEditor.ExportButton.saveTitle": {
     "description": "Save dialog title",
-    "message": "Export map data"
+    "message": "Export Territory Data"
   },
   "renderer.components.MapEditor.index.feedback-contribute-button": {
     "message": "Feedback & Contribute"

diff --git a/src/renderer/components/MapEditor/ExportButton.js b/src/renderer/components/MapEditor/ExportButton.js
@@ -22,9 +22,9 @@ const m = defineMessages({
   // Button tooltip on iD Editor toolbar
   exportButton: 'Export map data',
   // Menu item for exporting GeoJSON
-  exportGeoJson: 'Export GeoJSON…',
+  exportGeoJson: 'Export Territory Data as GeoJSON…',
   // Menu item for exporting Shapefile
-  exportShapefile: 'Export Shapefile…',
+  exportShapefile: 'Export Territory Data as Shapefile…',
   // OK button after successful export
   okButton: 'OK',
   // Close button after export error
@@ -36,7 +36,7 @@ const m = defineMessages({
   // Expor error message - if there was an error during export
   dialogError: 'Export failed due to an internal error',
   // Save dialog title
-  saveTitle: 'Export map data',
+  saveTitle: 'Export Territory Data',
   // Default filename for map export
   defaultFilename: 'mapeo-map-data'
 })
@@ -68,26 +68,25 @@ const ExportButton = () => {
   const handleMenuItemClick = format => () => {
     setMenuAnchor(null)
     const ext = format === 'shapefile' ? 'zip' : 'geojson'
-    remote.dialog.showSaveDialog(
-      {
+    remote.dialog
+      .showSaveDialog({
         title: t(m.saveTitle),
         defaultPath: t(m.defaultFilename) + '.' + ext,
         filters: [{ name: format, extensions: [ext] }]
-      }
-    ).then(({ canceled, filePath }) => {
-      if (!filePath || canceled) return
-      setStatus('pending')
-      api
-        .exportData(filePath, { format })
-        .then(() => {
-          setStatus('success')
-        })
-        .catch(err => {
-          setStatus('reject')
-          logger.error('ExportButton save dialog', err)
-        })
-    }
-    )
+      })
+      .then(({ canceled, filePath }) => {
+        if (!filePath || canceled) return
+        setStatus('pending')
+        api
+          .exportData(filePath, { format })
+          .then(() => {
+            setStatus('success')
+          })
+          .catch(err => {
+            setStatus('reject')
+            logger.error('ExportButton save dialog', err)
+          })
+      })
   }
 
   const close = event => {