Changeset 20899

Timestamp:

10/07/08 17:58:06 (3 months ago)

Author:

yappo

Message:

s/flavour/flavor/g

Files:

• lang/perl/Module-Setup/trunk/lib/Module/Setup.pm (modified) (3 diffs)

lang/perl/Module-Setup/trunk/lib/Module/Setup.pm

@@ -57 +57 @@
     }
 
-    $options->{flavor}       ||= $self->select_flavour;
+    $options->{flavor}       ||= $self->select_flavor;
     $options->{flavor_class} ||= 'Default';
 
@@ -74 +74 @@
     $options->{module} = shift @argv;
     $options->{flavor} = shift @argv if @argv;
-    $options->{flavor} ||= $self->select_flavour;
+    $options->{flavor} ||= $self->select_flavor;
 
     if ($options->{pack}) {
@@ -456 +456 @@
 }
 
-sub select_flavour {
+sub select_flavor {
     my $self     = shift;
     return 'default' unless -d $self->module_setup_dir('flavors');
 
-    my $flavours = $self->_collect_flavours;
-    $self->_show_flavours_list($flavours);
-
-    my $selected = prompt( "Select flavour:", 1 );
-    $flavours->[ $selected - 1 ] || 'default';
-}
-
-sub _collect_flavours {
+    my $flavors = $self->_collect_flavors;
+    $self->_show_flavors_list($flavors);
+
+    my $selected = prompt( "Select flavor:", 1 );
+    $flavors->[ $selected - 1 ] || 'default';
+}
+
+sub _collect_flavors {
     my $self         = shift;
-    my $flavours_dir = $self->module_setup_dir('flavors');
-    my $flavours     = [];
-    for my $flavour ( $flavours_dir->children ) {
-        if ( $flavour->is_dir ) {
-            my $flavour_name = pop @{ $flavour->{dirs} };
-            push @$flavours, $flavour_name;
-        }
-    }
-    $flavours;
-}
-
-sub _show_flavours_list {
-    my ( $self, $flavours ) = @_;
-    for ( 1 .. @$flavours ) {
-        my $flavour = $flavours->[ $_ - 1 ];
-        print sprintf "[%d]: %s", $_, $flavour . "\n";
+    my $flavors_dir = $self->module_setup_dir('flavors');
+    my $flavors     = [];
+    for my $flavor ( $flavors_dir->children ) {
+        if ( $flavor->is_dir ) {
+            my $flavor_name = pop @{ $flavor->{dirs} };
+            push @$flavors, $flavor_name;
+        }
+    }
+    $flavors;
+}
+
+sub _show_flavors_list {
+    my ( $self, $flavors ) = @_;
+    for ( 1 .. @$flavors ) {
+        my $flavor = $flavors->[ $_ - 1 ];
+        print sprintf "[%d]: %s", $_, $flavor . "\n";
     }
 }