Changeset 855

Timestamp:

11/09/08 12:33:55 (3 years ago)

Author:

szabgab

Message:

allow switching between German and English

Location:

trunk

Files:

• Changes (modified) (2 diffs)
• lib/Padre/Document.pm (modified) (1 diff)
• lib/Padre/Wx/MainWindow.pm (modified) (4 diffs)
• lib/Padre/Wx/Menu.pm (modified) (1 diff)

trunk/Changes

@@ -7 +7 @@
        Tab reordering
        Tab close button
-    Localization and German translation. (Heiko Jansen)
+    Localization and German translation. (HJANSEN)
     Move the content of Padre::Wx::Dialog to Wx::Perl::Dialog 0.02 (SZABGAB)
     Chanage back the new-file hot-key to be Ctr-N again. (SZABGAB)
@@ -17 +17 @@
     Also put cut/copy/paste/select all in the edit menu and in the right click menu. (HJANSEN)
     Move Parrot plugin to separate distribution. (SZABGAB)
+    Enable swictching between German and English. (SZABGAB)
 
 0.15 2008.11.02

trunk/lib/Padre/Document.pm

@@ -356 +356 @@
     };
     if ($@) {
-        return "Could not save: $!";
+        return "Could not save: $@";
     }
     $self->{_timestamp} = $self->time_on_file;

trunk/lib/Padre/Wx/MainWindow.pm

@@ -41 +41 @@
     Wx::InitAllImageHandlers();
     
+    $config->{host}->{locale} || Wx::Locale::GetSystemLanguage; 
+
     Wx::Log::SetActiveTarget( Wx::LogStderr->new );
     #Wx::LogMessage( 'Start');
@@ -74 +76 @@
     );
 
-    # config param has to be ID, not name (e.g.: 87 for 'de'); TODO change this 
-    $self->refresh_locale( $config->{host}->{locale} );
+    $self->set_locale( $config->{host}->{locale} );
 
     $self->{manager} = Wx::AuiManager->new;
@@ -316 +317 @@
 
     my $doc  = $self->selected_document;
-    $self->refresh_locale;
     $self->refresh_menu;
     $self->refresh_toolbar;
@@ -330 +330 @@
 }
 
-sub refresh_locale {
+    
+sub change_locale {
+    my ($self, $shortname) = @_;
+    my $config = Padre->ide->config;
+    $config->{host}->{locale} = $shortname;
+    $self->message( 'Currently you have to restart Padre for the language change to take effect' );
+    return;
+}
+
+sub set_locale {
     my $self = shift;
-    my $lang = shift || Wx::Locale::GetSystemLanguage;
-
-    $self->{'locale'} = undef;
-
-    $self->{'locale'} = Wx::Locale->new($lang);
-    $self->{'locale'}->AddCatalogLookupPathPrefix( Padre::Wx::sharedir('locale') );
-    my $langname = $self->{'locale'}->GetCanonicalName();
-
-    my $shortname = $langname ? substr( $langname, 0, 2 ) : 'en'; # only providing default sublangs
+    my $shortname = shift;
+
+    my %map = (
+        en => 58,
+        de => 87,
+    );
+    my $lang = $map{$shortname};
+
+    $self->{locale} = Wx::Locale->new($lang);
+    $self->{locale}->AddCatalogLookupPathPrefix( Padre::Wx::sharedir('locale') );
+    my $langname = $self->{locale}->GetCanonicalName();
+
+    #my $shortname = $langname ? substr( $langname, 0, 2 ) : 'en'; # only providing default sublangs
     my $filename = Padre::Wx::sharefile( 'locale', $shortname ) . '.mo';
 
-    $self->{'locale'}->AddCatalog($shortname) if -f $filename;
+    $self->{locale}->AddCatalog($shortname) if -f $filename;
 
     return;

trunk/lib/Padre/Wx/Menu.pm

@@ -357 +357 @@
     );
 
-
+    $menu->{view}->AppendSeparator;
+    $menu->{view_language} = Wx::Menu->new;
+    $menu->{view}->Append( -1, gettext("Language"), $menu->{view_language} );
+    
+    # TODO horrible, fix this
+    if ($config->{host}->{locale} eq 'en') {
+        Wx::Event::EVT_MENU( $win,
+            $menu->{view_language}->AppendRadioItem( -1, gettext("English") ),
+            sub { $_[0]->change_locale('en') },
+        );
+        Wx::Event::EVT_MENU( $win,
+            $menu->{view_language}->AppendRadioItem( -1, gettext("German") ),
+            sub { $_[0]->change_locale('de') },
+        );
+    } else {
+        Wx::Event::EVT_MENU( $win,
+            $menu->{view_language}->AppendRadioItem( -1, gettext("German") ),
+            sub { $_[0]->change_locale('de') },
+        );
+        Wx::Event::EVT_MENU( $win,
+            $menu->{view_language}->AppendRadioItem( -1, gettext("English") ),
+            sub { $_[0]->change_locale('en') },
+        );
+    }
 
     # Create the Perl menu