From ae3444104b5e0266d8084fad6bd48707ba4a1e15 Mon Sep 17 00:00:00 2001 From: Angelo Naselli Date: Fri, 24 Apr 2015 11:39:21 +0200 Subject: Added the availability to use --locales-dir --- lib/ManaTools/Shared/GUI.pm | 19 ++++++++++++++----- lib/ManaTools/Shared/Services.pm | 18 ++++++++++++++---- lib/ManaTools/Shared/TimeZone.pm | 17 +++++++++++++---- lib/ManaTools/Shared/Users.pm | 18 ++++++++++++++---- 4 files changed, 55 insertions(+), 17 deletions(-) diff --git a/lib/ManaTools/Shared/GUI.pm b/lib/ManaTools/Shared/GUI.pm index 6c6144d..ae67c3b 100644 --- a/lib/ManaTools/Shared/GUI.pm +++ b/lib/ManaTools/Shared/GUI.pm @@ -70,14 +70,23 @@ has 'loc' => ( ); sub _localeInitialize { - my $self = shift(); + 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' + 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, + ) + ); } - #============================================================= =head2 warningMsgBox diff --git a/lib/ManaTools/Shared/Services.pm b/lib/ManaTools/Shared/Services.pm index c0f06c5..0c33fd4 100644 --- a/lib/ManaTools/Shared/Services.pm +++ b/lib/ManaTools/Shared/Services.pm @@ -78,11 +78,21 @@ has 'loc' => ( sub _localeInitialize { - my $self = shift(); + my $self = shift; - # TODO fix domain binding for translation - $self->loc(ManaTools::Shared::Locales->new(domain_name => 'libDrakX') ); - # TODO if we want to give the opportunity to test locally add dir_name => 'path' + 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, + ) + ); } diff --git a/lib/ManaTools/Shared/TimeZone.pm b/lib/ManaTools/Shared/TimeZone.pm index 936515b..a380a69 100644 --- a/lib/ManaTools/Shared/TimeZone.pm +++ b/lib/ManaTools/Shared/TimeZone.pm @@ -345,12 +345,21 @@ has 'loc' => ( sub _localeInitialize { my $self = shift; - # TODO fix domain binding for translation - $self->loc(ManaTools::Shared::Locales->new(domain_name => 'libDrakX') ); - # TODO if we want to give the opportunity to test locally add dir_name => 'path' + 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 'ntp_servers' => ( traits => ['Hash'], is => 'rw', diff --git a/lib/ManaTools/Shared/Users.pm b/lib/ManaTools/Shared/Users.pm index 83c6061..d9091fb 100644 --- a/lib/ManaTools/Shared/Users.pm +++ b/lib/ManaTools/Shared/Users.pm @@ -116,11 +116,21 @@ has 'loc' => ( sub _localeInitialize { - my $self = shift(); + my $self = shift; - # TODO fix domain binding for translation - $self->loc(ManaTools::Shared::Locales->new(domain_name => 'userdrake') ); - # TODO if we want to give the opportunity to test locally add dir_name => 'path' + 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, + ) + ); } ## Used by USER (for getting values? TODO need explanations, where?) -- cgit v1.2.1