[UI|Core] Fix problems with file priorities

- Fixed the core not correctly settings the current file_priority
settings and added a test.
- Fixed the console not setting file priorities.
- Change the label for not downloading of a file to 'Skip'.

2 files changed, 7 insertions, 6 deletions

diff --git a/deluge/ui/web/js/deluge-all/Deluge.js b/deluge/ui/web/js/deluge-all/Deluge.js
index ce11bc5c4..31b9947cc 100644
--- a/deluge/ui/web/js/deluge-all/Deluge.js
+++ b/deluge/ui/web/js/deluge-all/Deluge.js
@@ -151,12 +151,13 @@ Ext.apply(Deluge, {
 deluge.plugins = {};
 
 // Hinting for gettext_gen.py
-// _('Ignore')
+// _('Skip')
 // _('Low')
 // _('Normal')
 // _('High')
+// _('Mixed')
 FILE_PRIORITY = {
-    0: 'Ignore',
+    0: 'Skip',
     1: 'Low',
     2: 'Low',
     3: 'Low',
@@ -165,7 +166,7 @@ FILE_PRIORITY = {
     6: 'High',
     7: 'High',
     9: 'Mixed',
-    Ignore: 0,
+    Skip: 0,
     Low: 1,
     Normal: 4,
     High: 7,
diff --git a/deluge/ui/web/js/deluge-all/Menus.js b/deluge/ui/web/js/deluge-all/Menus.js
index f84646317..529c6cc66 100644
--- a/deluge/ui/web/js/deluge-all/Menus.js
+++ b/deluge/ui/web/js/deluge-all/Menus.js
@@ -361,10 +361,10 @@ deluge.menus.filePriorities = new Ext.menu.Menu({
         },
         '-',
         {
-            id: 'ignore',
-            text: _('Ignore'),
+            id: 'skip',
+            text: _('Skip'),
             iconCls: 'icon-do-not-download',
-            filePriority: FILE_PRIORITY['Ignore'],
+            filePriority: FILE_PRIORITY['Skip'],
         },
         {
             id: 'low',