From ca6dae236645ba7d97a7e61bab760c5a5bbf619d Mon Sep 17 00:00:00 2001 From: Milan Zazrivec Date: Thu, 18 Jan 2018 11:19:07 +0100 Subject: [PATCH] Migrate model display names from locale/en.yml to plugin --- app/models/manageiq/providers/google/cloud_manager/vm.rb | 4 ++++ app/models/manageiq/providers/google/network_manager.rb | 4 ++++ .../providers/google/network_manager/cloud_network.rb | 4 ++++ .../manageiq/providers/google/network_manager/cloud_subnet.rb | 4 ++++ .../manageiq/providers/google/network_manager/floating_ip.rb | 4 ++++ .../providers/google/network_manager/load_balancer.rb | 4 ++++ .../manageiq/providers/google/network_manager/network_port.rb | 4 ++++ .../providers/google/network_manager/network_router.rb | 4 ++++ .../providers/google/network_manager/security_group.rb | 4 ++++ 9 files changed, 36 insertions(+) diff --git a/app/models/manageiq/providers/google/cloud_manager/vm.rb b/app/models/manageiq/providers/google/cloud_manager/vm.rb index b291965b..fbd4d49e 100644 --- a/app/models/manageiq/providers/google/cloud_manager/vm.rb +++ b/app/models/manageiq/providers/google/cloud_manager/vm.rb @@ -53,4 +53,8 @@ def self.calculate_power_state(raw_power_state) "unknown" end end + + def self.display_name(number = 1) + n_('Instance (Google)', 'Instances (Google)', number) + end end diff --git a/app/models/manageiq/providers/google/network_manager.rb b/app/models/manageiq/providers/google/network_manager.rb index b2998780..f3b39284 100644 --- a/app/models/manageiq/providers/google/network_manager.rb +++ b/app/models/manageiq/providers/google/network_manager.rb @@ -50,4 +50,8 @@ def self.hostname_required? def description ManageIQ::Providers::Google::Regions.find_by_name(provider_region)[:description] end + + def self.display_name(number = 1) + n_('Network Provider (Google)', 'Network Providers (Google)', number) + end end diff --git a/app/models/manageiq/providers/google/network_manager/cloud_network.rb b/app/models/manageiq/providers/google/network_manager/cloud_network.rb index dd8b25f9..3bc76ce4 100644 --- a/app/models/manageiq/providers/google/network_manager/cloud_network.rb +++ b/app/models/manageiq/providers/google/network_manager/cloud_network.rb @@ -1,2 +1,6 @@ class ManageIQ::Providers::Google::NetworkManager::CloudNetwork < ::CloudNetwork + + def self.display_name(number = 1) + n_('Cloud Network (Google)', 'Cloud Networks (Google)', number) + end end diff --git a/app/models/manageiq/providers/google/network_manager/cloud_subnet.rb b/app/models/manageiq/providers/google/network_manager/cloud_subnet.rb index 328fc385..c5321d50 100644 --- a/app/models/manageiq/providers/google/network_manager/cloud_subnet.rb +++ b/app/models/manageiq/providers/google/network_manager/cloud_subnet.rb @@ -1,2 +1,6 @@ class ManageIQ::Providers::Google::NetworkManager::CloudSubnet < ::CloudSubnet + + def self.display_name(number = 1) + n_('Cloud Subnet (Google)', 'Cloud Subnets (Google)', number) + end end diff --git a/app/models/manageiq/providers/google/network_manager/floating_ip.rb b/app/models/manageiq/providers/google/network_manager/floating_ip.rb index e10f315b..59f82238 100644 --- a/app/models/manageiq/providers/google/network_manager/floating_ip.rb +++ b/app/models/manageiq/providers/google/network_manager/floating_ip.rb @@ -1,2 +1,6 @@ class ManageIQ::Providers::Google::NetworkManager::FloatingIp < ::FloatingIp + + def self.display_name(number = 1) + n_('Floating IP (Google)', 'Floating IPs (Google)', number) + end end diff --git a/app/models/manageiq/providers/google/network_manager/load_balancer.rb b/app/models/manageiq/providers/google/network_manager/load_balancer.rb index 7bb8c016..5eee996f 100644 --- a/app/models/manageiq/providers/google/network_manager/load_balancer.rb +++ b/app/models/manageiq/providers/google/network_manager/load_balancer.rb @@ -1,2 +1,6 @@ class ManageIQ::Providers::Google::NetworkManager::LoadBalancer < ::LoadBalancer + + def self.display_name(number = 1) + n_('Load Balancer (Google)', 'Load Balancers (Google)', number) + end end diff --git a/app/models/manageiq/providers/google/network_manager/network_port.rb b/app/models/manageiq/providers/google/network_manager/network_port.rb index 1b60cd89..95e115af 100644 --- a/app/models/manageiq/providers/google/network_manager/network_port.rb +++ b/app/models/manageiq/providers/google/network_manager/network_port.rb @@ -1,2 +1,6 @@ class ManageIQ::Providers::Google::NetworkManager::NetworkPort < ::NetworkPort + + def self.display_name(number = 1) + n_('Network Port (Google)', 'Network Ports (Google)', number) + end end diff --git a/app/models/manageiq/providers/google/network_manager/network_router.rb b/app/models/manageiq/providers/google/network_manager/network_router.rb index 0e64c1ab..c7f9c792 100644 --- a/app/models/manageiq/providers/google/network_manager/network_router.rb +++ b/app/models/manageiq/providers/google/network_manager/network_router.rb @@ -1,2 +1,6 @@ class ManageIQ::Providers::Google::NetworkManager::NetworkRouter < ::NetworkRouter + + def self.display_name(number = 1) + n_('Network Router (Google)', 'Network Routers (Google)', number) + end end diff --git a/app/models/manageiq/providers/google/network_manager/security_group.rb b/app/models/manageiq/providers/google/network_manager/security_group.rb index edf7e292..750e2bfd 100644 --- a/app/models/manageiq/providers/google/network_manager/security_group.rb +++ b/app/models/manageiq/providers/google/network_manager/security_group.rb @@ -1,2 +1,6 @@ class ManageIQ::Providers::Google::NetworkManager::SecurityGroup < ::SecurityGroup + + def self.display_name(number = 1) + n_('Security Group (Google)', 'Security Groups (Google)', number) + end end