From 8a071675ed10c4b7df04fde88940dfb7b6899b2b Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 3 Jan 2024 09:33:14 +0100 Subject: [PATCH 1/3] rubocop: update to new version and apply -a --- .rubocop.yml | 2 +- .../autoinst_profile/firewall_section.rb | 3 +-- src/lib/y2firewall/clients/firewall.rb | 10 +++++----- src/lib/y2firewall/widgets/allowed_services.rb | 2 +- src/lib/y2firewall/widgets/proposal.rb | 14 +++++++------- test/lib/y2firewall/autoyast_test.rb | 2 +- test/lib/y2firewall/dialogs/main_test.rb | 2 +- .../importer_strategies/firewalld_test.rb | 2 +- .../importer_strategies/suse_firewall_test.rb | 2 +- .../y2firewall/widgets/interfaces_table_test.rb | 2 +- .../y2firewall/widgets/overview_tree_pager_test.rb | 2 +- test/lib/y2firewall/widgets/overview_tree_test.rb | 2 +- .../y2firewall/widgets/pages/interfaces_test.rb | 2 +- test/lib/y2firewall/widgets/pages/startup_test.rb | 2 +- test/lib/y2firewall/widgets/pages/zone_test.rb | 2 +- test/lib/y2firewall/widgets/pages/zones_test.rb | 2 +- test/lib/y2firewall/widgets/proposal_test.rb | 2 +- test/lib/y2firewall/widgets/zones_table_test.rb | 2 +- 18 files changed, 28 insertions(+), 29 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index f7e3f076..9d5912d0 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,6 +1,6 @@ # use the shared YaST defaults inherit_from: - /usr/share/YaST2/data/devtools/data/rubocop-0.71.0_yast_style.yml + /usr/share/YaST2/data/devtools/data/rubocop-1.24.1_yast_style.yml Metrics/CyclomaticComplexity: Max: 10 diff --git a/src/lib/y2firewall/autoinst_profile/firewall_section.rb b/src/lib/y2firewall/autoinst_profile/firewall_section.rb index f5934124..c80fb022 100644 --- a/src/lib/y2firewall/autoinst_profile/firewall_section.rb +++ b/src/lib/y2firewall/autoinst_profile/firewall_section.rb @@ -30,8 +30,7 @@ class FirewallSection < ::Installation::AutoinstProfile::SectionWithAttributes # @param _hash [Hash] Firewall section from an AutoYaST profile # @return [FirewallSection] def self.new_from_hashes(_hash) - result = new - result + new end end end diff --git a/src/lib/y2firewall/clients/firewall.rb b/src/lib/y2firewall/clients/firewall.rb index 72963d18..47fa5b8c 100644 --- a/src/lib/y2firewall/clients/firewall.rb +++ b/src/lib/y2firewall/clients/firewall.rb @@ -45,18 +45,18 @@ def initialize # TRANSLATORS: firewall-config and firewall-cmd are the names of software utilities, # so they should not be translated. NOT_SUPPORTED = N_("YaST does not support the command line for " \ - "configuring the firewall.\nInstead, please use the firewalld " \ - "command line clients \"firewalld-cmd\" or \"firewall-offline-cmd\".") + "configuring the firewall.\nInstead, please use the firewalld " \ + "command line clients \"firewalld-cmd\" or \"firewall-offline-cmd\".") def run log_and_return do return :abort unless Yast::Package.CheckAndInstallPackages(["firewalld"]) - if !Yast::WFM.Args.empty? + if Yast::WFM.Args.empty? + Dialogs::Main.new.run + else warn _(NOT_SUPPORTED) false - else - Dialogs::Main.new.run end end end diff --git a/src/lib/y2firewall/widgets/allowed_services.rb b/src/lib/y2firewall/widgets/allowed_services.rb index 8c73fc88..cf34b072 100644 --- a/src/lib/y2firewall/widgets/allowed_services.rb +++ b/src/lib/y2firewall/widgets/allowed_services.rb @@ -99,7 +99,7 @@ def validate # TRANSLATORS: popup question msg = _("The selection of services will be lost if you leave the page\n" \ - "without moving them with Add/Remove.\n\nDo you really want to continue?\n") + "without moving them with Add/Remove.\n\nDo you really want to continue?\n") Yast::Popup.YesNo(msg) end diff --git a/src/lib/y2firewall/widgets/proposal.rb b/src/lib/y2firewall/widgets/proposal.rb index be4fdf1e..5bffed97 100644 --- a/src/lib/y2firewall/widgets/proposal.rb +++ b/src/lib/y2firewall/widgets/proposal.rb @@ -93,11 +93,11 @@ def store def help _( "

Firewall and SSH
\n" \ - "Firewall is a defensive mechanism that protects " \ - "your computer from network attacks.\n" \ - "SSH is a service that allows logging into this " \ - "computer remotely via dedicated\n" \ - "SSH client

" + "Firewall is a defensive mechanism that protects " \ + "your computer from network attacks.\n" \ + "SSH is a service that allows logging into this " \ + "computer remotely via dedicated\n" \ + "SSH client

" ) + _( "

Here you can choose whether the firewall will be " \ @@ -193,8 +193,8 @@ def store def help _( "

You can also open VNC ports in firewall. It will not enable\n" \ - "the remote administration service on a running system but it is\n" \ - "started by the installer automatically if needed.

" + "the remote administration service on a running system but it is\n" \ + "started by the installer automatically if needed.

" ) end end diff --git a/test/lib/y2firewall/autoyast_test.rb b/test/lib/y2firewall/autoyast_test.rb index 7e7b5144..fda6a8dd 100755 --- a/test/lib/y2firewall/autoyast_test.rb +++ b/test/lib/y2firewall/autoyast_test.rb @@ -19,7 +19,7 @@ # current contact information at www.suse.com. # ------------------------------------------------------------------------------ -require_relative "../../test_helper.rb" +require_relative "../../test_helper" require "y2firewall/autoyast" describe Y2Firewall::Autoyast do diff --git a/test/lib/y2firewall/dialogs/main_test.rb b/test/lib/y2firewall/dialogs/main_test.rb index e9f32f28..928a8ff3 100755 --- a/test/lib/y2firewall/dialogs/main_test.rb +++ b/test/lib/y2firewall/dialogs/main_test.rb @@ -19,7 +19,7 @@ # current contact information at www.suse.com. # ------------------------------------------------------------------------------ -require_relative "../../../test_helper.rb" +require_relative "../../../test_helper" require "cwm/rspec" require "y2firewall/dialogs/main" diff --git a/test/lib/y2firewall/importer_strategies/firewalld_test.rb b/test/lib/y2firewall/importer_strategies/firewalld_test.rb index 903ee17e..e948626f 100755 --- a/test/lib/y2firewall/importer_strategies/firewalld_test.rb +++ b/test/lib/y2firewall/importer_strategies/firewalld_test.rb @@ -19,7 +19,7 @@ # current contact information at www.suse.com. # ------------------------------------------------------------------------------ -require_relative "../../../test_helper.rb" +require_relative "../../../test_helper" require "cwm/rspec" require "y2firewall/importer_strategies/firewalld" diff --git a/test/lib/y2firewall/importer_strategies/suse_firewall_test.rb b/test/lib/y2firewall/importer_strategies/suse_firewall_test.rb index 4c1a08af..1b85ff8f 100755 --- a/test/lib/y2firewall/importer_strategies/suse_firewall_test.rb +++ b/test/lib/y2firewall/importer_strategies/suse_firewall_test.rb @@ -19,7 +19,7 @@ # current contact information at www.suse.com. # ------------------------------------------------------------------------------ -require_relative "../../../test_helper.rb" +require_relative "../../../test_helper" require "cwm/rspec" require "y2firewall/importer_strategies/suse_firewall" diff --git a/test/lib/y2firewall/widgets/interfaces_table_test.rb b/test/lib/y2firewall/widgets/interfaces_table_test.rb index 88fc54ed..9836377f 100755 --- a/test/lib/y2firewall/widgets/interfaces_table_test.rb +++ b/test/lib/y2firewall/widgets/interfaces_table_test.rb @@ -18,7 +18,7 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require_relative "../../../test_helper.rb" +require_relative "../../../test_helper" require "cwm/rspec" require "y2firewall/widgets/interfaces_table" require "y2firewall/widgets/change_zone_button" diff --git a/test/lib/y2firewall/widgets/overview_tree_pager_test.rb b/test/lib/y2firewall/widgets/overview_tree_pager_test.rb index df7ae041..0f0838ca 100755 --- a/test/lib/y2firewall/widgets/overview_tree_pager_test.rb +++ b/test/lib/y2firewall/widgets/overview_tree_pager_test.rb @@ -18,7 +18,7 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require_relative "../../../test_helper.rb" +require_relative "../../../test_helper" require "cwm/rspec" require "y2firewall/widgets/overview_tree_pager" require "y2firewall/widgets/pages" diff --git a/test/lib/y2firewall/widgets/overview_tree_test.rb b/test/lib/y2firewall/widgets/overview_tree_test.rb index d1d2c30d..a570c81f 100755 --- a/test/lib/y2firewall/widgets/overview_tree_test.rb +++ b/test/lib/y2firewall/widgets/overview_tree_test.rb @@ -18,7 +18,7 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require_relative "../../../test_helper.rb" +require_relative "../../../test_helper" require "cwm/rspec" require "y2firewall/widgets/overview_tree" require "cwm/tree_pager" diff --git a/test/lib/y2firewall/widgets/pages/interfaces_test.rb b/test/lib/y2firewall/widgets/pages/interfaces_test.rb index f6a7e720..858f50a4 100755 --- a/test/lib/y2firewall/widgets/pages/interfaces_test.rb +++ b/test/lib/y2firewall/widgets/pages/interfaces_test.rb @@ -18,7 +18,7 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require_relative "../../../../test_helper.rb" +require_relative "../../../../test_helper" require "cwm/rspec" require "y2firewall/widgets/pages/interfaces" require "y2firewall/firewalld/interface" diff --git a/test/lib/y2firewall/widgets/pages/startup_test.rb b/test/lib/y2firewall/widgets/pages/startup_test.rb index 232a8a69..1b6955f7 100755 --- a/test/lib/y2firewall/widgets/pages/startup_test.rb +++ b/test/lib/y2firewall/widgets/pages/startup_test.rb @@ -19,7 +19,7 @@ # current contact information at www.suse.com. # ------------------------------------------------------------------------------ -require_relative "../../../../test_helper.rb" +require_relative "../../../../test_helper" require "cwm/rspec" require "cwm/service_widget" diff --git a/test/lib/y2firewall/widgets/pages/zone_test.rb b/test/lib/y2firewall/widgets/pages/zone_test.rb index 5ae9816b..01fab538 100755 --- a/test/lib/y2firewall/widgets/pages/zone_test.rb +++ b/test/lib/y2firewall/widgets/pages/zone_test.rb @@ -19,7 +19,7 @@ # current contact information at www.suse.com. # ------------------------------------------------------------------------------ -require_relative "../../../../test_helper.rb" +require_relative "../../../../test_helper" require "cwm/rspec" require "y2firewall/widgets/pages/zone" diff --git a/test/lib/y2firewall/widgets/pages/zones_test.rb b/test/lib/y2firewall/widgets/pages/zones_test.rb index 79339449..10ca3e11 100755 --- a/test/lib/y2firewall/widgets/pages/zones_test.rb +++ b/test/lib/y2firewall/widgets/pages/zones_test.rb @@ -19,7 +19,7 @@ # current contact information at www.suse.com. # ------------------------------------------------------------------------------ -require_relative "../../../../test_helper.rb" +require_relative "../../../../test_helper" require "cwm/rspec" require "y2firewall/widgets/pages/zones" diff --git a/test/lib/y2firewall/widgets/proposal_test.rb b/test/lib/y2firewall/widgets/proposal_test.rb index 91c418bb..d5ba941e 100755 --- a/test/lib/y2firewall/widgets/proposal_test.rb +++ b/test/lib/y2firewall/widgets/proposal_test.rb @@ -19,7 +19,7 @@ # To contact SUSE LLC about this file by physical or electronic mail, you may # find current contact information at www.suse.com. -require_relative "../../../test_helper.rb" +require_relative "../../../test_helper" require "cwm/rspec" require "y2firewall/widgets/proposal" diff --git a/test/lib/y2firewall/widgets/zones_table_test.rb b/test/lib/y2firewall/widgets/zones_table_test.rb index 66127780..672c6d83 100755 --- a/test/lib/y2firewall/widgets/zones_table_test.rb +++ b/test/lib/y2firewall/widgets/zones_table_test.rb @@ -19,7 +19,7 @@ # current contact information at www.suse.com. # ------------------------------------------------------------------------------ -require_relative "../../../test_helper.rb" +require_relative "../../../test_helper" require "cwm/rspec" require "y2firewall/widgets/zones_table" require "y2firewall/widgets/default_zone_button" From cb82fe0fd34e70bb5ac104b9d097a25d5b0c78fa Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 3 Jan 2024 09:57:18 +0100 Subject: [PATCH 2/3] new rubocop: manual fixes --- src/lib/y2firewall/clients/auto.rb | 1 + src/lib/y2firewall/dialogs/change_zone.rb | 1 + src/lib/y2firewall/dialogs/main.rb | 1 + src/lib/y2firewall/dialogs/modify_zone_interfaces.rb | 1 + src/lib/y2firewall/dialogs/zone.rb | 1 + .../y2firewall/importer_strategies/suse_firewall.rb | 12 ++++++------ src/lib/y2firewall/widgets/allowed_services.rb | 1 + src/lib/y2firewall/widgets/change_zone_button.rb | 1 + src/lib/y2firewall/widgets/default_zone_button.rb | 1 + src/lib/y2firewall/widgets/interfaces_table.rb | 1 + src/lib/y2firewall/widgets/modify_zone_interfaces.rb | 2 ++ src/lib/y2firewall/widgets/overview_tree.rb | 1 + src/lib/y2firewall/widgets/overview_tree_pager.rb | 1 + src/lib/y2firewall/widgets/pages/interfaces.rb | 1 + src/lib/y2firewall/widgets/pages/startup.rb | 1 + src/lib/y2firewall/widgets/pages/zone.rb | 4 ++++ src/lib/y2firewall/widgets/pages/zones.rb | 1 + src/lib/y2firewall/widgets/proposal.rb | 5 +++++ src/lib/y2firewall/widgets/services_table.rb | 1 + src/lib/y2firewall/widgets/zone.rb | 5 +++++ src/lib/y2firewall/widgets/zone_button.rb | 1 + src/lib/y2firewall/widgets/zone_interfaces_button.rb | 1 + src/lib/y2firewall/widgets/zone_options.rb | 1 + src/lib/y2firewall/widgets/zones_table.rb | 1 + 24 files changed, 41 insertions(+), 6 deletions(-) diff --git a/src/lib/y2firewall/clients/auto.rb b/src/lib/y2firewall/clients/auto.rb index 631ebbf6..6b65eff1 100644 --- a/src/lib/y2firewall/clients/auto.rb +++ b/src/lib/y2firewall/clients/auto.rb @@ -59,6 +59,7 @@ class << self # Constructor def initialize + super() textdomain "firewall" end diff --git a/src/lib/y2firewall/dialogs/change_zone.rb b/src/lib/y2firewall/dialogs/change_zone.rb index 44e15614..2960d860 100644 --- a/src/lib/y2firewall/dialogs/change_zone.rb +++ b/src/lib/y2firewall/dialogs/change_zone.rb @@ -32,6 +32,7 @@ class ChangeZone < ::CWM::Popup # # @param interface [Y2Firewall::Firewalld::Interface] Interface to act on def initialize(interface) + super() textdomain "firewall" @interface = interface end diff --git a/src/lib/y2firewall/dialogs/main.rb b/src/lib/y2firewall/dialogs/main.rb index 5a990b1f..b9c52d04 100644 --- a/src/lib/y2firewall/dialogs/main.rb +++ b/src/lib/y2firewall/dialogs/main.rb @@ -31,6 +31,7 @@ module Dialogs class Main < CWM::Dialog # Constructor def initialize + super() Yast.import "NetworkInterfaces" textdomain "firewall" diff --git a/src/lib/y2firewall/dialogs/modify_zone_interfaces.rb b/src/lib/y2firewall/dialogs/modify_zone_interfaces.rb index f0dad58a..7b7dba0e 100644 --- a/src/lib/y2firewall/dialogs/modify_zone_interfaces.rb +++ b/src/lib/y2firewall/dialogs/modify_zone_interfaces.rb @@ -28,6 +28,7 @@ module Dialogs class ModifyZoneInterfaces < ::CWM::Popup # Constructor def initialize + super() textdomain "firewall" end diff --git a/src/lib/y2firewall/dialogs/zone.rb b/src/lib/y2firewall/dialogs/zone.rb index 2b9915b5..0b41156e 100644 --- a/src/lib/y2firewall/dialogs/zone.rb +++ b/src/lib/y2firewall/dialogs/zone.rb @@ -30,6 +30,7 @@ class Zone < CWM::Popup # @param existing_names [Array] names have to be unique, so pass existing ones # which cannot be used. def initialize(zone, new_zone: false, existing_names: []) + super() textdomain "firewall" @zone = zone @new_zone = new_zone diff --git a/src/lib/y2firewall/importer_strategies/suse_firewall.rb b/src/lib/y2firewall/importer_strategies/suse_firewall.rb index cf74e41c..c9cc67cd 100644 --- a/src/lib/y2firewall/importer_strategies/suse_firewall.rb +++ b/src/lib/y2firewall/importer_strategies/suse_firewall.rb @@ -180,7 +180,7 @@ def process_zone(name) # @param zone_name [String] def services(zone_name) services = profile["FW_CONFIGURATIONS_#{zone_name}"] - services ? map_services(services.split(" ")) : nil + services ? map_services(services.split) : nil end # Obtain the interfaces for the given SuSEFIrewall2 zone name from the @@ -192,7 +192,7 @@ def services(zone_name) # especial wildcards like 'any' or nil in case the key is not defined def interfaces(zone_name) interfaces = profile["FW_DEV_#{zone_name}"] - interfaces ? interfaces.split(" ").reject { |i| i == "any" } : nil + interfaces ? interfaces.split.reject { |i| i == "any" } : nil end # Return whether the given zone name is the default one. @@ -211,7 +211,7 @@ def default_zone?(zone_name) # @return [Array, nil] def protocols(zone) protocols = profile["FW_SERVICES_#{zone}_IP"] - protocols ? protocols.split(" ") : nil + protocols ? protocols.split : nil end # Obtain the ports for the given SuSEFIrewall2 zone name from the @@ -246,7 +246,7 @@ def map_services(services) # configured def tcp_ports(zone) ports = profile["FW_SERVICES_#{zone}_TCP"] - ports ? ports.split(" ").map { |p| "#{p.sub(":", "-")}/tcp" } : nil + ports ? ports.split.map { |p| "#{p.sub(":", "-")}/tcp" } : nil end # Obtain the UDP ports for the given SuSEFIrewall2 zone name from the @@ -257,7 +257,7 @@ def tcp_ports(zone) # configured def udp_ports(zone) ports = profile["FW_SERVICES_#{zone}_UDP"] - ports ? ports.split(" ").map { |p| "#{p.sub(":", "-")}/udp" } : nil + ports ? ports.split.map { |p| "#{p.sub(":", "-")}/udp" } : nil end # Obtain the RPC ports for the given SuSEFIrewall2 zone name from the @@ -268,7 +268,7 @@ def udp_ports(zone) # configured def rpc_ports(zone) ports = profile["FW_SERVICES_#{zone}_RPC"] - ports ? ports.split(" ").map { |p| ["#{p}/udp", "#{p}/tcp"] }.flatten : nil + ports ? ports.split.map { |p| ["#{p}/udp", "#{p}/tcp"] }.flatten : nil end # Given a SuSEFirewall2 zone name return the firewalld zone equivalent diff --git a/src/lib/y2firewall/widgets/allowed_services.rb b/src/lib/y2firewall/widgets/allowed_services.rb index cf34b072..b9dc6f87 100644 --- a/src/lib/y2firewall/widgets/allowed_services.rb +++ b/src/lib/y2firewall/widgets/allowed_services.rb @@ -29,6 +29,7 @@ class AllowedServices < ::CWM::CustomWidget # # @param zone [Y2Firewall::Firewalld::Zone] Zone def initialize(zone) + super() textdomain "firewall" @zone = zone self.widget_id = "allowed_services" diff --git a/src/lib/y2firewall/widgets/change_zone_button.rb b/src/lib/y2firewall/widgets/change_zone_button.rb index 5e085fcd..e52a304f 100644 --- a/src/lib/y2firewall/widgets/change_zone_button.rb +++ b/src/lib/y2firewall/widgets/change_zone_button.rb @@ -33,6 +33,7 @@ class ChangeZoneButton < CWM::PushButton # # @param interface [Y2Firewall::Firewalld::Interface] Interface to act on def initialize(interface) + super() textdomain "firewall" @interface = interface end diff --git a/src/lib/y2firewall/widgets/default_zone_button.rb b/src/lib/y2firewall/widgets/default_zone_button.rb index bbf62925..7799ede5 100644 --- a/src/lib/y2firewall/widgets/default_zone_button.rb +++ b/src/lib/y2firewall/widgets/default_zone_button.rb @@ -32,6 +32,7 @@ class DefaultZoneButton < CWM::PushButton # # @param zone [Y2Firewall::Firewalld::Zone] Zone to set as 'default' def initialize(zone) + super() textdomain "firewall" @zone = zone end diff --git a/src/lib/y2firewall/widgets/interfaces_table.rb b/src/lib/y2firewall/widgets/interfaces_table.rb index ef139c61..362f05be 100644 --- a/src/lib/y2firewall/widgets/interfaces_table.rb +++ b/src/lib/y2firewall/widgets/interfaces_table.rb @@ -39,6 +39,7 @@ class InterfacesTable < ::CWM::Table # @param change_zone_button [Y2Firewall::Widgets::ChangeZoneButton] Button to change assigned # zone def initialize(interfaces, change_zone_button) + super() textdomain "firewall" @interfaces = interfaces @change_zone_button = change_zone_button diff --git a/src/lib/y2firewall/widgets/modify_zone_interfaces.rb b/src/lib/y2firewall/widgets/modify_zone_interfaces.rb index 9b2ae41b..a7b2e1d5 100644 --- a/src/lib/y2firewall/widgets/modify_zone_interfaces.rb +++ b/src/lib/y2firewall/widgets/modify_zone_interfaces.rb @@ -33,6 +33,7 @@ class ZoneInterfacesSelector < ::CWM::ComboBox # @param interfaces_input [CWM::InputField] input field for modifying the # selected zone interfaces def initialize(interfaces_input) + super() textdomain "firewall" @interfaces_input = interfaces_input end @@ -98,6 +99,7 @@ def selected_zone # @example input field widget child class ZoneInterfaces < CWM::InputField def initialize + super() textdomain "firewall" end diff --git a/src/lib/y2firewall/widgets/overview_tree.rb b/src/lib/y2firewall/widgets/overview_tree.rb index d6329e43..95e3a1b6 100644 --- a/src/lib/y2firewall/widgets/overview_tree.rb +++ b/src/lib/y2firewall/widgets/overview_tree.rb @@ -33,6 +33,7 @@ class OverviewTree < CWM::Tree # # @param items [Array] List of tree items to be included def initialize(items) + super() textdomain "firewall" @items = items end diff --git a/src/lib/y2firewall/widgets/overview_tree_pager.rb b/src/lib/y2firewall/widgets/overview_tree_pager.rb index 776d7d99..2de05ed1 100644 --- a/src/lib/y2firewall/widgets/overview_tree_pager.rb +++ b/src/lib/y2firewall/widgets/overview_tree_pager.rb @@ -36,6 +36,7 @@ class OverviewTreePager < CWM::TreePager # Constructor def initialize + super() textdomain "firewall" @fw = Y2Firewall::Firewalld.instance diff --git a/src/lib/y2firewall/widgets/pages/interfaces.rb b/src/lib/y2firewall/widgets/pages/interfaces.rb index c8336d5e..32b7eb19 100644 --- a/src/lib/y2firewall/widgets/pages/interfaces.rb +++ b/src/lib/y2firewall/widgets/pages/interfaces.rb @@ -37,6 +37,7 @@ class Interfaces < CWM::Page # # @param _pager [CWM::TreePager] def initialize(_pager) + super() textdomain "firewall" end diff --git a/src/lib/y2firewall/widgets/pages/startup.rb b/src/lib/y2firewall/widgets/pages/startup.rb index d9c64dbb..ce83fde1 100644 --- a/src/lib/y2firewall/widgets/pages/startup.rb +++ b/src/lib/y2firewall/widgets/pages/startup.rb @@ -31,6 +31,7 @@ class Startup < CWM::Page # # @param _pager [CWM::TreePager] def initialize(_pager) + super() textdomain "firewall" end diff --git a/src/lib/y2firewall/widgets/pages/zone.rb b/src/lib/y2firewall/widgets/pages/zone.rb index 589c5071..842ef2ec 100644 --- a/src/lib/y2firewall/widgets/pages/zone.rb +++ b/src/lib/y2firewall/widgets/pages/zone.rb @@ -34,6 +34,7 @@ class Zone < CWM::Page # @param zone [Y2Firewall::Firewalld::Zone] # @param pager [CWM::TreePager] def initialize(zone, pager) + super() Yast.import "Popup" textdomain "firewall" @zone = zone @@ -63,6 +64,7 @@ class PortsTab < CWM::Tab # # @param zone [Y2Firewall::Firewalld::Zone] def initialize(zone) + super() textdomain "firewall" @zone = zone end @@ -94,6 +96,7 @@ class PortsForProtocols < CWM::CustomWidget }.freeze def initialize(zone) + super() textdomain "firewall" @zone = zone end @@ -204,6 +207,7 @@ class ServicesTab < CWM::Tab # @param zone [Y2Firewall::Firewalld::Zone] # @param _pager [CWM::TreePager] def initialize(zone, _pager) + super() textdomain "firewall" @zone = zone diff --git a/src/lib/y2firewall/widgets/pages/zones.rb b/src/lib/y2firewall/widgets/pages/zones.rb index e0b2446d..b3230cca 100644 --- a/src/lib/y2firewall/widgets/pages/zones.rb +++ b/src/lib/y2firewall/widgets/pages/zones.rb @@ -41,6 +41,7 @@ class Zones < CWM::Page # # @param _pager [CWM::TreePager] def initialize(_pager) + super() textdomain "firewall" end diff --git a/src/lib/y2firewall/widgets/proposal.rb b/src/lib/y2firewall/widgets/proposal.rb index 5bffed97..523a629c 100644 --- a/src/lib/y2firewall/widgets/proposal.rb +++ b/src/lib/y2firewall/widgets/proposal.rb @@ -28,6 +28,7 @@ module Widgets # open/close checkbox widgets when the firewall is disable class FirewallSSHProposal < CWM::CustomWidget def initialize(settings) + super() @settings = settings @port_widgets = [Widgets::OpenSSHPort.new(@settings)] @@ -61,6 +62,7 @@ def widgets_term # Enable firewall service checkbox class EnableFirewall < CWM::CheckBox def initialize(settings, widgets) + super() textdomain "firewall" @settings = settings @widgets = widgets @@ -110,6 +112,7 @@ def help # Enable sshd service checkbox class EnableSSHD < CWM::CheckBox def initialize(settings) + super() textdomain "firewall" @settings = settings end @@ -143,6 +146,7 @@ def help # Open ssh port checkbox class OpenSSHPort < CWM::CheckBox def initialize(settings) + super() textdomain "firewall" @settings = settings end @@ -168,6 +172,7 @@ def store # Open vnc port checkbox class OpenVNCPorts < CWM::CheckBox def initialize(settings) + super() textdomain "firewall" @settings = settings end diff --git a/src/lib/y2firewall/widgets/services_table.rb b/src/lib/y2firewall/widgets/services_table.rb index dc989fff..7a5b36e2 100644 --- a/src/lib/y2firewall/widgets/services_table.rb +++ b/src/lib/y2firewall/widgets/services_table.rb @@ -43,6 +43,7 @@ class ServicesTable < ::CWM::Table # # @param services [Array] Services to be displayed def initialize(services: [], widget_id: nil) + super() textdomain "firewall" @services = services self.widget_id = widget_id || "services_table:#{object_id}" diff --git a/src/lib/y2firewall/widgets/zone.rb b/src/lib/y2firewall/widgets/zone.rb index 15cff120..b573e63d 100644 --- a/src/lib/y2firewall/widgets/zone.rb +++ b/src/lib/y2firewall/widgets/zone.rb @@ -27,6 +27,7 @@ class NameWidget < CWM::InputField include Yast::I18n def initialize(zone, disabled: false, existing_names: []) + super() textdomain "firewall" @zone = zone @disabled = disabled @@ -66,6 +67,7 @@ class ShortWidget < CWM::InputField include Yast::I18n def initialize(zone) + super() textdomain "firewall" @zone = zone end @@ -97,6 +99,7 @@ class DescriptionWidget < CWM::InputField include Yast::I18n def initialize(zone) + super() textdomain "firewall" @zone = zone end @@ -125,6 +128,7 @@ def store # target of zone class TargetWidget < CWM::ComboBox def initialize(zone) + super() textdomain "firewall" @zone = zone end @@ -151,6 +155,7 @@ class MasqueradeWidget < CWM::CheckBox include Yast::I18n def initialize(zone) + super() textdomain "firewall" @zone = zone end diff --git a/src/lib/y2firewall/widgets/zone_button.rb b/src/lib/y2firewall/widgets/zone_button.rb index 09df572f..0d99f1f1 100644 --- a/src/lib/y2firewall/widgets/zone_button.rb +++ b/src/lib/y2firewall/widgets/zone_button.rb @@ -25,6 +25,7 @@ module Widgets # ancestor only class for all zone related buttons class ZoneButton < CWM::PushButton def initialize(pager, table) + super() textdomain "firewall" @pager = pager @table = table diff --git a/src/lib/y2firewall/widgets/zone_interfaces_button.rb b/src/lib/y2firewall/widgets/zone_interfaces_button.rb index a175774f..d5ad7278 100644 --- a/src/lib/y2firewall/widgets/zone_interfaces_button.rb +++ b/src/lib/y2firewall/widgets/zone_interfaces_button.rb @@ -27,6 +27,7 @@ module Widgets class ZoneInterfacesButton < CWM::PushButton # Constructor def initialize + super() textdomain "firewall" end diff --git a/src/lib/y2firewall/widgets/zone_options.rb b/src/lib/y2firewall/widgets/zone_options.rb index de89af83..6c7c2922 100644 --- a/src/lib/y2firewall/widgets/zone_options.rb +++ b/src/lib/y2firewall/widgets/zone_options.rb @@ -36,6 +36,7 @@ class ZoneOptions < ::CWM::ComboBox # # @param interface [Y2Firewall::Firewalld::Interface] Interface to act on def initialize(interface) + super() textdomain "firewall" @interface = interface end diff --git a/src/lib/y2firewall/widgets/zones_table.rb b/src/lib/y2firewall/widgets/zones_table.rb index 8c5ee3e2..0eacdf7a 100644 --- a/src/lib/y2firewall/widgets/zones_table.rb +++ b/src/lib/y2firewall/widgets/zones_table.rb @@ -38,6 +38,7 @@ class ZonesTable < ::CWM::Table # @param default_zone_button [Y2Firewall::Widgets::DefaultZoneButton] Button to change # the default zone def initialize(zones, interfaces, default_zone_button) + super() textdomain "firewall" @zones = zones @interfaces = interfaces From e9dbb75d900c06f217c90fbb425154c48a08398e Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 3 Jan 2024 16:33:38 +0100 Subject: [PATCH 3/3] fix wrong super call --- src/lib/y2firewall/widgets/overview_tree_pager.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/y2firewall/widgets/overview_tree_pager.rb b/src/lib/y2firewall/widgets/overview_tree_pager.rb index 2de05ed1..776d7d99 100644 --- a/src/lib/y2firewall/widgets/overview_tree_pager.rb +++ b/src/lib/y2firewall/widgets/overview_tree_pager.rb @@ -36,7 +36,6 @@ class OverviewTreePager < CWM::TreePager # Constructor def initialize - super() textdomain "firewall" @fw = Y2Firewall::Firewalld.instance