Changeset 11065

Timestamp:

03/11/10 04:27:22 (2 years ago)

Author:

Sewi

Message:

Add untranslatable language codes/names to Wx/Menu/View?.pm
DEVELOPERS: PLEASE ADD YOUR LANGUAGE AS YOU WRITE IT LOCALLY TO THE TOP OF THIS FILE!

Location:

trunk/Padre

Files:

• Changes (modified) (1 diff)
• lib/Padre/Locale.pm (modified) (2 diffs)
• lib/Padre/Wx/Menu/View.pm (modified) (2 diffs)

trunk/Padre/Changes

@@ -13 +13 @@
       34.1meg to 20meg with a reduction in total memory use for a
       typical user of about 20% (ADAMK)
+    - Add language names/translated texts to select_language list (SEWI)
 
 0.58 2010.03.08

trunk/Padre/lib/Padre/Locale.pm

@@ -475 +475 @@
 sub rfc4646 {
     my $config = Padre::Config->read;
-    my $locale = $config->locale;
+    my $locale = $#_ >= 1 ? $_[1] : $config->locale;
 
     if ( $locale and not $RFC4646{$locale} ) {
@@ -507 +507 @@
 # and returns the relevant Wx::Locale object.
 sub object {
-    my $id     = rfc4646();
+    my $langcode = shift;
+    undef $langcode if ref($langcode);
+    my $id     = rfc4646(@_);
     my $lang   = $RFC4646{$id}->{wxid};
-    my $locale = Wx::Locale->new($lang);
+    my $locale = Wx::Locale->new($langcode);
     $locale->AddCatalogLookupPathPrefix( Padre::Util::sharedir('locale') );
     unless ( $locale->IsLoaded($id) ) {

trunk/Padre/lib/Padre/Wx/Menu/View.pm

@@ -28 +28 @@
 );
 
-
+my %lang_labels = (
+    'de'    => 'Deutsch',
+);
 
 
@@ -295 +297 @@
         }
 
+        my $langobj = Padre::Locale::object($name);
+        $label .= ' ('.($lang_labels{$name} || $name).')';
+
         my $radio = $self->add_radio_menu_item(
             $self->{language},