Skip to content

Commit d05e90e

Browse files
MKleusbergMKleusberg
committed
Improve translatability of the application
Head towards a translatable application by loading translation files for the current locale and using tr() where ever it's needed.
1 parent 88e4b17 commit d05e90e

File tree

12 files changed

+108
-121
lines changed

12 files changed

+108
-121
lines changed

‎src/CreateIndexDialog.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@ void CreateIndexDialog::accept()
8989
sql.append(");");
9090

9191
if(pdb->executeSQL(sql))
92-
{
9392
QDialog::accept();
94-
} else {
95-
QMessageBox::warning(this, QApplication::applicationName(), tr("Creating the index failed:\n").arg(pdb->lastErrorMessage));
96-
}
93+
else
94+
QMessageBox::warning(this, QApplication::applicationName(), tr("Creating the index failed:\n%1").arg(pdb->lastErrorMessage));
9795
}

‎src/EditDialog.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,12 @@ void EditDialog::setDataType(int type, int size)
4141
{
4242
case kSQLiteMediaType_String:
4343
ui->labelType->setText(tr("Type of data currently in cell: Text / Numeric"));
44-
if(ui->editData->toPlainText().length() == 1) charstr = QString("char"); else charstr = QString("chars");
45-
ui->labelSize->setText(QString("%1 %2").arg(ui->editData->toPlainText().length()).arg(charstr));
44+
ui->labelSize->setText(tr("%n char(s)", "", ui->editData->toPlainText().length()));
4645
enableExport(true);
4746
break;
4847
case kSQLiteMediaType_Void:
49-
ui->labelType->setText("Type of data currently in cell: Empty");
50-
ui->labelSize->setText("");
48+
ui->labelType->setText(tr("Type of data currently in cell: Empty"));
49+
ui->labelSize->setText(tr(""));
5150
enableExport(false);
5251
break;
5352
}
@@ -78,7 +77,7 @@ void EditDialog::importData()
7877
this,
7978
tr("Choose a file"),
8079
defaultlocation,
81-
QString("Text files(*.txt);;All files(*)"));
80+
tr("Text files(*.txt);;All files(*)"));
8281
if(QFile::exists(fileName))
8382
{
8483
type = kSQLiteMediaType_String;
@@ -99,15 +98,15 @@ void EditDialog::exportData()
9998
switch (dataType)
10099
{
101100
case kSQLiteMediaType_String:
102-
filter = "Text files(*.txt)";
101+
filter = tr("Text files(*.txt)");
103102
break;
104103
default:
105104
return;
106105
}
107106

108107
QString fileName = QFileDialog::getSaveFileName(
109108
this,
110-
"Choose a filename to export data",
109+
tr("Choose a filename to export data"),
111110
defaultlocation,
112111
filter);
113112

@@ -144,7 +143,7 @@ void EditDialog::accept()
144143
emit updateRecordText(curRow, curCol, ui->editData->toPlainText());
145144

146145
if (dataType == kSQLiteMediaType_Void)
147-
emit updateRecordText(curRow, curCol, QString(""));
146+
emit updateRecordText(curRow, curCol, "");
148147

149148
emit goingAway();
150149
}

‎src/EditTableDialog.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void EditTableDialog::accept()
6868
// Create table
6969
if(!pdb->createTable(ui->editTableName->text(), tbl_structure))
7070
{
71-
QMessageBox::warning(this, QApplication::applicationName(), QString("Error creating table. Message from database engine:\n%1").arg(pdb->lastErrorMessage));
71+
QMessageBox::warning(this, QApplication::applicationName(), tr("Error creating table. Message from database engine:\n%1").arg(pdb->lastErrorMessage));
7272
return;
7373
}
7474
} else {

‎src/ExportCsvDialog.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ void ExportCsvDialog::accept()
3131
// Get filename
3232
QString fileName = QFileDialog::getSaveFileName(
3333
this,
34-
"Choose a filename to export data",
34+
tr("Choose a filename to export data"),
3535
defaultLocation,
36-
"Text files(*.csv *.txt)");
36+
tr("Text files(*.csv *.txt)"));
3737

3838
// Only if the user hasn't clicked the cancel button
3939
if(fileName.size() > 0)
@@ -45,7 +45,7 @@ void ExportCsvDialog::accept()
4545
QString quoteChar = ui->comboQuoteCharacter->currentText();
4646
QString quotequoteChar = quoteChar + quoteChar;
4747
QString sepChar = ui->comboFieldSeparator->currentText();
48-
if(sepChar == "Tab") sepChar = "\t";
48+
if(sepChar == tr("Tab")) sepChar = "\t";
4949
QString newlineChar = "\n";
5050

5151
// Open file
@@ -87,10 +87,10 @@ void ExportCsvDialog::accept()
8787

8888
// Done writing the file
8989
file.close();
90-
QMessageBox::information(this, QApplication::applicationName(), "Export completed.");
90+
QMessageBox::information(this, QApplication::applicationName(), tr("Export completed."));
9191
QDialog::accept();
9292
} else {
93-
QMessageBox::warning(this, QApplication::applicationName(), "Could not open output file.");
93+
QMessageBox::warning(this, QApplication::applicationName(), tr("Could not open output file."));
9494
}
9595
}
9696
}

‎src/FindDialog.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void FindDialog::resetFields(QStringList fieldlist)
4343
ui->editSearchString->setText("");
4444
ui->comboOperator->setCurrentIndex(0);
4545
ui->tableResults->clearContents();
46-
ui->labelNumberResults->setText("Found: 0");
46+
ui->labelNumberResults->setText(tr("Found: 0"));
4747
}
4848

4949
void FindDialog::recordSelected(QTableWidgetItem* witem)

‎src/ImportCsvDialog.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void ImportCsvDialog::accept()
6363
}
6464

6565
// Show progress dialog
66-
QProgressDialog progress("Inserting data...", "Cancel", 0, curList.size());
66+
QProgressDialog progress(tr("Inserting data..."), tr("Cancel"), 0, curList.size());
6767
progress.setWindowModality(Qt::ApplicationModal);
6868

6969
// declare local variables we will need before the rollback jump
@@ -118,7 +118,7 @@ void ImportCsvDialog::accept()
118118
rollback:
119119
progress.hide();
120120
QApplication::restoreOverrideCursor(); // restore original cursor
121-
QString error = QString("Error importing data. Message from database engine: %1").arg(pdb->lastErrorMessage);
121+
QString error = tr("Error importing data. Message from database engine: %1").arg(pdb->lastErrorMessage);
122122
QMessageBox::warning(this, QApplication::applicationName(), error);
123123
pdb->executeSQL("ROLLBACK TO SAVEPOINT CSVIMPORT;", false);
124124
}
@@ -187,5 +187,5 @@ char ImportCsvDialog::currentQuoteChar()
187187

188188
char ImportCsvDialog::currentSeparatorChar()
189189
{
190-
return ui->comboSeparator->currentText() == "Tab" ? '\t' : ui->comboSeparator->currentText().at(0).toAscii();
190+
return ui->comboSeparator->currentText() == tr("Tab") ? '\t' : ui->comboSeparator->currentText().at(0).toAscii();
191191
}

0 commit comments

Comments
 (0)