Changeset 8eb215

Timestamp:

01/16/2014 11:31:04 PM (12 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Branches:

2.0.x, develop, master

Children:

b0c3c3

Parents:

0a41b86

git-author:

Calum Lind <calumlind+deluge@gmail.com> (01/16/2014 04:48:32 PM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (01/16/2014 11:31:04 PM)

Message:

Remove torrent_status translations from Daemon and move to UI clients

Location:

deluge

Files:

• core/filtermanager.py (modified) (1 diff)
• core/torrentmanager.py (modified) (4 diffs)
• main.py (modified) (1 diff)
• ui/gtkui/status_tab.py (modified) (1 diff)
• ui/web/js/deluge-all/details/StatusTab.js (modified) (1 diff)

deluge/core/filtermanager.py

@@ -112 +112 @@
         return filtered_torrent_ids
 
-    error_str = _("Error") + ":"
     # Check torrent's tracker_status for 'Error:' and return those torrent_ids
     for torrent_id in torrent_ids:
-        if error_str in tm[torrent_id].get_status(["tracker_status"])["tracker_status"]:
+        if "Error:" in tm[torrent_id].get_status(["tracker_status"])["tracker_status"]:
             filtered_torrent_ids.append(torrent_id)
     return filtered_torrent_ids

deluge/core/torrentmanager.py

@@ -973 +973 @@
 
         # Set the tracker status for the torrent
-        torrent.set_tracker_status(_("Announce OK"))
+        torrent.set_tracker_status("Announce OK")
 
         # Check to see if we got any peer information from the tracker
@@ -991 +991 @@
 
         # Set the tracker status for the torrent
-        torrent.set_tracker_status(_("Announce Sent"))
+        torrent.set_tracker_status("Announce Sent")
 
     def on_alert_tracker_warning(self, alert):
@@ -1000 +1000 @@
         except RuntimeError:
             return
-        tracker_status = '%s: %s' % (_("Warning"), decode_string(alert.message()))
+        tracker_status = 'Warning: %s' % decode_string(alert.message())
         # Set the tracker status for the torrent
         torrent.set_tracker_status(tracker_status)
@@ -1011 +1011 @@
         except RuntimeError:
             return
-        tracker_status = "%s: %s" % (_("Error"), decode_string(alert.msg))
+        tracker_status = "Error: %s" % decode_string(alert.msg)
         torrent.set_tracker_status(tracker_status)
 

deluge/main.py

@@ -141 +141 @@
 def start_daemon():
     """Entry point for daemon script"""
-    deluge.common.setup_translations()
 
     if 'dev' not in deluge.common.get_version():

deluge/ui/gtkui/status_tab.py

@@ -148 +148 @@
             status["is_auto_managed"]=_("Off")
 
+        translate_tracker_status = {
+            "Error" : _("Error"),
+            "Warning" : _("Warning"),
+            "Announce OK" : _("Announce OK"),
+            "Announce Sent" : _("Announce Sent")
+        }
+        for key, value in translate_tracker_status.iteritems():
+            if key in status["tracker_status"]:
+                status["tracker_status"] = status["tracker_status"].replace(key, value, 1)
+                log.error(status["tracker_status"])
+                break
+
         # Update all the label widgets
         for widget in self.label_widgets:

deluge/ui/web/js/deluge-all/details/StatusTab.js

@@ -116 +116 @@
         data.auto_managed = _((status.is_auto_managed) ? 'True' : 'False');
 
+        var translate_tracker_status = {
+            'Error' : _('Error'),
+            'Warning' : _('Warning'),
+            'Announce OK' : _('Announce OK'),
+            'Announce Sent' : _('Announce Sent')
+        };
+        for (var key in translate_tracker_status) {
+            if (data.tracker_status.indexOf(key) != -1) {
+                data.tracker_status = data.tracker_status.replace(key, translate_tracker_status[key]);
+                break;
+            }
+        }
+
         data.downloaded += ' (' + ((status.total_payload_download) ? fsize(status.total_payload_download) : '0.0 KiB') + ')';
         data.uploaded += ' (' + ((status.total_payload_upload) ? fsize(status.total_payload_upload): '0.0 KiB') + ')';