Replace some more instances of concatenated strings which cannot be t…

…ranslated correctly.
MythTV · Jun 6, 2012 · 7d9bb76 · 7d9bb76
1 parent 59703a7
commit 7d9bb76
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/mythtv/libs/libmyth/storagegroupeditor.cpp b/mythtv/libs/libmyth/storagegroupeditor.cpp
@@ -302,11 +302,11 @@ void StorageGroupListEditor::doDelete(void)
     {
         if (name == "Default")
         {
-            message.append("\n" + tr("(from remote hosts)"));
+            message = tr("Delete '%1' Storage Group?\n(from remote hosts)").arg(dispGroup);
         }
         else
         {
-            message.append("\n" + tr("(from all hosts"));
+            message = tr("Delete '%1' Storage Group?\n(from all hosts)").arg(dispGroup);
         }
     }
 

diff --git a/mythtv/libs/libmythmetadata/videoscan.cpp b/mythtv/libs/libmythmetadata/videoscan.cpp
@@ -470,12 +470,10 @@ void VideoScanner::finishedScan()
     QStringList failedHosts = m_scanThread->GetOfflineSGHosts();
     if (failedHosts.size() > 0)
     {
-        QString msg = tr("Failed to Scan SG Video Hosts") + ":\n\n";
-
-        for (int i = 0; i < failedHosts.size(); ++i)
-            msg += " " + failedHosts.at(i);
-
-        msg += "\n" + tr("If they no longer exist please remove them") + "\n\n";
+        QString hosts = failedHosts.join(" ");
+        QString msg = tr("Failed to Scan SG Video Hosts:\n\n%1\n\n"
+                         "If they no longer exist please remove them")
+                        .arg(hosts);
 
         ShowOkPopup(msg);
     }

diff --git a/mythtv/programs/mythwelcome/welcomedialog.cpp b/mythtv/programs/mythwelcome/welcomedialog.cpp
@@ -362,9 +362,9 @@ void WelcomeDialog::updateScreen(void)
                 if (!tuner.subtitle.isEmpty())
                     status += "\n("+tuner.subtitle+")";
                 status += "\n" +
-                    tuner.startTime.toLocalTime().toString(m_timeFormat) +
-                    " " + tr("to") + " " +
-                    tuner.endTime.toLocalTime().toString(m_timeFormat);
+                    QObject::tr("%1 to %2", "Time period, 'starttime to endtime'")
+                      .arg(MythDate::toString(tuner.startTime, MythDate::kTime))
+                      .arg(MythDate::toString(tuner.endTime, MythDate::kTime));
             }
             else
             {