Fix column translations in HANA provider

qgis · Dec 9, 2020 · 79f6176 · 79f6176
1 parent f83ba17
commit 79f6176
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/src/providers/hana/qgshanasourceselect.cpp b/src/providers/hana/qgshanasourceselect.cpp
@@ -36,8 +36,6 @@
 #include <QStringList>
 #include <QStyledItemDelegate>
 
-using namespace std;
-
 //! Used to create an editor for when the user tries to change the contents of a cell
 QWidget *QgsHanaSourceSelectDelegate::createEditor(
   QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const
@@ -245,9 +243,9 @@ QgsHanaSourceSelect::QgsHanaSourceSelect(
   mSearchColumnComboBox->addItem( tr( "Schema" ) );
   mSearchColumnComboBox->addItem( tr( "Table" ) );
   mSearchColumnComboBox->addItem( tr( "Comment" ) );
-  mSearchColumnComboBox->addItem( tr( "Column" ) );
-  mSearchColumnComboBox->addItem( tr( "Spatial Type" ) );
-  mSearchColumnComboBox->addItem( tr( "Feature ID" ) );
+  mSearchColumnComboBox->addItem( tr( "Geometry column" ) );
+  mSearchColumnComboBox->addItem( tr( "Type" ) );
+  mSearchColumnComboBox->addItem( tr( "Feature id" ) );
   mSearchColumnComboBox->addItem( tr( "SRID" ) );
   mSearchColumnComboBox->addItem( tr( "Sql" ) );
 
@@ -433,11 +431,11 @@ void QgsHanaSourceSelect::mSearchColumnComboBox_currentIndexChanged( const QStri
   {
     mProxyModel.setFilterKeyColumn( QgsHanaTableModel::DbtmGeomCol );
   }
-  else if ( text == tr( "Geometry type" ) )
+  else if ( text == tr( "Type" ) )
   {
     mProxyModel.setFilterKeyColumn( QgsHanaTableModel::DbtmGeomType );
   }
-  else if ( text == tr( "Feature ID" ) )
+  else if ( text == tr( "Feature id" ) )
   {
     mProxyModel.setFilterKeyColumn( QgsHanaTableModel::DbtmPkCol );
   }
@@ -547,7 +545,7 @@ void QgsHanaSourceSelect::btnConnect_clicked()
   const QgsDataSourceUri uri = settings.toDataSourceUri();
   bool canceled = false;
 
-  unique_ptr<QgsHanaConnection> conn( QgsHanaConnection::createConnection( uri, &canceled, nullptr ) );
+  std::unique_ptr<QgsHanaConnection> conn( QgsHanaConnection::createConnection( uri, &canceled, nullptr ) );
   if ( !conn )
   {
     if ( !canceled )

diff --git a/src/providers/hana/qgshanatablemodel.cpp b/src/providers/hana/qgshanatablemodel.cpp
@@ -27,10 +27,10 @@ QgsHanaTableModel::QgsHanaTableModel()
   headerLabels << tr( "Table" );
   headerLabels << tr( "Comment" );
   headerLabels << tr( "Column" );
-  headerLabels << tr( "Spatial Type" );
+  headerLabels << tr( "Type" );
   headerLabels << tr( "SRID" );
-  headerLabels << tr( "Feature ID" );
-  headerLabels << tr( "Select at ID" );
+  headerLabels << tr( "Feature id" );
+  headerLabels << tr( "Select at id" );
   headerLabels << tr( "Sql" );
   setHorizontalHeaderLabels( headerLabels );
 }
@@ -49,7 +49,7 @@ void QgsHanaTableModel::addTableEntry( const QgsHanaLayerProperty &layerProperty
   else if ( wkbType != QgsWkbTypes::NoGeometry && srid == std::numeric_limits<int>::min() )
     tip = tr( "Enter a SRID into the '%1' column" ).arg( tr( "SRID" ) );
   else if ( layerProperty.pkCols.size() > 1 )
-    tip = tr( "Select columns in the '%1' column that uniquely identify features of this layer" ).arg( tr( "Feature ID" ) );
+    tip = tr( "Select columns in the '%1' column that uniquely identify features of this layer" ).arg( tr( "Feature id" ) );
 
   QStandardItem *schemaNameItem = new QStandardItem( layerProperty.schemaName );
   QStandardItem *typeItem = new QStandardItem( iconForWkbType( wkbType ),
@@ -248,7 +248,7 @@ bool QgsHanaTableModel::setData( const QModelIndex &idx, const QVariant &value,
       QSet<QString> s0( qgis::listToSet( idx.sibling( idx.row(), DbtmPkCol ).data( Qt::UserRole + 2 ).toStringList() ) );
       QSet<QString> s1( qgis::listToSet( pkCols ) );
       if ( s0.intersect( s1 ).isEmpty() )
-        tip = tr( "Select columns in the '%1' column that uniquely identify features of this layer" ).arg( tr( "Feature ID" ) );
+        tip = tr( "Select columns in the '%1' column that uniquely identify features of this layer" ).arg( tr( "Feature id" ) );
     }
 
     for ( int i = 0; i < DbtmColumns; i++ )