Change "HANA" to "SAP HANA" on UI

The actual product name is "SAP HANA". Furthermore, there are other things called "HANA" like the Boost metaprogramming library.
qgis · Jan 19, 2021 · 54480d9 · 54480d9
1 parent bf0099c
commit 54480d9
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 36 deletions.
diff --git a/src/providers/hana/qgshanaconnection.cpp b/src/providers/hana/qgshanaconnection.cpp
@@ -65,7 +65,7 @@ QgsHanaConnection::~QgsHanaConnection()
   }
   catch ( const Exception &ex )
   {
-    QgsMessageLog::logMessage( QgsHanaUtils::formatErrorMessage( ex.what() ), tr( "HANA" ) );
+    QgsMessageLog::logMessage( QgsHanaUtils::formatErrorMessage( ex.what() ), tr( "SAP HANA" ) );
   }
 }
 
@@ -104,7 +104,7 @@ QgsHanaConnection *QgsHanaConnection::createConnection( const QgsDataSourceUri &
       {
         errorMessage = QObject::tr( "Connection to database failed" ) + '\n' + QgsHanaUtils::formatErrorMessage( ex.what() );
         QgsDebugMsg( errorMessage );
-        QgsMessageLog::logMessage( errorMessage, tr( "HANA" ) );
+        QgsMessageLog::logMessage( errorMessage, tr( "SAP HANA" ) );
       }
 
       return conn->connected();

diff --git a/src/providers/hana/qgshanadataitemguiprovider.h b/src/providers/hana/qgshanadataitemguiprovider.h
@@ -27,7 +27,7 @@ class QgsHanaDataItemGuiProvider : public QObject, public QgsDataItemGuiProvider
     Q_OBJECT
   public:
 
-    QString name() override { return QStringLiteral( "HANA" ); }
+    QString name() override { return QStringLiteral( "SAP HANA" ); }
 
     void populateContextMenu( QgsDataItem *item, QMenu *menu,
                               const QList<QgsDataItem *> &selectedItems, QgsDataItemGuiContext context ) override;

diff --git a/src/providers/hana/qgshanadataitems.cpp b/src/providers/hana/qgshanadataitems.cpp
@@ -174,7 +174,7 @@ bool QgsHanaConnectionItem::handleDrop( const QMimeData *data, const QString &to
         connect( exportTask.get(), &QgsVectorLayerExporterTask::exportComplete, this,
                  [ = ]()
         {
-          QMessageBox::information( nullptr, tr( "Import to HANA database" ), tr( "Import was successful." ) );
+          QMessageBox::information( nullptr, tr( "Import to SAP HANA database" ), tr( "Import was successful." ) );
           refreshSchema( toSchema );
         } );
 
@@ -185,7 +185,7 @@ bool QgsHanaConnectionItem::handleDrop( const QMimeData *data, const QString &to
           if ( error != QgsVectorLayerExporter::ErrUserCanceled )
           {
             QgsMessageOutput *output = QgsMessageOutput::createMessageOutput();
-            output->setTitle( tr( "Import to HANA database" ) );
+            output->setTitle( tr( "Import to SAP HANA database" ) );
             output->setMessage( tr( "Failed to import some layers!\n\n" ) +
                                 errorMessage, QgsMessageOutput::MessageText );
             output->showMessage();
@@ -211,7 +211,7 @@ bool QgsHanaConnectionItem::handleDrop( const QMimeData *data, const QString &to
   if ( hasError )
   {
     QgsMessageOutput *output = QgsMessageOutput::createMessageOutput();
-    output->setTitle( tr( "Import to HANA database" ) );
+    output->setTitle( tr( "Import to SAP HANA database" ) );
     output->setMessage( tr( "Failed to import some layers!\n\n" ) +
                         importResults.join( QLatin1Char( '\n' ) ), QgsMessageOutput::MessageText );
     output->showMessage();
@@ -381,5 +381,5 @@ QgsDataItem *QgsHanaDataItemProvider::createDataItem(
   const QString &pathIn, QgsDataItem *parentItem )
 {
   Q_UNUSED( pathIn );
-  return new QgsHanaRootItem( parentItem, QStringLiteral( "HANA" ), QStringLiteral( "hana:" ) );
+  return new QgsHanaRootItem( parentItem, QStringLiteral( "SAP HANA" ), QStringLiteral( "hana:" ) );
 }
diff --git a/src/providers/hana/qgshanadataitems.h b/src/providers/hana/qgshanadataitems.h
@@ -103,7 +103,7 @@ class QgsHanaLayerItem : public QgsLayerItem
 class QgsHanaDataItemProvider : public QgsDataItemProvider
 {
   public:
-    QString name() override { return QStringLiteral( "HANA" ); }
+    QString name() override { return QStringLiteral( "SAP HANA" ); }
     int capabilities() const override { return QgsDataProvider::Database; }
     QgsDataItem *createDataItem( const QString &pathIn, QgsDataItem *parentItem ) override;
 };

diff --git a/src/providers/hana/qgshanafeatureiterator.cpp b/src/providers/hana/qgshanafeatureiterator.cpp
@@ -278,7 +278,7 @@ QString QgsHanaFeatureIterator::buildSqlQuery( const QgsFeatureRequest &request
     filterRect = mSource->mSrsExtent.intersect( filterRect );
 
   if ( !filterRect.isFinite() )
-    QgsMessageLog::logMessage( QObject::tr( "Infinite filter rectangle specified" ), QObject::tr( "HANA" ) );
+    QgsMessageLog::logMessage( QObject::tr( "Infinite filter rectangle specified" ), QObject::tr( "SAP HANA" ) );
 
   QStringList orderByParts;
 #if 0

diff --git a/src/providers/hana/qgshananewconnection.cpp b/src/providers/hana/qgshananewconnection.cpp
@@ -58,14 +58,14 @@ QgsHanaNewConnection::QgsHanaNewConnection(
 
   txtDriver->setText( QgsHanaDriver::instance()->driver() );
 #if defined(Q_OS_WIN)
-  txtDriver->setToolTip( tr( "The name of the HANA ODBC driver.\r\n\r\n"
-                             "The HANA ODBC driver is a part of the SAP HANA Client,\r\n"
+  txtDriver->setToolTip( tr( "The name of the SAP HANA ODBC driver.\r\n\r\n"
+                             "The SAP HANA ODBC driver is a part of the SAP HANA Client,\r\n"
                              "which can be found at https://tools.hana.ondemand.com/#hanatools." ) );
 #else
-  txtDriver->setToolTip( tr( "The name or path to the HANA ODBC driver.\r\n\r\n"
+  txtDriver->setToolTip( tr( "The name or path to the SAP HANA ODBC driver.\r\n\r\n"
                              "If the driver is registered in odbcinst.ini, enter the driver's name.\r\n"
                              "Otherwise, enter the path to the driver (libodbcHDB.so).\r\n\r\n"
-                             "The HANA ODBC driver is a part of the SAP HANA Client,\r\n"
+                             "The SAP HANA ODBC driver is a part of the SAP HANA Client,\r\n"
                              "which can be found at https://tools.hana.ondemand.com/#hanatools." ) );
 #endif
 
@@ -334,7 +334,7 @@ void QgsHanaNewConnection::testConnection()
         if ( !QgsHanaDriver::isValidPath( driver ) )
         {
           if ( QFileInfo::exists( driver ) )
-            warningMsg = tr( "Specified driver '%1' cannot be used to connect to HANA." ).arg( driver );
+            warningMsg = tr( "Specified driver '%1' cannot be used to connect to SAP HANA." ).arg( driver );
           else
             warningMsg = tr( "Driver with name/path '%1' was not found." ).arg( driver );
         }

diff --git a/src/providers/hana/qgshanaprimarykeys.cpp b/src/providers/hana/qgshanaprimarykeys.cpp
@@ -146,7 +146,7 @@ QPair<QgsHanaPrimaryKeyType, QList<int>> QgsHanaPrimaryKeyUtils::determinePrimar
     if ( idx < 0 )
     {
       attrs.clear();
-      QgsMessageLog::logMessage( QObject::tr( "Key field '%1' for view/query not found." ).arg( clmName ), QObject::tr( "HANA" ) );
+      QgsMessageLog::logMessage( QObject::tr( "Key field '%1' for view/query not found." ).arg( clmName ), QObject::tr( "SAP HANA" ) );
       break;
     }
     attrs << idx;
@@ -155,7 +155,7 @@ QPair<QgsHanaPrimaryKeyType, QList<int>> QgsHanaPrimaryKeyUtils::determinePrimar
   if ( !attrs.isEmpty() )
     keyType = ( attrs.size() == 1 ) ? getPrimaryKeyType( fields.at( attrs[0] ) ) : PktFidMap;
   else
-    QgsMessageLog::logMessage( QObject::tr( "Keys for view/query undefined." ), QObject::tr( "HANA" ) );
+    QgsMessageLog::logMessage( QObject::tr( "Keys for view/query undefined." ), QObject::tr( "SAP HANA" ) );
 
   return qMakePair( keyType, attrs );
 }
@@ -164,7 +164,7 @@ QPair<QgsHanaPrimaryKeyType, QList<int>> QgsHanaPrimaryKeyUtils::determinePrimar
 {
   if ( primaryKey.isEmpty() )
   {
-    QgsMessageLog::logMessage( QObject::tr( "No key field for view/query given." ), QObject::tr( "HANA" ) );
+    QgsMessageLog::logMessage( QObject::tr( "No key field for view/query given." ), QObject::tr( "SAP HANA" ) );
     return qMakePair( PktUnknown, QList<int>() );
   }
 

diff --git a/src/providers/hana/qgshanaprovider.cpp b/src/providers/hana/qgshanaprovider.cpp
@@ -278,7 +278,7 @@ namespace
 static const size_t MAXIMUM_BATCH_DATA_SIZE = 4 * 1024 * 1024;
 
 const QString QgsHanaProvider::HANA_KEY = QStringLiteral( "hana" );
-const QString QgsHanaProvider::HANA_DESCRIPTION = QStringLiteral( "HANA spatial data provider" );
+const QString QgsHanaProvider::HANA_DESCRIPTION = QStringLiteral( "SAP HANA spatial data provider" );
 
 QgsHanaProvider::QgsHanaProvider(
   const QString &uri,
@@ -299,14 +299,14 @@ QgsHanaProvider::QgsHanaProvider(
 
   if ( mSchemaName.isEmpty() || mTableName.isEmpty() )
   {
-    QgsMessageLog::logMessage( QObject::tr( "Schema or table name cannot be empty" ), QObject::tr( "HANA" ) );
+    QgsMessageLog::logMessage( QObject::tr( "Schema or table name cannot be empty" ), QObject::tr( "SAP HANA" ) );
     return;
   }
 
   QgsHanaConnectionRef conn( mUri );
   if ( conn.isNull() )
   {
-    QgsMessageLog::logMessage( QObject::tr( "Failed to connect to database" ), QObject::tr( "HANA" ) );
+    QgsMessageLog::logMessage( QObject::tr( "Failed to connect to database" ), QObject::tr( "SAP HANA" ) );
     return;
   }
 
@@ -326,7 +326,7 @@ QgsHanaProvider::QgsHanaProvider(
   {
     if ( !checkPermissionsAndSetCapabilities() )
     {
-      QgsMessageLog::logMessage( QObject::tr( "Provider does not have enough permissions" ), QObject::tr( "HANA" ) );
+      QgsMessageLog::logMessage( QObject::tr( "Provider does not have enough permissions" ), QObject::tr( "SAP HANA" ) );
       return;
     }
 
@@ -684,7 +684,7 @@ bool QgsHanaProvider::addFeatures( QgsFeatureList &flist, Flags flags )
   }
   catch ( const exception &ex )
   {
-    pushError( tr( "HANA error while adding features: %1" )
+    pushError( tr( "SAP HANA error while adding features: %1" )
                .arg( QgsHanaUtils::formatErrorMessage( ex.what(), false ) ) );
     conn->rollback();
   }
@@ -713,7 +713,7 @@ bool QgsHanaProvider::deleteFeatures( const QgsFeatureIds &ids )
   const QString featureIdsWhereClause = QgsHanaPrimaryKeyUtils::buildWhereClause( ids, mAttributeFields,  mPrimaryKeyType, mPrimaryKeyAttrs, *mPrimaryKeyCntx );
   if ( featureIdsWhereClause.isEmpty() )
   {
-    pushError( tr( "HANA failed to delete features: Unable to find feature ids" ) );
+    pushError( tr( "SAP HANA failed to delete features: Unable to find feature ids" ) );
     return false;
   }
 
@@ -728,7 +728,7 @@ bool QgsHanaProvider::deleteFeatures( const QgsFeatureIds &ids )
   }
   catch ( const QgsHanaException &ex )
   {
-    pushError( tr( "HANA failed to delete features: %1" )
+    pushError( tr( "SAP HANA failed to delete features: %1" )
                .arg( QgsHanaUtils::formatErrorMessage( ex.what(), false ) ) );
     conn->rollback();
     return false;
@@ -761,7 +761,7 @@ bool QgsHanaProvider::truncate()
   }
   catch ( const QgsHanaException &ex )
   {
-    pushError( tr( "HANA failed to truncate: %1" ).arg( QgsHanaUtils::formatErrorMessage( ex.what() ) ) );
+    pushError( tr( "SAP HANA failed to truncate: %1" ).arg( QgsHanaUtils::formatErrorMessage( ex.what() ) ) );
     conn->rollback();
     return false;
   }
@@ -800,7 +800,7 @@ bool QgsHanaProvider::addAttributes( const QList<QgsField> &attributes )
   }
   catch ( const QgsHanaException &ex )
   {
-    pushError( tr( "HANA failed to add feature: %1" )
+    pushError( tr( "SAP HANA failed to add feature: %1" )
                .arg( QgsHanaUtils::formatErrorMessage( ex.what(), false ) ) );
     conn->rollback();
     return false;
@@ -839,7 +839,7 @@ bool QgsHanaProvider::deleteAttributes( const QgsAttributeIds &attributes )
   }
   catch ( const QgsHanaException &ex )
   {
-    pushError( tr( "HANA error while deleting attributes: %1" )
+    pushError( tr( "SAP HANA error while deleting attributes: %1" )
                .arg( QgsHanaUtils::formatErrorMessage( ex.what(), false ) ) );
     conn->rollback();
     return false;
@@ -926,7 +926,7 @@ bool QgsHanaProvider::renameAttributes( const QgsFieldNameMap &fieldMap )
   }
   catch ( const QgsHanaException &ex )
   {
-    pushError( tr( "HANA error while renaming attributes: %1" )
+    pushError( tr( "SAP HANA error while renaming attributes: %1" )
                .arg( QgsHanaUtils::formatErrorMessage( ex.what(), false ) ) );
     conn->rollback();
     return false;
@@ -982,7 +982,7 @@ bool QgsHanaProvider::changeGeometryValues( const QgsGeometryMap &geometryMap )
   }
   catch ( const exception &ex )
   {
-    pushError( tr( "HANA failed to change feature geometry: %1" )
+    pushError( tr( "SAP HANA failed to change feature geometry: %1" )
                .arg( QgsHanaUtils::formatErrorMessage( ex.what(), false ) ) );
     conn->rollback();
     return false;
@@ -1079,7 +1079,7 @@ bool QgsHanaProvider::changeAttributeValues( const QgsChangedAttributesMap &attr
   }
   catch ( const exception &ex )
   {
-    pushError( tr( "HANA failed to change feature attributes: %1" )
+    pushError( tr( "SAP HANA failed to change feature attributes: %1" )
                .arg( QgsHanaUtils::formatErrorMessage( ex.what(), false ) ) );
     conn->rollback();
     return false;

diff --git a/src/providers/hana/qgshanaprovidergui.cpp b/src/providers/hana/qgshanaprovidergui.cpp
@@ -28,7 +28,7 @@ class QgsHanaSourceSelectProvider : public QgsSourceSelectProvider
   public:
     QString providerKey() const override { return QgsHanaProvider::HANA_KEY; }
 
-    QString text() const override { return QObject::tr( "HANA" ); }
+    QString text() const override { return QObject::tr( "SAP HANA" ); }
 
     int ordering() const override { return QgsSourceSelectProvider::OrderDatabaseProvider + 70; }
 

diff --git a/src/providers/hana/qgshanasourceselect.cpp b/src/providers/hana/qgshanasourceselect.cpp
@@ -222,7 +222,7 @@ QgsHanaSourceSelect::QgsHanaSourceSelect(
   if ( widgetMode() != QgsProviderRegistry::WidgetMode::None )
     mHoldDialogOpen->hide();
   else
-    setWindowTitle( tr( "Add HANA Table(s)" ) );
+    setWindowTitle( tr( "Add SAP HANA Table(s)" ) );
 
   mBuildQueryButton = new QPushButton( tr( "&Set Filter" ) );
   mBuildQueryButton->setToolTip( tr( "Set Filter" ) );
@@ -550,7 +550,7 @@ void QgsHanaSourceSelect::btnConnect_clicked()
   if ( !conn )
   {
     if ( !canceled )
-      QMessageBox::warning( this, tr( "HANA" ), tr( "Unable to connect to a database" ) );
+      QMessageBox::warning( this, tr( "SAP HANA" ), tr( "Unable to connect to a database" ) );
     return;
   }
 

diff --git a/src/providers/hana/qgshanautils.cpp b/src/providers/hana/qgshanautils.cpp
@@ -504,6 +504,6 @@ QString QgsHanaUtils::formatErrorMessage( const char *message, bool withPrefix )
   if ( pos != -1 )
     ret = ret.remove( 0, pos + mark.length() );
   if ( withPrefix && ret.indexOf( QLatin1String( "HANA" ) ) == -1 )
-    return QStringLiteral( "HANA: " ) + ret;
+    return QStringLiteral( "SAP HANA: " ) + ret;
   return ret;
 }
diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -1650,7 +1650,7 @@
      <normaloff>:/images/themes/default/mActionAddHanaLayer.svg</normaloff>:/images/themes/default/mActionAddHanaLayer.svg</iconset>
    </property>
    <property name="text">
-    <string>Add HANA Spatial Layer…</string>
+    <string>Add SAP HANA Spatial Layer…</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Shift+G</string>

diff --git a/src/ui/qgshananewconnectionbase.ui b/src/ui/qgshananewconnectionbase.ui
@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Create a New HANA Connection</string>
+   <string>Create a New SAP HANA Connection</string>
   </property>
   <property name="sizeGripEnabled">
    <bool>true</bool>