mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-07-17 17:17:42 +02:00
2019-12-10 Fred Gleason <fredg@paravelsystems.com>
* Fixed typos in UI strings in rdlogmanager(1)'s 'Pick Report Dates' dialog.
This commit is contained in:
parent
ac59b52ad0
commit
349efba0b5
@ -19325,3 +19325,6 @@
|
|||||||
2019-12-10 Fred Gleason <fredg@paravelsystems.com>
|
2019-12-10 Fred Gleason <fredg@paravelsystems.com>
|
||||||
* Fixed a regression in rdadmin(1) that caused controls to be
|
* Fixed a regression in rdadmin(1) that caused controls to be
|
||||||
hidden in the 'Edit Report' dialog.
|
hidden in the 'Edit Report' dialog.
|
||||||
|
2019-12-10 Fred Gleason <fredg@paravelsystems.com>
|
||||||
|
* Fixed typos in UI strings in rdlogmanager(1)'s 'Pick Report Dates'
|
||||||
|
dialog.
|
||||||
|
@ -166,7 +166,7 @@ void PickReportDates::selectEndDateData()
|
|||||||
void PickReportDates::generateData()
|
void PickReportDates::generateData()
|
||||||
{
|
{
|
||||||
if(edit_startdate_edit->date()>edit_enddate_edit->date()) {
|
if(edit_startdate_edit->date()>edit_enddate_edit->date()) {
|
||||||
QMessageBox::warning(this,tr("Invalid Date Range"),
|
QMessageBox::warning(this,"RDLogManager - "+tr("Invalid Date Range"),
|
||||||
tr("The end date cannot be earlier than the start date!"));
|
tr("The end date cannot be earlier than the start date!"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -174,14 +174,14 @@ void PickReportDates::generateData()
|
|||||||
new RDReport(edit_report_box->currentText(),rda->station(),rda->config(),this);
|
new RDReport(edit_report_box->currentText(),rda->station(),rda->config(),this);
|
||||||
if((edit_startdate_edit->date()!=edit_enddate_edit->date())&&
|
if((edit_startdate_edit->date()!=edit_enddate_edit->date())&&
|
||||||
(!RDReport::multipleDaysAllowed(report->filter()))) {
|
(!RDReport::multipleDaysAllowed(report->filter()))) {
|
||||||
QMessageBox::warning(this,tr("Invalid Date Range"),
|
QMessageBox::warning(this,"RDLogManager - "+tr("Invalid Date Range"),
|
||||||
tr("This report type cannot span multiple dates!"));
|
tr("This report type cannot span multiple dates!"));
|
||||||
delete report;
|
delete report;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if((edit_startdate_edit->date().month()!=edit_enddate_edit->date().month())&&
|
if((edit_startdate_edit->date().month()!=edit_enddate_edit->date().month())&&
|
||||||
(!RDReport::multipleMonthsAllowed(report->filter()))) {
|
(!RDReport::multipleMonthsAllowed(report->filter()))) {
|
||||||
QMessageBox::warning(this,tr("Invalid Date Range"),
|
QMessageBox::warning(this,"RDLogManager - "+tr("Invalid Date Range"),
|
||||||
tr("This report type cannot span multiple months!"));
|
tr("This report type cannot span multiple months!"));
|
||||||
delete report;
|
delete report;
|
||||||
return;
|
return;
|
||||||
@ -192,8 +192,8 @@ void PickReportDates::generateData()
|
|||||||
edit_svcname);
|
edit_svcname);
|
||||||
QFile file(filename);
|
QFile file(filename);
|
||||||
if(file.exists()) {
|
if(file.exists()) {
|
||||||
if(QMessageBox::question(this,"File Exists",
|
if(QMessageBox::question(this,"RDLogManager - "+tr("File Exists"),
|
||||||
"The report file already exists. Overwrite?",
|
tr("The report file already exists. Overwrite?"),
|
||||||
QMessageBox::Yes,QMessageBox::No)!=
|
QMessageBox::Yes,QMessageBox::No)!=
|
||||||
QMessageBox::Yes) {
|
QMessageBox::Yes) {
|
||||||
delete report;
|
delete report;
|
||||||
@ -204,19 +204,20 @@ void PickReportDates::generateData()
|
|||||||
report->generateReport(edit_startdate_edit->date(),
|
report->generateReport(edit_startdate_edit->date(),
|
||||||
edit_enddate_edit->date(),rda->station(),&out_path);
|
edit_enddate_edit->date(),rda->station(),&out_path);
|
||||||
switch(report->errorCode()) {
|
switch(report->errorCode()) {
|
||||||
case RDReport::ErrorOk:
|
case RDReport::ErrorOk:
|
||||||
QMessageBox::information(this,tr("Report Complete"),
|
QMessageBox::information(this,"RDLogManager - "+tr("Report Complete"),
|
||||||
tr("Report generated in")+" \""+out_path+
|
tr("Report generated in")+" \""+out_path+
|
||||||
"\".");
|
"\".");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case RDReport::ErrorCantOpen:
|
case RDReport::ErrorCantOpen:
|
||||||
QMessageBox::warning(this,"File Error","Unable to open report file at"+
|
QMessageBox::warning(this,"RDLogManager - "+tr("File Error"),
|
||||||
QString("\"")+out_path+"\"!");
|
tr("Unable to open report file at")+
|
||||||
break;
|
QString("\"")+out_path+"\"!");
|
||||||
|
break;
|
||||||
|
|
||||||
case RDReport::ErrorCanceled:
|
case RDReport::ErrorCanceled:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
delete report;
|
delete report;
|
||||||
}
|
}
|
||||||
|
@ -1507,6 +1507,22 @@ zprávu</translation>
|
|||||||
<source>Report generated in</source>
|
<source>Report generated in</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>File Exists</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>File Error</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Unable to open report file at</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>The report file already exists. Overwrite?</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>RenameItem</name>
|
<name>RenameItem</name>
|
||||||
|
@ -1497,6 +1497,22 @@ Report</translation>
|
|||||||
<source>Report generated in</source>
|
<source>Report generated in</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>File Exists</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>File Error</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Unable to open report file at</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>The report file already exists. Overwrite?</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>RenameItem</name>
|
<name>RenameItem</name>
|
||||||
|
@ -1510,6 +1510,22 @@ Reporte</translation>
|
|||||||
<source>Report generated in</source>
|
<source>Report generated in</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>File Exists</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>File Error</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Unable to open report file at</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>The report file already exists. Overwrite?</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>RenameItem</name>
|
<name>RenameItem</name>
|
||||||
|
@ -1324,6 +1324,22 @@ Report</source>
|
|||||||
<source>Report generated in</source>
|
<source>Report generated in</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>File Exists</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>File Error</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Unable to open report file at</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>The report file already exists. Overwrite?</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>RenameItem</name>
|
<name>RenameItem</name>
|
||||||
|
@ -1500,6 +1500,22 @@ rapport</translation>
|
|||||||
<source>Report generated in</source>
|
<source>Report generated in</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>File Exists</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>File Error</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Unable to open report file at</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>The report file already exists. Overwrite?</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>RenameItem</name>
|
<name>RenameItem</name>
|
||||||
|
@ -1500,6 +1500,22 @@ rapport</translation>
|
|||||||
<source>Report generated in</source>
|
<source>Report generated in</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>File Exists</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>File Error</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Unable to open report file at</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>The report file already exists. Overwrite?</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>RenameItem</name>
|
<name>RenameItem</name>
|
||||||
|
@ -1501,6 +1501,22 @@ Relatório</translation>
|
|||||||
<source>Report generated in</source>
|
<source>Report generated in</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>File Exists</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>File Error</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>Unable to open report file at</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>The report file already exists. Overwrite?</source>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>RenameItem</name>
|
<name>RenameItem</name>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user