mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-23 08:29:07 +03:00
Code Activity

Russian translation has been fixed

Browse Source 
# Conflicts:
#	translations/limereport_ru.ts
This commit is contained in:
Arin Alexander
2017-06-28 17:00:58 +03:00
parent 67d263ed4f 1354c4a253
commit 36df242787
10 changed files with 108 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/bands/lrgroupbands.cpp
View File

@@ -155,7 +155,7 @@ bool GroupBandHeader::isNeedToClose(DataSourceManager* dataManager)
return ds->data(m_groupFiledName)!=m_groupFieldValue;
}
} else {
dataManager->putError(tr("Datasource \"%1\" not found !!!").arg(datasourceName));
dataManager->putError(tr("Datasource \"%1\" not found!").arg(datasourceName));
}
}

2
limereport/databrowser/lrconnectiondialog.cpp
View File

@@ -95,7 +95,7 @@ void ConnectionDialog::checkFieldsFill()
{
if (ui->leConnectionName->text().isEmpty()){throw LimeReport::ReportError(tr("Connection Name is empty"));}
if (!m_changeMode&&QSqlDatabase::connectionNames().contains(ui->leConnectionName->text())) {
throw LimeReport::ReportError(tr("Connection with name ")+ui->leConnectionName->text()+tr(" already exists "));
throw LimeReport::ReportError(tr("Connection with name ")+ui->leConnectionName->text()+tr(" already exists! "));
}
}

6
limereport/databrowser/lrdatabrowser.cpp
View File

@@ -131,7 +131,7 @@ void DataBrowser::slotDeleteConnection()
QMessageBox::critical(
this,
tr("Attention"),
tr("Do you really want to delete \"%1\" connection ?").arg(getConnectionName(NameForUser)),
tr("Do you really want to delete \"%1\" connection?").arg(getConnectionName(NameForUser)),
QMessageBox::Ok|QMessageBox::No,
QMessageBox::No
) == QMessageBox::Ok
@@ -395,7 +395,7 @@ void DataBrowser::slotDeleteDatasource()
QMessageBox::critical(
this,
tr("Attention"),
tr("Do you really want to delete \"%1\" datasource ?").arg(datasourceName),
tr("Do you really want to delete \"%1\" datasource?").arg(datasourceName),
QMessageBox::Ok|QMessageBox::No,
QMessageBox::No
) == QMessageBox::Ok
@@ -766,7 +766,7 @@ void DataBrowser::on_deleteVariable_clicked()
{
QString varName = getVariable();
if (!varName.isEmpty()){
if (QMessageBox::critical(this,tr("Attention"),QString(tr("Do you really want to delete variable \"%1\" ?")).arg(varName),
if (QMessageBox::critical(this,tr("Attention"),QString(tr("Do you really want to delete variable \"%1\"?")).arg(varName),
QMessageBox::Ok|QMessageBox::Cancel, QMessageBox::Cancel
)==QMessageBox::Ok){
m_report->dataManager()->deleteVariable(varName);

6
limereport/databrowser/lrsqleditdialog.cpp
View File

@@ -147,11 +147,11 @@ void SQLEditDialog::hideEvent(QHideEvent *)
void SQLEditDialog::check()
{
if (ui->leDatasourceName->text().isEmpty()) throw LimeReport::ReportError(tr("Datasource Name is empty !"));
if (ui->textEditSQL->toPlainText().isEmpty() && (!ui->rbProxy) ) throw LimeReport::ReportError(tr("SQL is empty !"));
if (ui->leDatasourceName->text().isEmpty()) throw LimeReport::ReportError(tr("Datasource Name is empty!"));
if (ui->textEditSQL->toPlainText().isEmpty() && (!ui->rbProxy) ) throw LimeReport::ReportError(tr("SQL is empty!"));
if (m_dialogMode==AddMode){
if (m_datasources->containsDatasource(ui->leDatasourceName->text())){
throw LimeReport::ReportError(QString(tr("Datasource with name: \"%1\" already exists !")).arg(ui->leDatasourceName->text()));
throw LimeReport::ReportError(QString(tr("Datasource with name: \"%1\" already exists!")).arg(ui->leDatasourceName->text()));
}
}
}

2
limereport/items/lrtextitem.cpp
View File

@@ -587,7 +587,7 @@ void TextItem::setFollowTo(const QString &followTo)
QMessageBox::critical(
0,
tr("Error"),
tr("TextItem \" %1 \" not found !")
tr("TextItem \" %1 \" not found!")
.arg(m_followTo)
);
notify("followTo",followTo,"");

2
limereport/lrdatadesignintf.cpp
View File

@@ -421,7 +421,7 @@ void SubQueryHolder::setMasterDatasource(const QString &value)
void SubQueryHolder::extractParams()
{
if (!dataManager()->containsDatasource(m_masterDatasource)){
setLastError(QObject::tr("Master datasource \"%1\" not found!!!").arg(m_masterDatasource));
setLastError(QObject::tr("Master datasource \"%1\" not found!").arg(m_masterDatasource));
setPrepared(false);
} else {
m_preparedSQL = replaceFields(replaceVariables(queryText()));

14
limereport/lrdatasourcemanager.cpp
View File

@@ -584,7 +584,7 @@ QList<ConnectionDesc *>& DataSourceManager::conections()
bool DataSourceManager::dataSourceIsValid(const QString &name)
{
if (m_datasources.value(name.toLower())) return !m_datasources.value(name.toLower())->isInvalid();
else throw ReportError(tr("Datasource \"%1\" not found !").arg(name));
else throw ReportError(tr("Datasource \"%1\" not found!").arg(name));
}
bool DataSourceManager::isQuery(const QString &dataSourceName)
@@ -664,7 +664,7 @@ void DataSourceManager::addConnectionDesc(ConnectionDesc * connection)
}
}
} else {
throw ReportError(tr("connection with name \"%1\" already exists !").arg(connection->name()));
throw ReportError(tr("Connection with name \"%1\" already exists!").arg(connection->name()));
}
}
@@ -689,7 +689,7 @@ void DataSourceManager::putHolder(const QString& name, IDataSourceHolder *dataSo
name.toLower(),
dataSource
);
} else throw ReportError(tr("datasource with name \"%1\" already exists !").arg(name));
} else throw ReportError(tr("Datasource with name \"%1\" already exists!").arg(name));
}
void DataSourceManager::putQueryDesc(QueryDesc* queryDesc)
@@ -698,7 +698,7 @@ void DataSourceManager::putQueryDesc(QueryDesc* queryDesc)
m_queries.append(queryDesc);
connect(queryDesc, SIGNAL(queryTextChanged(QString,QString)),
this, SLOT(slotQueryTextChanged(QString,QString)));
} else throw ReportError(tr("datasource with name \"%1\" already exists !").arg(queryDesc->queryName()));
} else throw ReportError(tr("Datasource with name \"%1\" already exists!").arg(queryDesc->queryName()));
}
void DataSourceManager::putSubQueryDesc(SubQueryDesc *subQueryDesc)
@@ -707,14 +707,14 @@ void DataSourceManager::putSubQueryDesc(SubQueryDesc *subQueryDesc)
m_subqueries.append(subQueryDesc);
connect(subQueryDesc, SIGNAL(queryTextChanged(QString,QString)),
this, SLOT(slotQueryTextChanged(QString,QString)));
} else throw ReportError(tr("datasource with name \"%1\" already exists !").arg(subQueryDesc->queryName()));
} else throw ReportError(tr("Datasource with name \"%1\" already exists!").arg(subQueryDesc->queryName()));
}
void DataSourceManager::putProxyDesc(ProxyDesc *proxyDesc)
{
if (!containsDatasource(proxyDesc->name())){
m_proxies.append(proxyDesc);
} else throw ReportError(tr("datasource with name \"%1\" already exists !").arg(proxyDesc->name()));
} else throw ReportError(tr("Datasource with name \"%1\" already exists!").arg(proxyDesc->name()));
}
bool DataSourceManager::initAndOpenDB(QSqlDatabase& db, ConnectionDesc& connectionDesc){
@@ -946,7 +946,7 @@ IDataSource *DataSourceManager::dataSource(const QString &name)
return holder->dataSource(designTime()?IDataSource::DESIGN_MODE:IDataSource::RENDER_MODE);
}
} else {
setLastError(tr("Datasource \"%1\" not found !").arg(name));
setLastError(tr("Datasource \"%1\" not found!").arg(name));
return 0;
}
}

4
limereport/lrreportdesignwindow.cpp
View File

@@ -804,7 +804,7 @@ bool ReportDesignWindow::checkNeedToSave()
{
if (m_reportDesignWidget->isNeedToSave()){
QMessageBox::StandardButton button = QMessageBox::question(
this,"",tr("Report has been modified ! Do you want save the report ?"),
this,"",tr("Report has been modified! Do you want save the report?"),
QMessageBox::Yes|QMessageBox::No|QMessageBox::Cancel, QMessageBox::Yes
);
switch (button) {
@@ -1461,7 +1461,7 @@ bool ObjectNameValidator::validate(const QString &propName, const QVariant &prop
BaseDesignIntf* bd = dynamic_cast<BaseDesignIntf*>(object);
if (bd){
if (bd->page()->reportItemByName(propValue.toString())){
msg = QString(QObject::tr("Object with name %1 already exists").arg(propValue.toString()));
msg = QString(QObject::tr("Object with name %1 already exists!").arg(propValue.toString()));
return false;
} else (bd->emitObjectNamePropertyChanged(object->objectName(),propValue.toString()));
}

8
limereport/lrvariablesholder.cpp
View File

@@ -62,7 +62,7 @@ void VariablesHolder::addVariable(const QString& name, const QVariant& value, Va
if (type==VarDesc::Report)
m_userVariables.append(varValue);
} else {
throw ReportError(tr("variable with name ")+name+tr(" already exists !!"));
throw ReportError(tr("variable with name ")+name+tr(" already exists!"));
}
}
@@ -77,7 +77,7 @@ VarDesc::VarType VariablesHolder::variableType(const QString &name)
{
if (m_varNames.contains(name))
return m_varNames.value(name)->varType();
else throw ReportError(tr("variable with name ")+name+tr(" does not exists !!"));
else throw ReportError(tr("variable with name ")+name+tr(" does not exists!"));
}
void VariablesHolder::deleteVariable(const QString &name)
@@ -94,7 +94,7 @@ void VariablesHolder::changeVariable(const QString &name, const QVariant &value)
if(m_varNames.contains(name)) {
m_varNames.value(name)->setValue(value);
} else
throw ReportError(tr("variable with name ")+name+tr(" does not exists !!"));
throw ReportError(tr("variable with name ")+name+tr(" does not exists!"));
}
void VariablesHolder::clearUserVariables()
@@ -142,7 +142,7 @@ RenderPass VariablesHolder::variablePass(const QString &name)
{
if (m_varNames.contains(name))
return m_varNames.value(name)->renderPass();
else throw ReportError(tr("variable with name ")+name+tr(" does not exists !!"));
else throw ReportError(tr("variable with name ")+name+tr(" does not exists!"));
}
}// namespace LimeReport