q3aql/webui-aria2
q3aql/webui-aria2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added translation for more alerts

Browse Source
This commit is contained in:
hamza zia 2016-05-02 10:35:47 +08:00
parent 8d0019051f
commit c4b4dd4d50
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/services/rpc/rpc.js
View File

@ -5,8 +5,8 @@ angular
]) ])
.factory('$rpc', [ .factory('$rpc', [
'$syscall', '$globalTimeout', '$alerts', '$utils', '$syscall', '$globalTimeout', '$alerts', '$utils',
'$rootScope', '$location', '$authconf', '$rootScope', '$location', '$authconf', '$filter',
function(syscall, globalTimeout, alerts, utils, rootScope, uri, authconf) { function(syscall, globalTimeout, alerts, utils, rootScope, uri, authconf, filter) {
var subscriptions = [] var subscriptions = []
, configurations = [authconf] , configurations = [authconf]
@ -102,11 +102,13 @@ function(syscall, globalTimeout, alerts, utils, rootScope, uri, authconf) {
// If some proposed configurations are still in the pipeline then retry // If some proposed configurations are still in the pipeline then retry
if (configurations.length) { if (configurations.length) {
alerts.log("The last connection attempt was unsuccessful. Trying another configuration"); alerts.log(filter('translate')("The last connection attempt was unsuccessful. Trying another configuration"));
timeout = setTimeout(update, 0); timeout = setTimeout(update, 0);
} }
else { else {
alerts.addAlert('<strong>Oh Snap!</strong> Could not connect to the aria2 RPC server. Will retry in 10 secs. You might want to check the connection settings by going to Settings > Connection Settings', 'error'); alerts.addAlert('<strong>' + filter('translate')('Oh Snap!') + '</strong> ' +
filter('translate')('Could not connect to the aria2 RPC server. Will retry in 10 secs. You might want to check the connection settings by going to Settings > Connection Settings')
, 'error')
timeout = setTimeout(update, globalTimeout); timeout = setTimeout(update, globalTimeout);
} }
}; };
@ -129,9 +131,9 @@ function(syscall, globalTimeout, alerts, utils, rootScope, uri, authconf) {
// configuration worked, save it in cookie for next time and // configuration worked, save it in cookie for next time and
// delete the pipelined configurations!! // delete the pipelined configurations!!
if (currentToken) if (currentToken)
alerts.addAlert('Successfully connected to Aria2 through its remote RPC …', 'success'); alerts.addAlert(filter('translate')('Successfully connected to Aria2 through its remote RPC …'), 'success');
else else
alerts.addAlert('Successfully connected to Aria2 through remote RPC, however the connection is still insecure. For complete security try adding an authorization secret token while starting Aria2 (through the flag --rpc-secret)'); alerts.addAlert(filter('translate')('Successfully connected to Aria2 through remote RPC, however the connection is still insecure. For complete security try adding an authorization secret token while starting Aria2 (through the flag --rpc-secret)'));
configurations = []; configurations = [];
} }
@ -180,7 +182,7 @@ function(syscall, globalTimeout, alerts, utils, rootScope, uri, authconf) {
// each one will be tried one after the other till success, // each one will be tried one after the other till success,
// for all options for one conf read rpc/syscall.js // for all options for one conf read rpc/syscall.js
configure: function(conf) { configure: function(conf) {
alerts.addAlert('Trying to connect to aria2 using the new connection configuration', 'info'); alerts.addAlert(filter('translate')('Trying to connect to aria2 using the new connection configuration'), 'info');
if (conf instanceof Array) if (conf instanceof Array)
configurations = conf; configurations = conf;

9
js/translate/en_US.js
View File

@ -133,5 +133,12 @@ translations.en_US = {
'Download GID':'Download GID', 'Download GID':'Download GID',
'Number of Pieces':'Number of Pieces', 'Number of Pieces':'Number of Pieces',
'Piece Length': 'Piece Length', 'Piece Length': 'Piece Length',
'Shutdown Server': 'Shutdown Server' 'Shutdown Server': 'Shutdown Server',
'The last connection attempt was unsuccessful. Trying another configuration': 'The last connection attempt was unsuccessful. Trying another configuration',
'Oh Snap!': 'Oh Snap!',
'Could not connect to the aria2 RPC server. Will retry in 10 secs. You might want to check the connection settings by going to Settings > Connection Settings': 'Could not connect to the aria2 RPC server. Will retry in 10 secs. You might want to check the connection settings by going to Settings > Connection Settings',
'Successfully connected to Aria2 through its remote RPC …': 'Successfully connected to Aria2 through its remote RPC …',
'Successfully connected to Aria2 through remote RPC, however the connection is still insecure. For complete security try adding an authorization secret token while starting Aria2 (through the flag --rpc-secret)': 'Successfully connected to Aria2 through remote RPC, however the connection is still insecure. For complete security try adding an authorization secret token while starting Aria2 (through the flag --rpc-secret)',
'Trying to connect to aria2 using the new connection configuration': 'Trying to connect to aria2 using the new connection configuration',
}; };