Explicitly list [xlsx] extension for 'MS Office Open XML spreadsheet'…

… format ...because most humans don't associate "MS Office Open XML" with XLS
qgis · Jun 21, 2018 · 352f3f3 · 352f3f3
1 parent f332971
commit 352f3f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -1853,7 +1853,7 @@ class QgsVectorFileWriterMetadataContainer
       driverMetadata.insert( QStringLiteral( "XLSX" ),
                              QgsVectorFileWriter::MetaData(
                                QStringLiteral( "MS Office Open XML spreadsheet" ),
-                               QObject::tr( "MS Office Open XML spreadsheet" ),
+                               QObject::tr( "MS Office Open XML spreadsheet [XLSX]" ),
                                QStringLiteral( "*.xlsx" ),
                                QStringLiteral( "xlsx" ),
                                datasetOptions,
@@ -1893,7 +1893,7 @@ class QgsVectorFileWriterMetadataContainer
       driverMetadata.insert( QStringLiteral( "ODS" ),
                              QgsVectorFileWriter::MetaData(
                                QStringLiteral( "Open Document Spreadsheet" ),
-                               QObject::tr( "Open Document Spreadsheet" ),
+                               QObject::tr( "Open Document Spreadsheet [ODS]" ),
                                QStringLiteral( "*.ods" ),
                                QStringLiteral( "ods" ),
                                datasetOptions,

diff --git a/tests/src/python/test_qgsvectorfilewriter.py b/tests/src/python/test_qgsvectorfilewriter.py
@@ -797,6 +797,8 @@ def testOgrDriverList(self):
         sqlite_index = next(i for i, v in enumerate(drivers) if v.driverName == 'SQLite')
         self.assertLess(ms_xlsx_index, sqlite_index)
 
+        self.assertIn('[XLSX]', drivers[ms_xlsx_index].longName)
+
         # alphabetical sorting
         drivers2 = QgsVectorFileWriter.ogrDriverList(QgsVectorFileWriter.VectorFormatOptions())
         self.assertTrue(drivers2[0].longName < drivers2[1].longName)