diff --git a/bower.json b/bower.json index f9c058c8..4ae4be92 100644 --- a/bower.json +++ b/bower.json @@ -15,14 +15,14 @@ "jquery.terminal": "~0.8.8", "stf-site": "~0.4.1", "stf-analytics": "~0.2.2", - "angular-gettext": "~0.4.0", + "angular-gettext": "~1.0.0", "angular-ui-ace": "~0.1.1", "ui-bootstrap-alerts": "~0.1.5", "requirejs": "~2.1.14", "stf-graphics": "~0.1.1", "angular-bootstrap": "~0.11.0", - "angular-dialog-service": "~5.0.0", - "ng-file-upload": "~1.6.1", + "angular-dialog-service": "~5.1.1", + "ng-file-upload": "~1.6.5", "angular-growl-v2": "JanStevens/angular-growl-2#~0.6.1", "bluebird": "~2.1.3", "angular-tree-control": "~0.2.2", @@ -35,16 +35,16 @@ "draggabilly": "~1.1.0", "angular-elastic": "~2.3.4", "quick-ng-repeat": "~0.0.1", - "angular-vs-repeat": "~1.0.0-rc3", + "angular-vs-repeat": "~1.0.0-rc5", "checklist-model": "~0.1.3", - "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.4.0", + "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.4.2", "angular-borderlayout": "https://github.com/filearts/angular-borderlayout.git", "angular-ui-bootstrap": "~0.11.0" }, "private": true, "resolutions": { - "angular": "~1.3.0-beta.16", - "angular-sanitize": "~1.3.0-beta.16", + "angular": "~1.3.0-beta.17", + "angular-sanitize": "~1.3.0-beta.17", "bootstrap": "~3.2.0" } } diff --git a/res/app/control-panes/dashboard/upload/upload.jade b/res/app/control-panes/dashboard/upload/upload.jade index e4fcb6ac..574df395 100644 --- a/res/app/control-panes/dashboard/upload/upload.jade +++ b/res/app/control-panes/dashboard/upload/upload.jade @@ -22,7 +22,7 @@ tooltip='{{ "Upload From Link" | translate }}', ng-disabled='!remoteUrl') i.fa.fa-upload - .drop-area(ng-file-drop='installFile($files)').file-input.btn-file + .drop-area(ng-file-drop='installFile($files)', ng-file-drag-over-class='dragover').file-input.btn-file input(type='file', ng-file-select='installFile($files)') i.fa.fa-2x.fa-download.drop-area-icon diff --git a/res/app/settings/language/language-service.js b/res/app/settings/language/language-service.js index 933969eb..27587097 100644 --- a/res/app/settings/language/language-service.js +++ b/res/app/settings/language/language-service.js @@ -36,7 +36,7 @@ module.exports = function LanguageServiceFactory( ) function updateLanguage() { - gettextCatalog.currentLanguage = LanguageService.selectedLanguage + gettextCatalog.setCurrentLanguage(LanguageService.selectedLanguage) } LanguageService.updateLanguage = updateLanguage diff --git a/res/common/lang/po/stf.pot b/res/common/lang/po/stf.pot index 8d3962aa..2632d266 100644 --- a/res/common/lang/po/stf.pot +++ b/res/common/lang/po/stf.pot @@ -133,6 +133,10 @@ msgstr "" msgid "Busy" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list-stats.html +msgid "Busy devices" +msgstr "" + #: /Users/a12907/STF/stf/tmp/html/app/control-panes/info/info.html msgid "CPU" msgstr "" @@ -1038,6 +1042,10 @@ msgstr "" msgid "Toggle Web/Native" msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list-stats.html +msgid "Total devices" +msgstr "" + #: /Users/a12907/STF/stf/tmp/html/app/components/stf/common-ui/modals/fatal-message/fatal-message.html msgid "Try to reconnect" msgstr "" @@ -1094,6 +1102,10 @@ msgstr "" msgid "Uploading..." msgstr "" +#: /Users/a12907/STF/stf/tmp/html/app/device-list/device-list-stats.html +msgid "Usable devices" +msgstr "" + #: /Users/a12907/STF/stf/tmp/html/app/control-panes/advanced/usb/usb.html msgid "Usb speed" msgstr ""