External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-17 20:51:21 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6259 from jakemcdermott/3956-translate-access-strings

Browse Source 
Mark access removal prompts and tech preview message for translation

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-03-13 19:30:29 +00:00 committed by GitHub
commit 4d1790290e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/client/lib/services/base-string.service.js
View File

@ -91,6 +91,18 @@ function BaseStringService (namespace) {
CONFIRM: resourceType => t.s('Are you sure you want to delete this {{ resourceType }}?', { resourceType })
};
this.removeTeamAccess = {
HEADER: t.s('Team access removal'),
ACTION_TEXT: t.s('REMOVE TEAM ACCESS'),
CONFIRM: (role, name) => t.s('Please confirm that you would like to remove {{ role }} access from the team {{ name }}. This will affect all members of the team. If you would like to only remove access for this particular user, please remove them from the team.', { role, name }),
};
this.removeUserAccess = {
HEADER: t.s('Role access removal'),
ACTION_TEXT: t.s('REMOVE ACCESS'),
CONFIRM: (role, name) => t.s('Please confirm that you would like to remove {{ role }} access from {{ name }}.', { role, name }),
};
this.cancelJob = {
HEADER: t.s('Cancel'),
SUBMIT_REQUEST: t.s('Are you sure you want to submit the request to cancel this job?'),

16
awx/ui/client/src/access/rbac-role-column/roleList.directive.js
View File

@ -1,7 +1,7 @@
/* jshint unused: vars */
export default
[ 'templateUrl', 'Wait', 'GetBasePath', 'Rest', '$state', 'ProcessErrors', 'Prompt', '$filter', '$rootScope', 'i18n',
function(templateUrl, Wait, GetBasePath, Rest, $state, ProcessErrors, Prompt, $filter, $rootScope, i18n) {
[ 'templateUrl', 'Wait', 'GetBasePath', 'Rest', '$state', 'ProcessErrors', 'Prompt', '$filter', '$rootScope', 'i18n', 'AppStrings',
function(templateUrl, Wait, GetBasePath, Rest, $state, ProcessErrors, Prompt, $filter, $rootScope, i18n, strings) {
return {
restrict: 'E',
scope: {
@ -96,17 +96,17 @@ export default
if (accessListEntry.team_id) {
Prompt({
hdr: i18n._(`Team access removal`),
body: `<div class="Prompt-bodyQuery">Please confirm that you would like to remove <span class="Prompt-emphasis">${entry.name}</span> access from the team <span class="Prompt-emphasis">${$filter('sanitize')(entry.team_name)}</span>. This will affect all members of the team. If you would like to only remove access for this particular user, please remove them from the team.</div>`,
hdr: strings.get('removeTeamAccess.HEADER'),
body: `<div class="Prompt-bodyQuery">${strings.get('removeTeamAccess.CONFIRM', entry.name, $filter('sanitize')(entry.team_name))}</div>`,
action: action,
actionText: i18n._('REMOVE TEAM ACCESS')
actionText: strings.get('removeTeamAccess.ACTION_TEXT'),
});
} else {
Prompt({
hdr: i18n._(`User access removal`),
body: `<div class="Prompt-bodyQuery">Please confirm that you would like to remove <span class="Prompt-emphasis">${entry.name}</span> access from <span class="Prompt-emphasis">${$filter('sanitize')(user.username)}</span>.</div>`,
hdr: strings.get('removeUserAccess.HEADER'),
body: `<div class="Prompt-bodyQuery">${strings.get('removeUserAccess.CONFIRM', entry.name, $filter('sanitize')(user.username))}</div>`,
action: action,
actionText: i18n._('REMOVE')
actionText: strings.get('removeUserAccess.ACTION_TEXT'),
});
}
};

2
awx/ui/client/src/instance-groups/container-groups/add-container-group.view.html
View File

@ -2,7 +2,7 @@
<a class="containerGroups-messageBar-link" href="https://docs.ansible.com/ansible-tower/latest/html/administration/external_execution_envs.html#container-groups" target="_blank" style="color: white">
<div class="Section-messageBar">
<i class="Section-messageBar-warning fa fa-warning"></i>
<span class="Section-messageBar-text">This feature is currently in tech preview and is subject to change in a future release. Click here for documentation.</span>
<span class="Section-messageBar-text">{{:: vm.strings.get('state.TECH_PREVIEW_MESSAGE_BAR') }}</span>
</div>
</a>
<at-panel>

3
awx/ui/client/src/instance-groups/instance-groups.strings.js
View File

@ -10,7 +10,8 @@ function InstanceGroupsStrings(BaseString) {
INSTANCE_GROUPS_BREADCRUMB_LABEL: t.s('INSTANCE GROUPS'),
INSTANCES_BREADCRUMB_LABEL: t.s('INSTANCES'),
ADD_BREADCRUMB_LABEL: t.s('CREATE INSTANCE GROUP'),
ADD_CONTAINER_GROUP_BREADCRUMB_LABEL: t.s('CREATE CONTAINER GROUP')
ADD_CONTAINER_GROUP_BREADCRUMB_LABEL: t.s('CREATE CONTAINER GROUP'),
TECH_PREVIEW_MESSAGE_BAR: t.s('This feature is currently in tech preview and is subject to change in a future release. Click here for documentation.'),
};
ns.list = {