diff --git a/static/resources/js/components/details/retrieve-projects.directive.js b/static/resources/js/components/details/retrieve-projects.directive.js index 8dee4933c..6d49b1de2 100644 --- a/static/resources/js/components/details/retrieve-projects.directive.js +++ b/static/resources/js/components/details/retrieve-projects.directive.js @@ -79,7 +79,7 @@ function getProjectFailed(response) { $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_get_project')); + $scope.$emit('modalMessage', $filter('tr')('failed_to_get_project')); $scope.$emit('raiseError', true); console.log('Failed to list projects:' + response); } @@ -110,7 +110,7 @@ vm.isProjectMember = false; $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_get_project_member')); + $scope.$emit('modalMessage', $filter('tr')('failed_to_get_project_member')); $scope.$emit('raiseError', true); console.log('Current user has no member for the project:' + status + ', location.url:' + $location.url()); diff --git a/static/resources/js/components/log/list-log.directive.js b/static/resources/js/components/log/list-log.directive.js index c9fcb3103..3707d1c6e 100644 --- a/static/resources/js/components/log/list-log.directive.js +++ b/static/resources/js/components/log/list-log.directive.js @@ -84,9 +84,9 @@ } function listLogFailed(response){ $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_get_log') + response); + $scope.$emit('modalMessage', $filter('tr')('failed_to_get_log') + response); $scope.$emit('raiseError', true); - console.log('Failed get log:' + response); + console.log('Failed to get log:' + response); } function toUTCSeconds(date, hour, min, sec) { diff --git a/static/resources/js/components/project-member/list-project-member.directive.js b/static/resources/js/components/project-member/list-project-member.directive.js index 6a0788faa..e8be0a7d5 100644 --- a/static/resources/js/components/project-member/list-project-member.directive.js +++ b/static/resources/js/components/project-member/list-project-member.directive.js @@ -75,11 +75,11 @@ } function getProjectMemberFailed(response) { - console.log('Failed get project members:' + response); + console.log('Failed to get project members:' + response); vm.projectMembers = []; $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_get_project_member')); + $scope.$emit('modalMessage', $filter('tr')('failed_to_get_project_member')); $scope.$emit('raiseError', true); $location.url('repositories').search('project_id', vm.projectId); diff --git a/static/resources/js/components/project/publicity-button.directive.js b/static/resources/js/components/project/publicity-button.directive.js index ebbea0eff..5d86eb0f1 100644 --- a/static/resources/js/components/project/publicity-button.directive.js +++ b/static/resources/js/components/project/publicity-button.directive.js @@ -36,7 +36,7 @@ } function toggleProjectPublicityFailed(e) { - console.log('Failed toggle project publicity:' + e); + console.log('Failed to toggle project publicity:' + e); } } diff --git a/static/resources/js/components/replication/create-policy.directive.js b/static/resources/js/components/replication/create-policy.directive.js index 1506182f6..2c776ee41 100644 --- a/static/resources/js/components/replication/create-policy.directive.js +++ b/static/resources/js/components/replication/create-policy.directive.js @@ -211,7 +211,7 @@ } function listDestinationFailed(data, status) { vm.errorMessages.push($filter('tr')('failed_get_destination')); - console.log('Failed get destination:' + data); + console.log('Failed to get destination:' + data); } function listDestinationPolicySuccess(data, status) { @@ -229,7 +229,7 @@ function listDestinationPolicyFailed(data, status) { vm.errorMessages.push($filter('tr')('failed_get_destination_policies')); - console.log('Failed list destination policy:' + data); + console.log('Failed to list destination policy:' + data); } function listReplicationPolicySuccess(data, status) { @@ -253,8 +253,8 @@ vm.checkDestinationPolicyStatus(); } function listReplicationPolicyFailed(data, status) { - vm.errorMessages.push($filter('tr')('failed_get_replication_policy') + data); - console.log('Failed list replication policy:' + data); + vm.errorMessages.push($filter('tr')('failed_to_get_replication_policy') + data); + console.log('Failed to list replication policy:' + data); } function createReplicationPolicySuccess(data, status) { vm.saveTIP = false; @@ -266,9 +266,9 @@ if(status === 409) { vm.errorMessages.push($filter('tr')('policy_already_exists')); }else{ - vm.errorMessages.push($filter('tr')('failed_create_replication_policy') + data); + vm.errorMessages.push($filter('tr')('failed_to_create_replication_policy') + data); } - console.log('Failed create replication policy.'); + console.log('Failed to create replication policy.'); } function updateReplicationPolicySuccess(data, status) { console.log('Successful update replication policy.'); @@ -280,9 +280,9 @@ if(status === 409) { vm.errorMessages.push($filter('tr')('policy_already_exists')); }else{ - vm.errorMessages.push($filter('tr')('failed_update_replication_policy') + data); + vm.errorMessages.push($filter('tr')('failed_to_update_replication_policy') + data); } - console.log('Failed update replication policy.'); + console.log('Failed to update replication policy.'); } function createDestinationSuccess(data, status, headers) { var content = headers('Location'); @@ -291,8 +291,8 @@ saveOrUpdatePolicy(); } function createDestinationFailed(data, status) { - vm.errorMessages.push($filter('tr')('failed_create_destination') + data); - console.log('Failed create destination.'); + vm.errorMessages.push($filter('tr')('failed_to_create_destination') + data); + console.log('Failed to create destination.'); } function updateDestinationSuccess(data, status) { console.log('Successful update destination.'); @@ -300,9 +300,9 @@ saveOrUpdatePolicy(); } function updateDestinationFailed(data, status) { - vm.errorMessages.push($filter('tr')('failed_update_destination') + data); + vm.errorMessages.push($filter('tr')('failed_to_update_destination') + data); $scope.$broadcast('showDialog', true); - console.log('Failed update destination.'); + console.log('Failed to update destination.'); } function pingDestinationSuccess(data, status) { vm.pingAvailable = true; @@ -311,7 +311,7 @@ } function pingDestinationFailed(data, status) { vm.pingAvailable = true; - vm.pingMessage = $filter('tr')('failed_ping_target', []) + (data && data.length > 0 ? ':' + data : '.'); + vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + (data && data.length > 0 ? ':' + data : '.'); vm.pingTIP = false; } } diff --git a/static/resources/js/components/replication/list-replication.directive.js b/static/resources/js/components/replication/list-replication.directive.js index aef99350c..6f1185755 100644 --- a/static/resources/js/components/replication/list-replication.directive.js +++ b/static/resources/js/components/replication/list-replication.directive.js @@ -97,7 +97,7 @@ } function listReplicationPolicyFailed(data, status) { - console.log('Failed list replication policy:' + data); + console.log('Failed to list replication policy:' + data); } function listReplicationJobSuccess(data, status) { @@ -119,7 +119,7 @@ } function listReplicationJobFailed(data, status) { - console.log('Failed list replication job:' + data); + console.log('Failed to list replication job:' + data); vm.searchJobTIP = false; vm.refreshJobTIP = false; } @@ -149,7 +149,7 @@ } function toggleReplicationPolicyFailed(data, status) { - console.log('Failed toggle replication policy.'); + console.log('Failed to toggle replication policy.'); } function downloadLog(policyId) { diff --git a/static/resources/js/components/repository/list-repository.directive.js b/static/resources/js/components/repository/list-repository.directive.js index 5335f46d1..1c6297044 100644 --- a/static/resources/js/components/repository/list-repository.directive.js +++ b/static/resources/js/components/repository/list-repository.directive.js @@ -78,7 +78,7 @@ } function getRepositoryFailed(response) { - console.log('Failed list repositories:' + response); + console.log('Failed to list repositories:' + response); } function deleteByRepo(repoName) { @@ -137,14 +137,14 @@ $scope.$emit('modalTitle', $filter('tr')('error')); var message; if(status === 401) { - message = $filter('tr')('failed_delete_repo_insuffient_permissions'); + message = $filter('tr')('failed_to_delete_repo_insuffient_permissions'); }else{ - message = $filter('tr')('failed_delete_repo'); + message = $filter('tr')('failed_to_delete_repo'); } $scope.$emit('modalMessage', message); $scope.$emit('raiseError', true); - console.log('Failed delete repository:' + data); + console.log('Failed to delete repository:' + angular.toJson(data)); } } diff --git a/static/resources/js/components/repository/list-tag.directive.js b/static/resources/js/components/repository/list-tag.directive.js index 0dba11edd..38b3abb79 100644 --- a/static/resources/js/components/repository/list-tag.directive.js +++ b/static/resources/js/components/repository/list-tag.directive.js @@ -50,9 +50,9 @@ function getTagFailed(response) { $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_get_tag') + response); + $scope.$emit('modalMessage', $filter('tr')('failed_to_get_tag') + response); $scope.$emit('raiseError', true); - console.log('Failed get tag:' + response); + console.log('Failed to get tag:' + response); } function deleteTag(e) { diff --git a/static/resources/js/components/repository/popup-details.directive.js b/static/resources/js/components/repository/popup-details.directive.js index 02f1a69b6..977a31bd6 100644 --- a/static/resources/js/components/repository/popup-details.directive.js +++ b/static/resources/js/components/repository/popup-details.directive.js @@ -26,7 +26,7 @@ } function getManifestFailed(data, status) { - console.log('Failed get manifest:' + data); + console.log('Failed to get manifest:' + data); } } diff --git a/static/resources/js/components/search/search.directive.js b/static/resources/js/components/search/search.directive.js index 541b6457f..4b516765d 100644 --- a/static/resources/js/components/search/search.directive.js +++ b/static/resources/js/components/search/search.directive.js @@ -29,7 +29,7 @@ } function searchFailed(data, status) { - console.log('Failed search:' + data); + console.log('Failed to search:' + data); } } diff --git a/static/resources/js/components/sign-in/sign-in.directive.js b/static/resources/js/components/sign-in/sign-in.directive.js index 0e75d1176..0dd809c79 100644 --- a/static/resources/js/components/sign-in/sign-in.directive.js +++ b/static/resources/js/components/sign-in/sign-in.directive.js @@ -47,7 +47,7 @@ vm.hasError = true; vm.errorMessage = 'username_or_password_is_incorrect'; } - console.log('Failed sign in:' + data + ', status:' + status); + console.log('Failed to sign in:' + data + ', status:' + status); } function doSignUp() { @@ -75,7 +75,7 @@ } function logOutFailed(data, status) { - console.log('Failed to log out:' + data); + console.log('Failed to to log out:' + data); } } diff --git a/static/resources/js/components/summary/summary.directive.js b/static/resources/js/components/summary/summary.directive.js index f56a35ca6..f7f175ba1 100644 --- a/static/resources/js/components/summary/summary.directive.js +++ b/static/resources/js/components/summary/summary.directive.js @@ -21,9 +21,9 @@ function statProjectFailed(data) { $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_get_stat') + data); + $scope.$emit('modalMessage', $filter('tr')('failed_to_get_stat') + data); $scope.$emit('raiseError', true); - console.log('Failed get stat:' + data); + console.log('Failed to get stat:' + data); } } diff --git a/static/resources/js/components/system-management/create-destination.directive.js b/static/resources/js/components/system-management/create-destination.directive.js index d646db54c..d185f3810 100644 --- a/static/resources/js/components/system-management/create-destination.directive.js +++ b/static/resources/js/components/system-management/create-destination.directive.js @@ -72,9 +72,9 @@ if(status === 409) { vm.errorMessages.push($filter('tr')('destination_already_exists')); }else{ - vm.errorMessages.push($filter('tr')('failed_create_destination') + data); + vm.errorMessages.push($filter('tr')('failed_to_create_destination') + data); } - console.log('Failed create destination:' + data); + console.log('Failed to create destination:' + data); } function update(destination) { @@ -89,8 +89,8 @@ } function updateDestinationFailed(data, status) { - vm.errorMessages.push($filter('tr')('failed_update_destination') + data); - console.log('Failed update destination.'); + vm.errorMessages.push($filter('tr')('failed_to_update_destination') + data); + console.log('Failed to update destination.'); } @@ -108,7 +108,7 @@ function getDestinationFailed(data, status) { vm.errorMessages.push($filter('tr')('failed_get_destination')); - console.log('Failed get destination.'); + console.log('Failed to get destination.'); } function listDestinationPolicySuccess(data, status) { @@ -122,7 +122,7 @@ function listDestinationPolicyFailed(data, status) { vm.errorMessages.push($filter('tr')('failed_get_destination_policies')); - console.log('Failed list destination policy:' + data); + console.log('Failed to list destination policy:' + data); } function pingDestination() { @@ -153,7 +153,7 @@ function pingDestinationFailed(data, status) { vm.pingTIP = false; - vm.pingMessage = $filter('tr')('failed_ping_target', []) + (data && data.length > 0 ? ':' + data : '.'); + vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + (data && data.length > 0 ? ':' + data : '.'); } } diff --git a/static/resources/js/components/system-management/destination.directive.js b/static/resources/js/components/system-management/destination.directive.js index d0a145edc..5c8d32abc 100644 --- a/static/resources/js/components/system-management/destination.directive.js +++ b/static/resources/js/components/system-management/destination.directive.js @@ -47,8 +47,8 @@ function confirmToDelete(targetId) { vm.selectedTargetId = targetId; - $scope.$emit('modalTitle', $filter('tr')('confirm_to_delete_destination_title')); - $scope.$emit('modalMessage', $filter('tr')('confirm_to_delete_destination')); + $scope.$emit('modalTitle', $filter('tr')('confirm_delete_destination_title')); + $scope.$emit('modalMessage', $filter('tr')('confirm_delete_destination')); var emitInfo = { 'confirmOnly': false, @@ -71,9 +71,9 @@ function listDestinationFailed(data, status) { $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_list_destination')); + $scope.$emit('modalMessage', $filter('tr')('failed_to_list_destination')); $scope.$emit('raiseError', true); - console.log('Failed list destination:' + data); + console.log('Failed to list destination:' + data); } function deleteDestinationSuccess(data, status) { @@ -83,9 +83,9 @@ function deleteDestinationFailed(data, status) { $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_delete_destination') + data); + $scope.$emit('modalMessage', $filter('tr')('failed_to_delete_destination') + data); $scope.$emit('raiseError', true); - console.log('Failed delete destination.'); + console.log('Failed to delete destination.'); } } diff --git a/static/resources/js/components/system-management/replication.directive.js b/static/resources/js/components/system-management/replication.directive.js index 060237e98..84b085b63 100644 --- a/static/resources/js/components/system-management/replication.directive.js +++ b/static/resources/js/components/system-management/replication.directive.js @@ -35,9 +35,9 @@ function listReplicationPolicyFailed(data, status) { $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_list_replication')); + $scope.$emit('modalMessage', $filter('tr')('failed_to_list_replication')); $scope.$emit('raiseError', true); - console.log('Failed list replication policy.'); + console.log('Failed to list replication policy.'); } function togglePolicy(policyId, enabled) { @@ -53,9 +53,9 @@ function toggleReplicationPolicyFailed(data, status) { $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_toggle_policy')); + $scope.$emit('modalMessage', $filter('tr')('failed_to_toggle_policy')); $scope.$emit('raiseError', true); - console.log('Failed toggle replication policy.'); + console.log('Failed to toggle replication policy.'); } function editReplication(policyId) { diff --git a/static/resources/js/components/top-repository/top-repository.directive.js b/static/resources/js/components/top-repository/top-repository.directive.js index 79371f554..b7bd4afc7 100644 --- a/static/resources/js/components/top-repository/top-repository.directive.js +++ b/static/resources/js/components/top-repository/top-repository.directive.js @@ -21,9 +21,9 @@ function listTopRepositoryFailed(data, status) { $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_get_top_repo')); + $scope.$emit('modalMessage', $filter('tr')('failed_to_get_top_repo')); $scope.$emit('raiseError', true); - console.log('Failed get top repo:' + data); + console.log('Failed to get top repo:' + data); } } diff --git a/static/resources/js/components/user-log/user-log.directive.js b/static/resources/js/components/user-log/user-log.directive.js index dd130eeca..85cb643d5 100644 --- a/static/resources/js/components/user-log/user-log.directive.js +++ b/static/resources/js/components/user-log/user-log.directive.js @@ -21,9 +21,9 @@ function listIntegratedLogFailed(data, status) { $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_get_user_log') + data); + $scope.$emit('modalMessage', $filter('tr')('failed_to_get_user_log') + data); $scope.$emit('raiseError', true); - console.log('Failed get user logs:' + data); + console.log('Failed to get user logs:' + data); } } diff --git a/static/resources/js/components/user/list-user.directive.js b/static/resources/js/components/user/list-user.directive.js index bb6274bbf..4f9f97d72 100644 --- a/static/resources/js/components/user/list-user.directive.js +++ b/static/resources/js/components/user/list-user.directive.js @@ -35,8 +35,8 @@ function confirmToDelete(userId) { vm.selectedUserId = userId; - $scope.$emit('modalTitle', $filter('tr')('confirm_to_delete_user_title')); - $scope.$emit('modalMessage', $filter('tr')('confirm_to_delete_user')); + $scope.$emit('modalTitle', $filter('tr')('confirm_delete_user_title')); + $scope.$emit('modalMessage', $filter('tr')('confirm_delete_user')); var emitInfo = { 'confirmOnly': false, @@ -60,9 +60,9 @@ function deleteUserFailed(data, status) { $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_delete_user')); + $scope.$emit('modalMessage', $filter('tr')('failed_to_delete_user')); $scope.$emit('raiseError', true); - console.log('Failed delete user.'); + console.log('Failed to delete user.'); } function listUserSuccess(data, status) { @@ -71,9 +71,9 @@ function listUserFailed(data, status) { $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_list_user')); + $scope.$emit('modalMessage', $filter('tr')('failed_to_list_user')); $scope.$emit('raiseError', true); - console.log('Failed list user:' + data); + console.log('Failed to list user:' + data); } } diff --git a/static/resources/js/components/user/toggle-admin.directive.js b/static/resources/js/components/user/toggle-admin.directive.js index e9adcbd67..999e7962f 100644 --- a/static/resources/js/components/user/toggle-admin.directive.js +++ b/static/resources/js/components/user/toggle-admin.directive.js @@ -32,9 +32,9 @@ function toggleAdminFailed(data, status) { $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_toggle_admin')); + $scope.$emit('modalMessage', $filter('tr')('failed_to_toggle_admin')); $scope.$emit('raiseError', true); - console.log('Failed toggle admin:' + data); + console.log('Failed to toggle admin:' + data); } } diff --git a/static/resources/js/components/validator/user-exist.validator.js b/static/resources/js/components/validator/user-exist.validator.js index 4a21e48f5..e763d4bc6 100644 --- a/static/resources/js/components/validator/user-exist.validator.js +++ b/static/resources/js/components/validator/user-exist.validator.js @@ -45,7 +45,7 @@ } function userExistFailed(data, status) { - console.log('Failed in retrieval:' + data); + console.log('Failed to in retrieval:' + data); } return valid; diff --git a/static/resources/js/layout/account-setting/account-setting.controller.js b/static/resources/js/layout/account-setting/account-setting.controller.js index 54622a33e..6a8a0a46f 100644 --- a/static/resources/js/layout/account-setting/account-setting.controller.js +++ b/static/resources/js/layout/account-setting/account-setting.controller.js @@ -91,7 +91,7 @@ } function changePasswordFailed(data, status) { - console.log('Failed changed password:' + data); + console.log('Failed to changed password:' + data); if(data == 'old_password_is_not_correct') { vm.hasError = true; vm.errorMessage = 'old_password_is_incorrect'; @@ -110,11 +110,11 @@ if(status === 409) { message = $filter('tr')('email_has_been_taken'); }else{ - message = $filter('tr')('failed_update_user') + data; + message = $filter('tr')('failed_to_update_user') + data; } $scope.$emit('modalMessage', message); $scope.$emit('raiseError', true); - console.log('Failed update user.'); + console.log('Failed to update user.'); } function cancel(form) { diff --git a/static/resources/js/layout/forgot-password/forgot-password.controller.js b/static/resources/js/layout/forgot-password/forgot-password.controller.js index f3b466f0e..52a359de8 100644 --- a/static/resources/js/layout/forgot-password/forgot-password.controller.js +++ b/static/resources/js/layout/forgot-password/forgot-password.controller.js @@ -73,10 +73,10 @@ if(status === 500) { $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_send_email')); + $scope.$emit('modalMessage', $filter('tr')('failed_to_send_email')); $scope.$emit('raiseError', true); } - console.log('Failed send mail:' + data); + console.log('Failed to send mail:' + data); } function confirm() { diff --git a/static/resources/js/layout/project/project.controller.js b/static/resources/js/layout/project/project.controller.js index 4630268eb..4d859a75c 100644 --- a/static/resources/js/layout/project/project.controller.js +++ b/static/resources/js/layout/project/project.controller.js @@ -66,9 +66,9 @@ function listProjectFailed(data, status) { $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_get_project') + data); + $scope.$emit('modalMessage', $filter('tr')('failed_to_get_project') + data); $scope.$emit('raiseError', true); - console.log('Failed get Project:' + data); + console.log('Failed to get Project:' + data); } $scope.$on('addedSuccess', function(e, val) { diff --git a/static/resources/js/layout/reset-password/reset-password.controller.js b/static/resources/js/layout/reset-password/reset-password.controller.js index 4e8095e0f..bc0ea986f 100644 --- a/static/resources/js/layout/reset-password/reset-password.controller.js +++ b/static/resources/js/layout/reset-password/reset-password.controller.js @@ -72,10 +72,10 @@ vm.hasError = true; $scope.$emit('modalTitle', $filter('tr')('error')); - $scope.$emit('modalMessage', $filter('tr')('failed_reset_pasword') + data); + $scope.$emit('modalMessage', $filter('tr')('failed_to_reset_pasword') + data); $scope.$emit('raiseError', true); - console.log('Failed reset password:' + data); + console.log('Failed to reset password:' + data); } function cancel() { diff --git a/static/resources/js/layout/search/search.controller.js b/static/resources/js/layout/search/search.controller.js index 33e1e2b89..c0c6d3efb 100644 --- a/static/resources/js/layout/search/search.controller.js +++ b/static/resources/js/layout/search/search.controller.js @@ -48,7 +48,7 @@ $scope.$emit('modalMessage', $filter('tr')('failed_in_search')); $scope.$emit('raiseError', true); - console.log('Failed search:' + data); + console.log('Failed to search:' + data); } } diff --git a/static/resources/js/layout/sign-up/sign-up.controller.js b/static/resources/js/layout/sign-up/sign-up.controller.js index 47c9efcf6..fbb596b37 100644 --- a/static/resources/js/layout/sign-up/sign-up.controller.js +++ b/static/resources/js/layout/sign-up/sign-up.controller.js @@ -70,9 +70,9 @@ $scope.$emit('modalTitle', $filter('tr')('error')); var message; if(vm.targetType) { - message = $filter('tr')('failed_add_user'); + message = $filter('tr')('failed_to_add_user'); }else{ - message = $filter('tr')('failed_sign_up'); + message = $filter('tr')('failed_to_sign_up'); } $scope.$emit('modalMessage', message); $scope.$emit('raiseError', true); diff --git a/static/resources/js/services/i18n/locale_messages_en-US.js b/static/resources/js/services/i18n/locale_messages_en-US.js index 2e85665a5..f6906d5f6 100644 --- a/static/resources/js/services/i18n/locale_messages_en-US.js +++ b/static/resources/js/services/i18n/locale_messages_en-US.js @@ -133,15 +133,13 @@ var locale_messages = { 'continue' : 'Continue', 'no_projects_add_new_project': 'No projects, add new project now.', 'no_repositories': 'No repositories found, please use "docker push" to upload images.', - 'confirm_to_delete_member_title': 'Delete project member', 'failed_to_add_member': 'Project member can not be added, insuffient permissions.', 'failed_to_change_member': 'Project member can not be changed, insuffient permissions.', 'failed_to_delete_member': 'Project member can not be deleted, insuffient permissions.', - 'confirm_to_change_member_title': 'Change project member', - 'confirm_to_delete_user_title': 'Delete user', - 'confirm_to_delete_user': 'Are you sure to delete the current user?', - 'confirm_to_delete_destination_title': 'Delete destination', - 'confirm_to_delete_destination': 'Are you sure to delete the current destination?', + 'confirm_delete_user_title': 'Delete user', + 'confirm_delete_user': 'Are you sure to delete the current user?', + 'confirm_delete_destination_title': 'Delete destination', + 'confirm_delete_destination': 'Are you sure to delete the current destination?', 'replication': 'Replication', 'name': 'Name', 'description': 'Description', @@ -190,7 +188,7 @@ var locale_messages = { 'all_rights_reserved': 'All Rights Reserved.', 'pinging_target': 'Testing connection, please wait...', 'successful_ping_target': 'Test connection successfully.', - 'failed_ping_target': 'Faild to connect target', + 'failed_to_ping_target': 'Faild to connect target.', 'policy_already_exists': 'Policy alreay exists.', 'destination_already_exists': 'Destination already exists.', 'refresh': 'Refresh', @@ -208,34 +206,34 @@ var locale_messages = { 'canceled': 'Canceled', 'stopped': 'Stopped', 'error': 'Error', - 'failed_get_project_member': 'Failed get current project member.', - 'failed_delete_repo': 'Failed delete repository. ', - 'failed_delete_repo_insuffient_permissions': 'Failed delete repository, insuffient permissions.', - 'failed_get_tag': 'Failed get tag.', - 'failed_get_log': 'Failed get logs.', - 'failed_get_project': 'Failed get projects.', - 'failed_update_user': 'Failed update user.', - 'failed_get_stat': 'Failed get stat data.', - 'failed_get_top_repo': 'Failed get top repositories.', - 'failed_get_user_log': 'Failed get user logs.', - 'failed_send_email': 'Failed send email.', - 'failed_reset_pasword': 'Failed reset password.', + 'failed_to_get_project_member': 'Failed to get current project member.', + 'failed_to_delete_repo': 'Failed to delete repository. ', + 'failed_to_delete_repo_insuffient_permissions': 'Failed to delete repository, insuffient permissions.', + 'failed_to_get_tag': 'Failed to get tag.', + 'failed_to_get_log': 'Failed to get logs.', + 'failed_to_get_project': 'Failed to get projects.', + 'failed_to_update_user': 'Failed to update user.', + 'failed_to_get_stat': 'Failed to get stat data.', + 'failed_to_get_top_repo': 'Failed to get top repositories.', + 'failed_to_get_user_log': 'Failed to get user logs.', + 'failed_to_send_email': 'Failed to send email.', + 'failed_to_reset_pasword': 'Failed to reset password.', 'failed_in_search': 'Failed in search.', - 'failed_sign_up': 'Failed sign up.', - 'failed_add_user': 'Failed add user.', - 'failed_delete_user': 'Failed delete user.', - 'failed_list_user': 'Failed list user data.', - 'failed_toggle_admin': 'Failed toggle admin user.', - 'failed_list_destination': 'Failed list destinations.', - 'failed_list_replication': 'Failed list replication policies.', - 'failed_toggle_policy': 'Failed toggle replication policy.', - 'failed_create_replication_policy': 'Failed create replication policy.', - 'failed_get_destination': 'Failed get destination.', - 'failed_get_destination_policies': 'Failed get destination policies.', - 'failed_get_replication_policy': 'Failed get replication policy.', - 'failed_update_replication_policy': 'Failed update replication policy.', - 'failed_delete_destination': 'Delete destination failed:', - 'failed_create_destination': 'Create destination failed:', - 'failed_update_destination': 'Failed update destination:', + 'failed_to_sign_up': 'Failed to sign up.', + 'failed_to_add_user': 'Failed to add user.', + 'failed_to_delete_user': 'Failed to delete user.', + 'failed_to_list_user': 'Failed to list user data.', + 'failed_to_toggle_admin': 'Failed to toggle admin user.', + 'failed_to_list_destination': 'Failed to list destinations.', + 'failed_to_list_replication': 'Failed to list replication policies.', + 'failed_to_toggle_policy': 'Failed to toggle replication policy.', + 'failed_to_create_replication_policy': 'Failed to create replication policy.', + 'failed_to_get_destination': 'Failed to get destination.', + 'failed_to_get_destination_policies': 'Failed to get destination policies.', + 'failed_to_get_replication_policy': 'Failed to get replication policy.', + 'failed_to_update_replication_policy': 'Failed to update replication policy.', + 'failed_to_delete_destination': 'Failed to delete destination.', + 'failed_to_create_destination': 'Failed to create destination.', + 'failed_to_update_destination': 'Failed to update destination.', }; \ No newline at end of file diff --git a/static/resources/js/services/i18n/locale_messages_zh-CN.js b/static/resources/js/services/i18n/locale_messages_zh-CN.js index 3d5d0208b..a9eb222e7 100644 --- a/static/resources/js/services/i18n/locale_messages_zh-CN.js +++ b/static/resources/js/services/i18n/locale_messages_zh-CN.js @@ -131,15 +131,13 @@ var locale_messages = { 'continue' : '继续', 'no_projects_add_new_project': '当前没有项目,请新增项目。', 'no_repositories': '未发现镜像,请用"docker push"命令上传镜像。', - 'confirm_to_delete_member_title': '删除项目成员', 'failed_to_add_member': '无法添加项目成员,权限不足。', 'failed_to_change_member': '无法修改项目成员,权限不足。', 'failed_to_delete_member': '无法删除项目成员,权限不足。', - 'confirm_to_change_member_title': '修改项目成员', - 'confirm_to_delete_user_title': '删除用户', - 'confirm_to_delete_user': '确认删除当前用户吗?', - 'confirm_to_delete_destination_title': '删除目标', - 'confirm_to_delete_destination': '确认删除当前目标吗?', + 'confirm_delete_user_title': '删除用户', + 'confirm_delete_user': '确认删除当前用户吗?', + 'confirm_delete_user_titlen_title': '删除目标', + 'confirm_delete_destination': '确认删除当前目标吗?', 'replication': '复制', 'name': '名称', 'description': '描述', @@ -188,9 +186,9 @@ var locale_messages = { 'successful_added': '新增用户成功。', 'copyright': '版权所有', 'all_rights_reserved': '保留所有权利。', - 'pinging_target': '正在测试连接中,请稍候……', + 'pinging_target': '正在测试连接,请稍候……', 'successful_ping_target': '测试连接目标成功。', - 'failed_ping_target': '测试连接目标失败', + 'failed_to_ping_target': '测试连接目标失败', 'policy_already_exists': '策略已存在。', 'destination_already_exists': '目标已存在。', 'refresh': '刷新', @@ -208,33 +206,33 @@ var locale_messages = { 'canceled': '取消', 'stopped': '停止', 'error': '错误', - 'failed_get_project_member': '无法获取当前项目成员。', - 'failed_delete_repo': '无法删除镜像仓库。', - 'failed_delete_repo_insuffient_permissions': '无法删除镜像仓库,权限不足。', - 'failed_get_tag': '获得tag数据失败。', - 'failed_get_log': '获取log数据失败。', - 'failed_get_project': '获取project数据失败。', - 'failed_update_user': '更新用户信息失败。', - 'failed_get_stat': '获取统计数据失败。', - 'failed_get_top_repo': '获取Top镜像仓库数据失败。', - 'failed_get_user_log': '获取用户日志数据失败。', - 'failed_send_email': '发送邮件失败。', - 'failed_reset_pasword': '重置邮件失败。', + 'failed_to_get_project_member': '无法获取当前项目成员。', + 'failed_to_delete_repo': '无法删除镜像仓库。', + 'failed_to_delete_repo_insuffient_permissions': '无法删除镜像仓库,权限不足。', + 'failed_to_get_tag': '获得tag数据失败。', + 'failed_to_get_log': '获取log数据失败。', + 'failed_to_get_project': '获取project数据失败。', + 'failed_to_update_user': '更新用户信息失败。', + 'failed_to_get_stat': '获取统计数据失败。', + 'failed_to_get_top_repo': '获取Top镜像仓库数据失败。', + 'failed_to_get_user_log': '获取用户日志数据失败。', + 'failed_to_send_email': '发送邮件失败。', + 'failed_to_reset_pasword': '重置邮件失败。', 'failed_in_search': '搜索操作失败。', - 'failed_sign_up': '注册用户失败。', - 'failed_add_user': '新增用户失败。', - 'failed_delete_user': '删除用户失败。', - 'failed_list_user': '获取用户数据失败。', - 'failed_toggle_admin': '切换管理员用户失败。', - 'failed_list_destination': '获取目标数据失败。', - 'failed_list_replication': '获取复制策略数据失败。', - 'failed_toggle_policy': '切换复制策略状态失败。', - 'failed_create_replication_policy': '创建复制策略失败。', - 'failed_get_destination': '获取目标失败。', - 'failed_get_destination_policies': '获取目标关联策略数据失败。', - 'failed_get_replication_policy': '获取复制策略失败。', - 'failed_update_replication_policy': '修改复制策略失败。', - 'failed_delete_destination': '删除目标失败:', - 'failed_create_destination': '创建目标失败:', - 'failed_update_destination': '修改目标失败:' + 'failed_to_sign_up': '注册用户失败。', + 'failed_to_add_user': '新增用户失败。', + 'failed_to_delete_user': '删除用户失败。', + 'failed_to_list_user': '获取用户数据失败。', + 'failed_to_toggle_admin': '切换管理员用户失败。', + 'failed_to_list_destination': '获取目标数据失败。', + 'failed_to_list_replication': '获取复制策略数据失败。', + 'failed_to_toggle_policy': '切换复制策略状态失败。', + 'failed_to_create_replication_policy': '创建复制策略失败。', + 'failed_to_get_destination': '获取目标失败。', + 'failed_to_get_destination_policies': '获取目标关联策略数据失败。', + 'failed_to_get_replication_policy': '获取复制策略失败。', + 'failed_to_update_replication_policy': '修改复制策略失败。', + 'failed_to_delete_destination': '删除目标失败。', + 'failed_to_create_destination': '创建目标失败。', + 'failed_to_update_destination': '修改目标失败。' }; \ No newline at end of file diff --git a/static/resources/js/services/repository/services.delete-repository.js b/static/resources/js/services/repository/services.delete-repository.js index 9d26c1bcb..aad487aa6 100644 --- a/static/resources/js/services/repository/services.delete-repository.js +++ b/static/resources/js/services/repository/services.delete-repository.js @@ -13,7 +13,6 @@ function DeleteRepository(repoName, tag) { var params = (tag === '') ? {'repo_name' : repoName} : {'repo_name': repoName, 'tag': tag}; - console.log(params); return $http .delete('/api/repositories', { 'params': params