cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2009-07-21 09:51:33 +00:00
parent da96c7f674
commit e82496a9e5
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
script/locale/diff
View file

@ -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 = @_;