Changeset 2296

Timestamp:

12/30/08 18:29:52 (3 years ago)

Author:

adamk

Message:

Clarifying what the languages() sub was for

Location:

trunk/Padre/lib/Padre

Files:

• Locale.pm (modified) (2 diffs)
• Wx/Menu/View.pm (modified) (8 diffs)

trunk/Padre/lib/Padre/Locale.pm

@@ -191 +191 @@
 my %NUMBER = reverse %SHORTNAME;
 
-# LANGUAGES hash needs to be here in order
-# the get the run-time language change for these words too.
-my %LANGUAGES = (
+# The list of languages that should be shown in the language menu
+# and the strings that should be used to label them.
+sub menu_view_languages {
     ar => Wx::gettext('Arabic'),
     de => Wx::gettext('German'),
@@ -206 +206 @@
     pt => Wx::gettext('Portuguese'), # Actually brazilian, which is a bug
         es => Wx::gettext('Spanish'),
-);
-
-# TODO: The need for direct access to the table indicates a failure
-#       on the part of Padre::Locale to provide sufficiently useful
-#       functions. Second-generation locale support has data that is
-#       too complex to be reasonably useful to external consumers, so
-#       we need to fix that by providing more direct functions.
-sub languages {
-    return %LANGUAGES;
 }
 

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

@@ -21 +21 @@
 
 sub new {
-    my $class = shift;
-    my $main  = shift;
+    my $class  = shift;
+    my $main   = shift;
+    my $config = Padre->ide->config;
 
     # Create the empty menu as normal
@@ -190 +191 @@
 
 
+
     # Font Size
     Wx::Event::EVT_MENU( $main,
@@ -245 +247 @@
     $self->AppendSeparator;
 
-    my $config    = Padre->ide->config;
+
+
+
 
     # Styles (temporary location?)
@@ -253 +257 @@
         $self->{style}
     );
-    my %styles    = (default => 'Default', night => 'Night');
+    my %styles = ( default => 'Default', night => 'Night' );
     foreach my $name ( sort { $styles{$a} cmp $styles{$b} }  keys %styles) {
         my $label = $styles{$name};
@@ -269 +273 @@
 
 
+
+
+
     # Language Support
     $self->{language} = Wx::Menu->new;
@@ -284 +291 @@
     $self->{language}->AppendSeparator;
 
-    my %languages = Padre::Locale::languages();
+    my %languages = Padre::Locale::menu_view_languages();
     foreach my $name ( sort { $languages{$a} cmp $languages{$b} }  keys %languages) {
         my $label = $languages{$name};
         if ( $label eq 'English' ) {
+            # NOTE: A dose of fun in a mostly boring application.
+            # With more Padre developers, more countries, and more
+            # people in total British English instead of American
+            # English CLEARLY it is a FAR better default for us to
+            # use.
+            # Because it's something of an in joke to English
+            # speakers, non-English localisations do NOT show this.
             $label = "English (New Britstralian)";
         }
 
         my $radio = $self->{language}->AppendRadioItem( -1, $label );
-        if ( $config->{host}->{locale} and $config->{host}->{locale} eq $name ) {
-            $radio->Check(1);
-        }
         Wx::Event::EVT_MENU( $main,
             $radio,
@@ -301 +312 @@
             },
         );
+        if ( $config->{host}->{locale} and $config->{host}->{locale} eq $name ) {
+            $radio->Check(1);
+        }
     }
 
@@ -312 +326 @@
     Wx::Event::EVT_MENU( $main,
         $self->Append( -1,
-            Wx::gettext("&Full screen\tF11")
+            Wx::gettext("&Full Screen\tF11")
         ),
         sub {