Merge pull request #200 from mzazrivec/migrate_display_names_for_models

Migrate model display names from locale/en.yml to plugin

app/models/manageiq/providers/openstack/cloud_manager.rb

@@ -389,4 +389,8 @@ def block_storage_disk_usage
   def object_storage_disk_usage(swift_replicas = 1)
     cloud_object_store_containers.sum(:bytes).to_f * swift_replicas
   end
+
+  def self.display_name(number = 1)
+    n_('Cloud Provider (OpenStack)', 'Cloud Providers (OpenStack)', number)
+  end
 end

app/models/manageiq/providers/openstack/cloud_manager/cloud_tenant.rb

@@ -43,6 +43,10 @@ def self.connection_options
     connection_options
   end
 
+  def self.display_name(number = 1)
+    n_('Cloud Tenant (OpenStack)', 'Cloud Tenants (OpenStack)', number)
+  end
+
   private
 
   def connection_options

app/models/manageiq/providers/openstack/cloud_manager/orchestration_stack.rb

@@ -68,4 +68,8 @@ def self.transform_parameters(template, deploy_parameters)
       end
     end
   end
+
+  def self.display_name(number = 1)
+    n_('Orchestration Stack (OpenStack)', 'Orchestration Stacks (OpenStack)', number)
+  end
 end

app/models/manageiq/providers/openstack/cloud_manager/orchestration_template.rb

@@ -83,6 +83,10 @@ def format
     content.strip.start_with?('{') ? 'json'.freeze : 'yaml'.freeze
   end
 
+  def self.display_name(number = 1)
+    n_('Heat Template', 'Heat Templates', number)
+  end
+
   private
 
   def parse

app/models/manageiq/providers/openstack/cloud_manager/vm.rb

@@ -166,4 +166,8 @@ def requires_storage_for_scan?
   def memory_mb_available?
     true
   end
+
+  def self.display_name(number = 1)
+    n_('Instance (OpenStack)', 'Instances (OpenStack)', number)
+  end
 end

app/models/manageiq/providers/openstack/cloud_manager/vnfd_template.rb

@@ -66,4 +66,8 @@ def save_as_orderable!
     self.orderable = true
     save!
   end
+
+  def self.display_name(number = 1)
+    n_('VNF Template', 'VNF Templates', number)
+  end
 end

app/models/manageiq/providers/openstack/infra_manager.rb

@@ -170,4 +170,8 @@ def register_and_configure_nodes(nodes_json)
   def validate_shutdown
     {:available => false,   :message => nil}
   end
+
+  def self.display_name(number = 1)
+    n_('Infrastructure Provider (OpenStack)', 'Infrastructure Providers (OpenStack)', number)
+  end
 end

app/models/manageiq/providers/openstack/infra_manager/host.rb

@@ -435,4 +435,8 @@ def refresh_network_interfaces(ssu)
     _log.warn("Error in refreshing network interfaces of host #{id}. Error: #{e.message}")
     _log.warn(e.backtrace.join("\n"))
   end
+
+  def self.display_name(number = 1)
+    n_('Host (OpenStack)', 'Hosts (OpenStack)', number)
+  end
 end

app/models/manageiq/providers/openstack/infra_manager/orchestration_stack.rb

@@ -139,6 +139,10 @@ def scale_up_using_workflows(stack_parameters)
     log_and_raise_update_error(__method__, err)
   end
 
+  def self.display_name(number = 1)
+    n_('Orchestration Stack (OpenStack)', 'Orchestration Stacks (OpenStack)', number)
+  end
+
   private
 
   def scale_queue(method_name, userid, parameters)

app/models/manageiq/providers/openstack/network_manager.rb

@@ -194,4 +194,8 @@ def create_security_group_queue(userid, options = {})
     }
     MiqTask.generic_action_with_callback(task_opts, queue_opts)
   end
+
+  def self.display_name(number = 1)
+    n_('Network Provider (OpenStack)', 'Network Providers (OpenStack)', number)
+  end
 end

app/models/manageiq/providers/openstack/network_manager/cloud_network.rb

@@ -182,6 +182,10 @@ def ip_address_utilization_live(reload = false)
     end
   end
 
+  def self.display_name(number = 1)
+    n_('Cloud Network (OpenStack)', 'Cloud Networks (OpenStack)', number)
+  end
+
   private
 
   def connection_options(cloud_tenant = nil)

app/models/manageiq/providers/openstack/network_manager/cloud_network/private.rb

@@ -1,2 +1,5 @@
 class ManageIQ::Providers::Openstack::NetworkManager::CloudNetwork::Private < ManageIQ::Providers::Openstack::NetworkManager::CloudNetwork
+  def self.display_name(number = 1)
+    n_('Cloud Network (OpenStack)', 'Cloud Networks (OpenStack)', number)
+  end
 end

app/models/manageiq/providers/openstack/network_manager/cloud_network/public.rb

@@ -1,2 +1,5 @@
 class ManageIQ::Providers::Openstack::NetworkManager::CloudNetwork::Public < ManageIQ::Providers::Openstack::NetworkManager::CloudNetwork
+  def self.display_name(number = 1)
+    n_('External Cloud Network (OpenStack)', 'External Cloud Networks (OpenStack)', number)
+  end
 end

app/models/manageiq/providers/openstack/network_manager/cloud_subnet.rb

@@ -96,6 +96,10 @@ def self.connection_options(cloud_tenant = nil)
     connection_options
   end
 
+  def self.display_name(number = 1)
+    n_('Cloud Subnet (OpenStack)', 'Cloud Subnets (OpenStack)', number)
+  end
+
   private
 
   def connection_options(cloud_tenant = nil)

app/models/manageiq/providers/openstack/network_manager/floating_ip.rb

@@ -116,6 +116,10 @@ def self.connection_options(cloud_tenant = nil)
     connection_options
   end
 
+  def self.display_name(number = 1)
+    n_('Floating IP (OpenStack)', 'Floating IPs (OpenStack)', number)
+  end
+
   private
 
   def connection_options(cloud_tenant = nil)

app/models/manageiq/providers/openstack/network_manager/network_port.rb

@@ -8,4 +8,8 @@ def disconnect_port
     end
     delete
   end
+
+  def self.display_name(number = 1)
+    n_('Network Port (OpenStack)', 'Network Ports (OpenStack)', number)
+  end
 end

app/models/manageiq/providers/openstack/network_manager/network_router.rb

@@ -162,6 +162,10 @@ def self.connection_options(cloud_tenant = nil)
     connection_options
   end
 
+  def self.display_name(number = 1)
+    n_('Network Router (OpenStack)', 'Network Routers (OpenStack)', number)
+  end
+
   private
 
   def connection_options(cloud_tenant = nil)

app/models/manageiq/providers/openstack/network_manager/security_group.rb

@@ -155,6 +155,10 @@ def self.connection_options(cloud_tenant = nil)
     connection_options
   end
 
+  def self.display_name(number = 1)
+    n_('Security Group (OpenStack)', 'Security Groups (OpenStack)', number)
+  end
+
   private
 
   def parse_direction(val)