Permalink
Browse files

Fix an incomplete error message and context changes.

This fix an incomplete error message and changes the translation
context of some strings while we are there...
  • Loading branch information...
nriendeau committed Jul 4, 2012
1 parent c46be30 commit 1a56a47bb849693138326a5d8a8af8699a569c58
@@ -175,7 +175,7 @@ void ChannelScanner::Scan(
}
else
{
InformUser(QObject::tr("Error tuning to transport"));
InformUser(tr("Error tuning to transport"));
Teardown();
}
}
@@ -208,7 +208,7 @@ void ChannelScanner::Scan(
}
else
{
InformUser(QObject::tr("Error tuning to transport"));
InformUser(tr("Error tuning to transport"));
Teardown();
}
}
@@ -230,8 +230,8 @@ void ChannelScanner::Scan(
if (!ok)
{
LOG(VB_GENERAL, LOG_ERR, LOC + "Failed to handle tune complete.");
InformUser(QObject::tr("Programmer Error: "
"Failed to handle tune complete."));
InformUser(tr("Programmer Error: "
"Failed to handle tune complete."));
}
}
@@ -263,10 +263,10 @@ DTVConfParser::return_t ChannelScanner::ImportDVBUtils(
if (DTVConfParser::OK != ret)
{
QString msg = (DTVConfParser::ERROR_PARSE == ret) ?
QObject::tr("Failed to parse '%1'") :
QString(tr("Failed to parse '%1'")).arg(file) :
((DTVConfParser::ERROR_CARDTYPE == ret) ?
QString("Programmer Error : incorrect card type") :
QObject::tr("Failed to open '%1'"));
tr("Programmer Error : incorrect card type") :
QString(tr("Failed to open '%1'")).arg(file));
InformUser(msg);
}
@@ -293,7 +293,7 @@ bool ChannelScanner::ImportM3U(
#endif // USING_IPTV
if (!ok)
InformUser(QObject::tr("Error starting scan"));
InformUser(tr("Error starting scan"));
return ok;
}
@@ -314,7 +314,7 @@ void ChannelScanner::PreScanCommon(
if (device.isEmpty())
{
LOG(VB_GENERAL, LOG_ERR, LOC + "No Device");
InformUser(QObject::tr("Programmer Error: No Device"));
InformUser(tr("Programmer Error: No Device"));
return;
}
@@ -374,7 +374,7 @@ void ChannelScanner::PreScanCommon(
if (!channel)
{
LOG(VB_GENERAL, LOG_ERR, LOC + "Channel not created");
InformUser(QObject::tr("Programmer Error: Channel not created"));
InformUser(tr("Programmer Error: Channel not created"));
return;
}
@@ -385,7 +385,7 @@ void ChannelScanner::PreScanCommon(
if (!channel->Open())
{
LOG(VB_GENERAL, LOG_ERR, LOC + "Channel could not be opened");
InformUser(QObject::tr("Channel could not be opened."));
InformUser(tr("Channel could not be opened."));
return;
}
@@ -30,6 +30,9 @@
#ifndef _CHANNEL_SCANNER_H_
#define _CHANNEL_SCANNER_H_
// Qt headers
#include <QCoreApplication>
// MythTV headers
#include "mythtvexp.h"
#include "dtvconfparser.h"
@@ -47,6 +50,8 @@ class ChannelBase;
class MTV_PUBLIC ChannelScanner
{
Q_DECLARE_TR_FUNCTIONS(ChannelScanner)
friend class ScanMonitor;
public:

0 comments on commit 1a56a47

Please sign in to comment.