From: Tom Hughes <tom@compton.nu>
Date: Tue, 21 Jul 2009 09:51:33 +0000 (+0000)
Subject: Use File::Basename instead of having our own half-arsed version.
X-Git-Tag: live~6839
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e82496a9e5d68b4d60a513c24b8ae2dbc50359d6

Use File::Basename instead of having our own half-arsed version.
---

diff --git a/script/locale/diff b/script/locale/diff
index 0335fe983..228fe356b 100755
--- a/script/locale/diff
+++ b/script/locale/diff
@@ -6,6 +6,7 @@ use YAML::Syck qw(LoadFile);
 use Test::Differences;
 use Pod::Usage ();
 use Getopt::Long ();
+use File::Basename qw(fileparse);
 
 =head1 NAME
 
@@ -101,8 +102,8 @@ my ($from, $to) = @ARGV;
 my $from_data = LoadFile($from);
 my $to_data   = LoadFile($to);
 
-my $from_parsed = { iterate($from_data->{basename($from)}) };
-my $to_parsed = { iterate($to_data->{basename($to)}) };
+my $from_parsed = { iterate($from_data->{fileparse($from, qr/\.[^.]*/)}) };
+my $to_parsed = { iterate($to_data->{fileparse($to, qr/\.[^.]*/)}) };
 
 if ($keys)
 {
@@ -114,7 +115,7 @@ elsif ($untranslated_values or $untranslated_values_all)
 
     # Prune according to blacklist
     if ($untranslated_values) {
-        @untranslated = prune_untranslated_with_blacklist(basename($to), @untranslated);
+        @untranslated = prune_untranslated_with_blacklist(fileparse($to, qr/\.[^.]*/), @untranslated);
     }
 
     say for @untranslated;
@@ -217,13 +218,6 @@ sub iterate
     return @ret;
 }
 
-sub basename
-{
-    my $name = shift;
-    $name =~ s[\..*?$][];
-    $name;
-}
-
 sub help
 {
     my %arg = @_;