diff options
Diffstat (limited to 'pyload/web')
| -rw-r--r-- | pyload/web/app/scripts/helpers/gettext.js | 2 | ||||
| -rw-r--r-- | pyload/web/app/scripts/utils/apitypes.js | 2 | ||||
| -rw-r--r-- | pyload/web/app/templates/default/header/layout.html | 3 | ||||
| -rw-r--r-- | pyload/web/bower.json | 2 | ||||
| -rw-r--r-- | pyload/web/pyload_app.py | 1 |
5 files changed, 6 insertions, 4 deletions
diff --git a/pyload/web/app/scripts/helpers/gettext.js b/pyload/web/app/scripts/helpers/gettext.js index d73b5e378..8a3fea5ed 100644 --- a/pyload/web/app/scripts/helpers/gettext.js +++ b/pyload/web/app/scripts/helpers/gettext.js @@ -1,4 +1,4 @@ -require(['underscore', 'handlebars', 'utils/i18n'], function(_, Handlebars, i18n) { +define(['underscore', 'handlebars', 'utils/i18n'], function(_, Handlebars, i18n) { 'use strict'; // These methods binds additional content directly to translated message function ngettext(single, plural, n) { diff --git a/pyload/web/app/scripts/utils/apitypes.js b/pyload/web/app/scripts/utils/apitypes.js index 23d87def0..cb094a05b 100644 --- a/pyload/web/app/scripts/utils/apitypes.js +++ b/pyload/web/app/scripts/utils/apitypes.js @@ -4,7 +4,7 @@ define([], function() { 'use strict'; return { DownloadState: {'Failed': 3, 'All': 0, 'Unmanaged': 4, 'Finished': 1, 'Unfinished': 2}, - DownloadStatus: {'Downloading': 10, 'NA': 0, 'Processing': 14, 'Waiting': 9, 'Decrypting': 13, 'Paused': 4, 'Failed': 7, 'Finished': 5, 'Skipped': 6, 'Unknown': 16, 'Aborted': 12, 'Online': 2, 'TempOffline': 11, 'Offline': 1, 'Custom': 15, 'Starting': 8, 'Queued': 3}, + DownloadStatus: {'NotPossible': 13, 'Downloading': 10, 'NA': 0, 'Processing': 15, 'Waiting': 9, 'Decrypting': 14, 'Paused': 4, 'Failed': 7, 'Finished': 5, 'Skipped': 6, 'Unknown': 17, 'Aborted': 12, 'Online': 2, 'TempOffline': 11, 'Offline': 1, 'Custom': 16, 'Starting': 8, 'Queued': 3}, FileStatus: {'Remote': 2, 'Ok': 0, 'Missing': 1}, InputType: {'PluginList': 13, 'Multiple': 11, 'Int': 2, 'NA': 0, 'Time': 7, 'List': 12, 'Bool': 8, 'File': 3, 'Text': 1, 'Table': 14, 'Folder': 4, 'Password': 6, 'Click': 9, 'Select': 10, 'Textbox': 5}, Interaction: {'Captcha': 2, 'All': 0, 'Query': 4, 'Notification': 1}, diff --git a/pyload/web/app/templates/default/header/layout.html b/pyload/web/app/templates/default/header/layout.html index 30df742fa..2f073117d 100644 --- a/pyload/web/app/templates/default/header/layout.html +++ b/pyload/web/app/templates/default/header/layout.html @@ -10,7 +10,8 @@ <div class="arrow"></div> <div class="popover-inner"> <h3 class="popover-title"> - {{_ "Running..."}} + <!-- TODO: the first i18n underscore is not registered as helper --> + {{ gettext "Running..."}} <button type="button" class="close" aria-hidden="true">×</button> </h3> <div class="popover-content"> diff --git a/pyload/web/bower.json b/pyload/web/bower.json index 4da3634a0..b429a5bd4 100644 --- a/pyload/web/bower.json +++ b/pyload/web/bower.json @@ -14,7 +14,7 @@ "underscore": "~1.5.1", "backbone": "~1.0.0", "backbone.marionette": "~1.1.0", - "handlebars.js": "1.0.0-rc.3", + "handlebars.js": "1.0.12", "jed": "~0.5.4", "select2": "~3.4.0", "momentjs": "~2.1.0" diff --git a/pyload/web/pyload_app.py b/pyload/web/pyload_app.py index 1c89e2ada..50d9b9731 100644 --- a/pyload/web/pyload_app.py +++ b/pyload/web/pyload_app.py @@ -43,6 +43,7 @@ def serve_icon(path): @route("/download/:fid") @login_required('Download') def download(fid, api): + # TODO: check owner ship path, name = api.getFilePath(fid) return static_file(name, path, download=True) |