Merge pull request #7364 from brave/fix-7362

Torrent name is missing once download is started
brave · Mar 19, 2017 · 842ec25 · 842ec25
2 parents 7dab6b1 + 4cfc7e4
commit 842ec25
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/app/extensions/torrent/locales/en-US/app.properties b/app/extensions/torrent/locales/en-US/app.properties
@@ -17,5 +17,4 @@ num=#
 downloadFile=Save File
 torrentStatus=Torrent Status
 torrentLoadingInfo=Loading torrent info...
-torrentUntitled=Untitled torrent
 torrentLoadingMedia=Loading...
diff --git a/js/webtorrent/components/torrentViewer.js b/js/webtorrent/components/torrentViewer.js
@@ -14,18 +14,18 @@ class TorrentViewer extends React.Component {
   render () {
     const {torrent, torrentID, name, errorMessage, dispatch} = this.props
 
-    const l10nTitle = name
-      ? '' // No localization, just use the torrent name
-      : torrent
-      ? 'torrentLoadingInfo' // eg 'Loading torrent information...'
-      : 'torrentUntitled' // eg 'Untitled torrent'
-    const l10nStart = name ? 'startPrompt' : 'startPromptUntitled'
-
     let titleElem, mainButtonId
     if (torrent) {
-      titleElem = <div className='sectionTitle' data-l10n-id={l10nTitle}>{name}</div>
+      if (name) {
+        // No localization, just use the torrent name
+        titleElem = <div className='sectionTitle'>{name}</div>
+      } else {
+        // 'Loading torrent information...'
+        titleElem = <div className='sectionTitle' data-l10n-id='torrentLoadingInfo' />
+      }
       mainButtonId = torrent.progress < 1 ? 'downloading' : 'seeding'
     } else {
+      const l10nStart = name ? 'startPrompt' : 'startPromptUntitled'
       const l10nArgs = {name}
       titleElem = (
         <div