From 3554484d2cd127b63c0919d1cf681bf9ffb6c66c Mon Sep 17 00:00:00 2001 From: Angelo Naselli Date: Fri, 24 Apr 2015 11:31:18 +0200 Subject: Removed localization object and used the one in base class --- lib/ManaTools/Module/Clock.pm | 24 ------------------------ lib/ManaTools/Module/DisplayManager.pm | 14 -------------- lib/ManaTools/Module/Firewall.pm | 14 -------------- lib/ManaTools/Module/Hosts.pm | 14 -------------- lib/ManaTools/Module/LogViewer.pm | 14 -------------- lib/ManaTools/Module/Proxy.pm | 14 -------------- lib/ManaTools/Module/Services.pm | 14 -------------- 7 files changed, 108 deletions(-) diff --git a/lib/ManaTools/Module/Clock.pm b/lib/ManaTools/Module/Clock.pm index 7d0b201..3022591 100644 --- a/lib/ManaTools/Module/Clock.pm +++ b/lib/ManaTools/Module/Clock.pm @@ -69,30 +69,6 @@ has '+icon' => ( default => "/usr/share/mcc/themes/default/time-mdk.png", ); -has 'loc' => ( - is => 'rw', - init_arg => undef, - builder => '_localeInitialize' -); - -sub _localeInitialize { - my $self = shift; - - my $cmdline = new yui::YCommandLine; - my $locale_dir = undef; - my $pos = $cmdline->find("--locales-dir"); - if ($pos > 0) - { - $locale_dir = $cmdline->arg($pos+1); - } - $self->loc( - ManaTools::Shared::Locales->new( - domain_name => 'manatools', - dir_name => $locale_dir, - ) - ); -} - has 'sh_gui' => ( is => 'rw', lazy => 1, diff --git a/lib/ManaTools/Module/DisplayManager.pm b/lib/ManaTools/Module/DisplayManager.pm index 39aa617..a068767 100644 --- a/lib/ManaTools/Module/DisplayManager.pm +++ b/lib/ManaTools/Module/DisplayManager.pm @@ -85,12 +85,6 @@ has 'sh_gui' => ( builder => '_SharedUGUIInitialize' ); -has 'loc' => ( - is => 'rw', - init_arg => undef, - builder => '_localeInitialize' -); - sub _build_desc_for_i18n { my $self = shift(); @@ -116,14 +110,6 @@ sub _build_dmlist { return \@list; } -sub _localeInitialize { - my $self = shift(); - - # TODO fix domain binding for translation - $self->loc(ManaTools::Shared::Locales->new(domain_name => 'drakdm') ); - # TODO if we want to give the opportunity to test locally add dir_name => 'path' -} - sub _SharedUGUIInitialize { my $self = shift(); diff --git a/lib/ManaTools/Module/Firewall.pm b/lib/ManaTools/Module/Firewall.pm index 046841c..e534ca9 100644 --- a/lib/ManaTools/Module/Firewall.pm +++ b/lib/ManaTools/Module/Firewall.pm @@ -73,12 +73,6 @@ has 'sh_gui' => ( builder => '_SharedUGUIInitialize' ); -has 'loc' => ( - is => 'rw', - init_arg => undef, - builder => '_localeInitialize', - required => 1, -); has 'all_servers' => ( is => 'rw', @@ -151,14 +145,6 @@ sub _setupAboutDialog { }; } -sub _localeInitialize { - my $self = shift(); - - # TODO fix domain binding for translation - $self->loc(ManaTools::Shared::Locales->new(domain_name => 'drakx-net') ); - # TODO if we want to give the opportunity to test locally add dir_name => 'path' -} - sub _SharedUGUIInitialize { my $self = shift(); diff --git a/lib/ManaTools/Module/Hosts.pm b/lib/ManaTools/Module/Hosts.pm index faae3f0..b2576c2 100644 --- a/lib/ManaTools/Module/Hosts.pm +++ b/lib/ManaTools/Module/Hosts.pm @@ -72,20 +72,6 @@ has 'sh_gui' => ( builder => '_SharedUGUIInitialize' ); -has 'loc' => ( - is => 'rw', - init_arg => undef, - builder => '_localeInitialize' -); - -sub _localeInitialize { - my $self = shift(); - - # TODO fix domain binding for translation - $self->loc(ManaTools::Shared::Locales->new(domain_name => 'drakx-net') ); - # TODO if we want to give the opportunity to test locally add dir_name => 'path' -} - sub _SharedUGUIInitialize { my $self = shift(); diff --git a/lib/ManaTools/Module/LogViewer.pm b/lib/ManaTools/Module/LogViewer.pm index e009c1c..1c7dbe3 100644 --- a/lib/ManaTools/Module/LogViewer.pm +++ b/lib/ManaTools/Module/LogViewer.pm @@ -73,20 +73,6 @@ has '+icon' => ( default => "/usr/share/mcc/themes/default/logdrake-mdk.png", ); -has 'loc' => ( - is => 'rw', - init_arg => undef, - builder => '_localeInitialize' -); - -sub _localeInitialize { - my $self = shift; - - # TODO fix domain binding for translation - $self->loc(ManaTools::Shared::Locales->new(domain_name => 'libDrakX-standalone') ); - # TODO if we want to give the opportunity to test locally add dir_name => 'path' -} - has 'sh_gui' => ( is => 'rw', init_arg => undef, diff --git a/lib/ManaTools/Module/Proxy.pm b/lib/ManaTools/Module/Proxy.pm index ff2af3e..8320f2b 100644 --- a/lib/ManaTools/Module/Proxy.pm +++ b/lib/ManaTools/Module/Proxy.pm @@ -78,20 +78,6 @@ has 'sh_gui' => ( builder => '_SharedUGUIInitialize' ); -has 'loc' => ( - is => 'rw', - init_arg => undef, - builder => '_localeInitialize' -); - - -sub _localeInitialize { - my $self = shift(); - - # TODO fix domain binding for translation - $self->loc(ManaTools::Shared::Locales->new(domain_name => 'drakx-net') ); - # TODO if we want to give the opportunity to test locally add dir_name => 'path' -} sub _SharedUGUIInitialize { my $self = shift(); diff --git a/lib/ManaTools/Module/Services.pm b/lib/ManaTools/Module/Services.pm index dca0c0c..b54bfba 100644 --- a/lib/ManaTools/Module/Services.pm +++ b/lib/ManaTools/Module/Services.pm @@ -149,20 +149,6 @@ sub _SharedServicesInitialize { } -has 'loc' => ( - is => 'rw', - init_arg => undef, - builder => '_localeInitialize' -); - -sub _localeInitialize { - my $self = shift(); - - # TODO fix domain binding for translation - $self->loc(ManaTools::Shared::Locales->new(domain_name => 'libDrakX-standalone') ); - # TODO if we want to give the opportunity to test locally add dir_name => 'path' -} - =head1 VERSION Version 1.0.0 -- cgit v1.2.1