Changeset 857

Timestamp:

11/09/08 13:08:48 (3 years ago)

Author:

szabgab

Message:

fix the language selection code to also pass the tests

File:

• trunk/lib/Padre/Wx/MainWindow.pm (modified) (4 diffs)

trunk/lib/Padre/Wx/MainWindow.pm

@@ -29 +29 @@
 
 
+my %shortname_of = (
+    58 => 'en',
+    87 => 'de',
+);
+my %number_of = reverse %shortname_of;
 
 
@@ -41 +46 @@
     Wx::InitAllImageHandlers();
     
-    $config->{host}->{locale} || Wx::Locale::GetSystemLanguage; 
+    $config->{host}->{locale} ||= 
+        $shortname_of{ Wx::Locale::GetSystemLanguage } || $shortname_of{ 'en' };
 
     Wx::Log::SetActiveTarget( Wx::LogStderr->new );
@@ -76 +82 @@
     );
 
-    $self->set_locale( $config->{host}->{locale} );
+    $self->set_locale( );
 
     $self->{manager} = Wx::AuiManager->new;
@@ -341 +347 @@
 sub set_locale {
     my $self = shift;
-    my $shortname = shift;
-
-    my %map = (
-        en => 58,
-        de => 87,
-    );
-    my $lang = $map{$shortname};
-
+
+    my $config = Padre->ide->config;
+    my $shortname = $config->{host}->{locale};
+    my $lang = $number_of{ $shortname };
     $self->{locale} = Wx::Locale->new($lang);
     $self->{locale}->AddCatalogLookupPathPrefix( Padre::Wx::sharedir('locale') );