From 701f3d6054e43e958bdc307534a1f2f553c79fee Mon Sep 17 00:00:00 2001 From: Vladimir Svyatski Date: Tue, 27 Jun 2017 12:49:41 +0300 Subject: [PATCH 1/2] :bug: Add proper plural processing in CSV importer (found issues during localization) --- src/gui/csvImport/CsvParserModel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/csvImport/CsvParserModel.cpp b/src/gui/csvImport/CsvParserModel.cpp index d4af2b785..c4c02cddb 100644 --- a/src/gui/csvImport/CsvParserModel.cpp +++ b/src/gui/csvImport/CsvParserModel.cpp @@ -31,9 +31,9 @@ void CsvParserModel::setFilename(const QString& filename) { } QString CsvParserModel::getFileInfo(){ - QString a(QString::number(getFileSize()).append(tr(" byte, "))); - a.append(QString::number(getCsvRows())).append(tr(" rows, ")); - a.append(QString::number(qMax(0, getCsvCols()-1))).append(tr(" columns")); + QString a(tr("%n byte(s), ", Q_NULLPTR, getFileSize())); + a.append(tr("%n row(s), ", Q_NULLPTR, getCsvRows())); + a.append(tr("%n column(s)", Q_NULLPTR, qMax(0, getCsvCols() - 1))); return a; } From a42ac00d3c91c1c7f59b12634adc738c46bfb92e Mon Sep 17 00:00:00 2001 From: Vladimir Svyatski Date: Tue, 27 Jun 2017 14:39:58 +0300 Subject: [PATCH 2/2] Requested code changes --- src/gui/csvImport/CsvParserModel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/csvImport/CsvParserModel.cpp b/src/gui/csvImport/CsvParserModel.cpp index c4c02cddb..29f389df2 100644 --- a/src/gui/csvImport/CsvParserModel.cpp +++ b/src/gui/csvImport/CsvParserModel.cpp @@ -31,9 +31,9 @@ void CsvParserModel::setFilename(const QString& filename) { } QString CsvParserModel::getFileInfo(){ - QString a(tr("%n byte(s), ", Q_NULLPTR, getFileSize())); - a.append(tr("%n row(s), ", Q_NULLPTR, getCsvRows())); - a.append(tr("%n column(s)", Q_NULLPTR, qMax(0, getCsvCols() - 1))); + QString a(tr("%n byte(s), ", nullptr, getFileSize())); + a.append(tr("%n row(s), ", nullptr, getCsvRows())); + a.append(tr("%n column(s)", nullptr, qMax(0, getCsvCols() - 1))); return a; }