Skip to content

Commit

Permalink
Make some messages/tooltips translatable
Browse files Browse the repository at this point in the history
  • Loading branch information
mrylov committed Dec 9, 2020
1 parent da95974 commit 48dab1c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 17 deletions.
18 changes: 7 additions & 11 deletions src/providers/hana/qgshanadataitems.cpp
Expand Up @@ -306,17 +306,13 @@ QgsHanaLayerItem *QgsHanaSchemaItem::createLayer( const QgsHanaLayerProperty &la
QgsLayerItem::LayerType layerType = QgsLayerItem::TableLayer;
if ( !layerProperty.geometryColName.isEmpty() && layerProperty.isValid() )
{
if ( layerProperty.srid < 0 )
{
tip += QStringLiteral( "\n%1 as %2" ).arg( layerProperty.geometryColName,
QgsWkbTypes::displayString( layerProperty.type ) );
}
tip += tr( "\n%1 as %2" ).arg( layerProperty.geometryColName,
QgsWkbTypes::displayString( layerProperty.type ) );

if ( layerProperty.srid >= 0 )
tip += tr( " (srid %1)" ).arg( layerProperty.srid );
else
{
tip += QStringLiteral( "\n%1 as %2 (srid %3)" )
.arg( layerProperty.geometryColName, QgsWkbTypes::displayString( layerProperty.type ) )
.arg( layerProperty.srid );
}
tip += tr( " (unknown srid)" );

if ( !layerProperty.tableComment.isEmpty() )
tip = layerProperty.tableComment + '\n' + tip;
Expand All @@ -339,7 +335,7 @@ QgsHanaLayerItem *QgsHanaSchemaItem::createLayer( const QgsHanaLayerProperty &la
}
else
{
tip += '\n' + QStringLiteral( "no geometry column" );
tip = tr( "as geometryless table" );
}

QgsHanaLayerItem *layerItem = new QgsHanaLayerItem( this, layerProperty.defaultName(),
Expand Down
12 changes: 6 additions & 6 deletions src/providers/hana/qgshananewconnection.cpp
Expand Up @@ -297,18 +297,18 @@ void QgsHanaNewConnection::testConnection()
{
QString warningMsg;
if ( txtDriver->text().isEmpty() )
warningMsg = QStringLiteral( "Driver name has not been specified." );
warningMsg = tr( "Driver name has not been specified." );
else if ( txtHost->text().isEmpty() )
warningMsg = QStringLiteral( "Host name has not been specified." );
warningMsg = tr( "Host name has not been specified." );
else if ( rbtnMultipleContainers->isChecked() && rbtnTenantDatabase->isChecked() &&
txtTenantDatabaseName->text().isEmpty() )
warningMsg = QStringLiteral( "Database has not been specified." );
warningMsg = tr( "Database has not been specified." );
else if ( mAuthSettings->username().isEmpty() )
warningMsg = QStringLiteral( "User name has not been specified." );
warningMsg = tr( "User name has not been specified." );
else if ( mAuthSettings->password().isEmpty() )
warningMsg = QStringLiteral( "Password has not been specified." );
warningMsg = tr( "Password has not been specified." );
else if ( txtIdentifier->text().isEmpty() )
warningMsg = QStringLiteral( "Identifier has not been specified." );
warningMsg = tr( "Identifier has not been specified." );

if ( !warningMsg.isEmpty() )
{
Expand Down

0 comments on commit 48dab1c

Please sign in to comment.