Changeset 11075

Timestamp:

03/11/10 12:39:08 (2 years ago)

Author:

szabgab

Message:

use the utf8text to display on the menu - but it shows up broken

Location:

trunk/Padre/lib/Padre

Files:

• Locale.pm (modified) (1 diff)
• Wx/Menu/View.pm (modified) (1 diff)

trunk/Padre/lib/Padre/Locale.pm

@@ -64 +64 @@
 # file:///usr/share/xml/iso-codes/iso_639.xml
 # http://pkg-isocodes.alioth.debian.org/
-my %lang_labels = (
-    'de'    => 'Deutsch',
-);
+#my %lang_labels = (
+#   'de'    => 'Deutsch',
+#);
 
 sub label {
     my $name = shift;
-    return $lang_labels{$name} || $name
+    return $RFC4646{$name}{utf8text} || $name
 }
 

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

@@ -295 +295 @@
 
         my $langobj = Padre::Locale::object($name);
-        $label .= ' (' . Padre::Locale::label($name) . ')';
+        my $utf8txt = ' (' . Padre::Locale::label($name) . ')';
 
         my $radio = $self->add_radio_menu_item(
             $self->{language},
             name       => $tag,
-            label      => $label,
-            comment    => sprintf( Wx::gettext('Switch menus to %s'), $label ),
+            label      => $label . $utf8txt,
+            comment    => sprintf( Wx::gettext('Switch menus to %s'), $label ) . $utf8txt,
             menu_event => sub {
                 $_[0]->change_locale($name);