Skip to content

Commit 10e8c19

Browse files
authored
Merge pull request #9439 from agrare/fix_ansible_tower_references
Fix incorrect Ansible Tower references
2 parents 6335622 + 2108b9a commit 10e8c19

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

app/controllers/automation_manager_configured_system_controller.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ def breadcrumbs_options
5757
{
5858
:breadcrumbs => [
5959
{:title => _("Automation")},
60-
{:title => _("Ansible Tower")},
6160
{:title => _("Configured Systems"), :url => controller_url},
6261
],
6362
}

app/controllers/configuration_script_controller.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ def breadcrumbs_options
6767
{
6868
:breadcrumbs => [
6969
{:title => _("Automation")},
70-
{:title => _("Ansible Tower")},
7170
{:title => _("Templates"), :url => controller_url},
7271
],
7372
}

app/helpers/application_helper/toolbar/ems_automations_center.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class ApplicationHelper::Toolbar::EmsAutomationsCenter < ApplicationHelper::Tool
4848
:onwhen => "1+",
4949
:data => {'function' => 'sendDataWithRx',
5050
'function-data' => {:controller => 'provider_dialogs',
51-
:modal_title => N_('Delete Ansible Tower Providers'),
52-
:modal_text => N_('Are you sure you want to delete the following Ansible Tower Providers?'),
51+
:modal_title => N_('Delete Automation Providers'),
52+
:modal_text => N_('Are you sure you want to delete the following Automation Providers?'),
5353
:api_url => 'providers',
5454
:async_delete => true,
5555
:redirect_url => '/ems_automation/show_list',
@@ -70,7 +70,7 @@ class ApplicationHelper::Toolbar::EmsAutomationsCenter < ApplicationHelper::Tool
7070
button(
7171
:ems_automation_tag,
7272
'pficon pficon-edit fa-lg',
73-
N_('Edit Tags for the selected Ansible Tower Providers'),
73+
N_('Edit Tags for the selected Automation Providers'),
7474
N_('Edit Tags'),
7575
:url_parms => "main_div",
7676
:send_checked => true,

app/presenters/tree_builder_automation_manager_configured_systems.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
class TreeBuilderAutomationManagerConfiguredSystems < TreeBuilderConfiguredSystems
22
def initialize(*args)
3-
@root_class = 'ManageIQ::Providers::AnsibleTower::AutomationManager::ConfiguredSystem'
3+
@root_class = 'ManageIQ::Providers::AutomationManager::ConfiguredSystem'
44
super(*args)
55
end
66

77
private
88

99
def root_options
1010
{
11-
:text => t = _("All Ansible Tower Configured Systems"),
11+
:text => t = _("All Automation Configured Systems"),
1212
:tooltip => t
1313
}
1414
end
1515

1616
def configured_systems
1717
{
1818
:id => "csa",
19-
:text => t = _("Ansible Tower Configured Systems"),
19+
:text => t = _("Automation Configured Systems"),
2020
:icon => "pficon pficon-folder-close",
2121
:tip => t
2222
}

app/views/layouts/_tag_edit_items.html.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
- when "Switch"
109109
= n_("%{amount} Switch Being Tagged", "%{amount} Switches Being Tagged", @tagitems.length) % t
110110
- when "ConfigurationScript"
111-
= n_("%{amount} Template (Ansible Tower) Being Tagged", "%{amount} Templates (Ansible Tower) Being Tagged", @tagitems.length) % t
111+
= n_("%{amount} Automation Template Being Tagged", "%{amount} Automation Templates Being Tagged", @tagitems.length) % t
112112
- when "VmOrTemplate"
113113
= n_("%{amount} VM or Template Being Tagged", "%{amount} VMs or Templates Being Tagged", @tagitems.length) % t
114114
- else

0 commit comments

Comments
 (0)