]> git.donarmstrong.com Git - deb_pkgs/libhtml-calendarmonth-perl.git/commitdiff
Merge tag 'upstream/2.04'
authorDon Armstrong <don@donarmstrong.com>
Tue, 21 Jun 2016 03:31:42 +0000 (20:31 -0700)
committerDon Armstrong <don@donarmstrong.com>
Tue, 21 Jun 2016 03:31:42 +0000 (20:31 -0700)
Upstream version 2.04

21 files changed:
LICENSE
MANIFEST
META.json
META.yml [new file with mode: 0644]
Makefile.PL
README
lib/HTML/CalendarMonth.pm
lib/HTML/CalendarMonth/DateTool.pm
lib/HTML/CalendarMonth/Locale.pm
t/00_basic.t [changed mode: 0755->0644]
t/01_autodetect.t [changed mode: 0755->0644]
t/02_timelocal.t [changed mode: 0755->0644]
t/03_datetime.t [changed mode: 0755->0644]
t/04_datemanip.t [changed mode: 0755->0644]
t/05_datecalc.t [changed mode: 0755->0644]
t/06_cal.t [changed mode: 0755->0644]
t/20_i8n.t [changed mode: 0755->0644]
t/dat/i8n.dat
t/dat/i8n_leg1.dat [new file with mode: 0644]
t/dat/i8n_leg2.dat [new file with mode: 0644]
t/testload.pm

diff --git a/LICENSE b/LICENSE
index e2cf05c2a535226e8ace6116a5b6d1d32965d102..6daf4917dca7825e82a8cf0fea66ced151bd295b 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,3 @@
-This software is copyright (c) 2011 by Matthew Sisk.
-
 This is free software; you can redistribute it and/or modify it under
 the same terms as the Perl 5 programming language system itself.
 
@@ -12,8 +10,6 @@ b) the "Artistic License"
 
 --- The GNU General Public License, Version 1, February 1989 ---
 
-This software is Copyright (c) 2011 by Matthew Sisk.
-
 This is free software, licensed under:
 
   The GNU General Public License, Version 1, February 1989
@@ -272,8 +268,6 @@ That's all there is to it!
 
 --- The Artistic License 1.0 ---
 
-This software is Copyright (c) 2011 by Matthew Sisk.
-
 This is free software, licensed under:
 
   The Artistic License 1.0
index 88af1422b9d0f5d6948e410a0ca890f62a633235..c97b9f198f760831922f07a33059b298a41cecda 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,12 +1,8 @@
 Changes
 LICENSE
 MANIFEST
-MANIFEST.SKIP
-META.json
 Makefile.PL
 README
-bs.pm
-dist.ini
 lib/HTML/CalendarMonth.pm
 lib/HTML/CalendarMonth/DateTool.pm
 lib/HTML/CalendarMonth/DateTool/Cal.pm
@@ -26,13 +22,14 @@ t/06_cal.t
 t/07_ncal.t
 t/20_i8n.t
 t/21_narrow.t
-t/author-critic.t
 t/dat/bulk.dat
 t/dat/head.dat
 t/dat/i8n.dat
+t/dat/i8n_leg1.dat
+t/dat/i8n_leg2.dat
 t/dat/narrow.dat
 t/dat/odd.dat
 t/dat/woy.dat
-t/release-pod-coverage.t
-t/release-pod-syntax.t
 t/testload.pm
+META.yml                                 Module YAML meta-data (added by MakeMaker)
+META.json                                Module JSON meta-data (added by MakeMaker)
index f73c0d840c1f011281b9cbf348ffd318d874113c..68f053c72f123cbf01ac9b8ac065205b16ce1b28 100644 (file)
--- a/META.json
+++ b/META.json
@@ -1,51 +1,45 @@
 {
-   "abstract" : "Generate and manipulate HTML calendar months",
+   "abstract" : "unknown",
    "author" : [
-      "Matthew P. Sisk <msisk@cpan.org>"
+      "unknown"
    ],
-   "dynamic_config" : 0,
-   "generated_by" : "Dist::Zilla version 4.300000, CPAN::Meta::Converter version 2.112150",
+   "dynamic_config" : 1,
+   "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921",
    "license" : [
-      "perl_5"
+      "unknown"
    ],
    "meta-spec" : {
       "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
       "version" : "2"
    },
    "name" : "HTML-CalendarMonth",
+   "no_index" : {
+      "directory" : [
+         "t",
+         "inc"
+      ]
+   },
    "prereqs" : {
+      "build" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
       "configure" : {
          "requires" : {
-            "ExtUtils::MakeMaker" : "6.30"
+            "ExtUtils::MakeMaker" : "0"
          }
       },
       "runtime" : {
          "requires" : {
-            "Carp" : 0,
-            "Class::Accessor" : 0,
+            "Class::Accessor" : "0",
             "DateTime::Locale" : "0.45",
-            "File::Which" : 0,
+            "File::Which" : "0",
             "HTML::ElementTable" : "1.18",
-            "Time::Local" : 0,
-            "base" : 0,
-            "constant" : 0,
-            "strict" : 0,
-            "warnings" : 0
-         }
-      },
-      "test" : {
-         "requires" : {
-            "Cwd" : 0,
-            "English" : 0,
-            "Exporter" : 0,
-            "File::Spec" : 0,
-            "FindBin" : 0,
-            "Test::More" : 0,
-            "vars" : 0
+            "Time::Local" : "0"
          }
       }
    },
    "release_status" : "stable",
-   "version" : "1.26"
+   "version" : "2.04"
 }
-
diff --git a/META.yml b/META.yml
new file mode 100644 (file)
index 0000000..357f2f9
--- /dev/null
+++ b/META.yml
@@ -0,0 +1,26 @@
+---
+abstract: unknown
+author:
+  - unknown
+build_requires:
+  ExtUtils::MakeMaker: 0
+configure_requires:
+  ExtUtils::MakeMaker: 0
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.120921'
+license: unknown
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: 1.4
+name: HTML-CalendarMonth
+no_index:
+  directory:
+    - t
+    - inc
+requires:
+  Class::Accessor: 0
+  DateTime::Locale: 0.45
+  File::Which: 0
+  HTML::ElementTable: 1.18
+  Time::Local: 0
+version: 2.04
index a682cfc8dff4fdfb508b54e0971326378f4abd49..a31e06a9c2130122769332936bda9c0baa713796 100644 (file)
@@ -1,68 +1,18 @@
-
 use strict;
 use warnings;
 
+use ExtUtils::MakeMaker;
 
-
-use ExtUtils::MakeMaker 6.30;
-
-
-
-my %WriteMakefileArgs = (
-  "ABSTRACT" => "Generate and manipulate HTML calendar months",
-  "AUTHOR" => "Matthew P. Sisk <msisk\@cpan.org>",
-  "BUILD_REQUIRES" => {
-    "Cwd" => 0,
-    "English" => 0,
-    "Exporter" => 0,
-    "File::Spec" => 0,
-    "FindBin" => 0,
-    "Test::More" => 0,
-    "vars" => 0
-  },
-  "CONFIGURE_REQUIRES" => {
-    "ExtUtils::MakeMaker" => "6.30"
-  },
-  "DISTNAME" => "HTML-CalendarMonth",
-  "EXE_FILES" => [],
-  "LICENSE" => "perl",
-  "NAME" => "HTML::CalendarMonth",
-  "PREREQ_PM" => {
-    "Carp" => 0,
-    "Class::Accessor" => 0,
-    "DateTime::Locale" => "0.45",
-    "File::Which" => 0,
+my %prereq_pm = (
+    "Class::Accessor"    => 0,
+    "DateTime::Locale"   => "0.45",
+    "File::Which"        => 0,
     "HTML::ElementTable" => "1.18",
-    "Time::Local" => 0,
-    "base" => 0,
-    "constant" => 0,
-    "strict" => 0,
-    "warnings" => 0
-  },
-  "VERSION" => "1.26",
-  "test" => {
-    "TESTS" => "t/*.t"
-  }
+    "Time::Local"        => 0,
 );
 
-
-unless ( eval { ExtUtils::MakeMaker->VERSION(6.56) } ) {
-  my $br = delete $WriteMakefileArgs{BUILD_REQUIRES};
-  my $pp = $WriteMakefileArgs{PREREQ_PM};
-  for my $mod ( keys %$br ) {
-    if ( exists $pp->{$mod} ) {
-      $pp->{$mod} = $br->{$mod} if $br->{$mod} > $pp->{$mod};
-    }
-    else {
-      $pp->{$mod} = $br->{$mod};
-    }
-  }
-}
-
-delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
-  unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
-
-WriteMakefile(%WriteMakefileArgs);
-
-
-
+WriteMakefile(
+  NAME         => 'HTML-CalendarMonth',
+  VERSION_FROM => 'lib/HTML/CalendarMonth.pm',
+  PREREQ_PM    => \%prereq_pm,
+);
diff --git a/README b/README
index d64588d9c7b85b1dd4963dbe02bf6ec176db944c..14468ce933d8f24db30990d5853d44fac4482926 100644 (file)
--- a/README
+++ b/README
@@ -66,6 +66,6 @@ W. for some helpful bug spotting.
 
 COPYRIGHT
 
-Copyright (c) 1999-2010 Matthew P. Sisk. All rights reserved. All wrongs
+Copyright (c) 1999-2015 Matthew P. Sisk. All rights reserved. All wrongs
 revenged. This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
index 6014d60488d141c60aaa807697f013878006cf27..20cb8ea02260e7e51959205595cfce9fff8086c0 100644 (file)
@@ -1,6 +1,6 @@
 package HTML::CalendarMonth;
 {
-  $HTML::CalendarMonth::VERSION = '1.26';
+  $HTML::CalendarMonth::VERSION = '2.04';
 }
 
 use strict;
@@ -51,7 +51,6 @@ my %Calmonth_Attrs = (
   _ctoih    => {},
   _caltool  => undef,
   _weeknums => undef,
-  _today    => undef,
 
   dow1st   => undef,
   lastday  => undef,
@@ -596,7 +595,7 @@ sub first_week_row { FWR };
 
 sub past_days {
   my $self  = shift;
-  my $today = $self->_today;
+  my $today = $self->today;
   if ($today < 0) {
     return $self->days;
   }
@@ -608,7 +607,7 @@ sub past_days {
 
 sub future_days {
   my $self  = shift;
-  my $today = $self->_today;
+  my $today = $self->today;
   if ($today < 0) {
     return;
   }
@@ -907,8 +906,7 @@ sub new {
 
   my $dom_now = defined $attrs{today} ? $dt->_dom_now(delete $attrs{today})
                                       : $dt->_dom_now;
-  $self->_today($dom_now);
-  $self->today($dom_now) if $dom_now > 0;
+  $self->today($dom_now);
 
   my $alias = $attrs{alias} || {};
   if ($self->full_days < 0) {
@@ -971,14 +969,10 @@ HTML::CalendarMonth - Generate and manipulate HTML calendar months
  my $c2 = HTML::CalendarMonth->new(
    month  => 8,
    year   => 2010,
-   locale => 'zu_ZA'
+   locale => 'zu-ZA'
  );
  print $c2->as_HTML;
 
- # Full locale support via DateTime::Locale
- $c3 = HTML::CalendarMonth->new( month => 8, year => 79, locale => 'fr' );
- print $c3->as_HTML
-
  # HTML-Tree integration
  my $tree = HTML::TreeBuilder->parse_file('cal.html');
  $tree->find_by_attribute(class => 'hcm-calendar')->replace_with($c);
@@ -1007,7 +1001,7 @@ E<gt>item(2010)> would return the cell representing the year. Since
 years and particular months change frequently, it is probably more
 useful to take advantage of the C<month()> and C<year()> methods, which
 return their respective values. The following is therefore the same as
-explicitly referencing the year: C<$c-E<gt>item($c- E<gt>year())>.
+explicitely referencing the year: C<$c-E<gt>item($c- E<gt>year())>.
 
 Multiple cells of the calendar can be manipulated as if they were a
 single element. For instance, C<$c-E<gt>item(15)-E<gt>attr(class =E<gt>
@@ -1086,11 +1080,12 @@ Specifies whether to display the week-of-year numbering. Default 0.
 =item locale
 
 Specifies the id of the locale in which to render the calendar. Default
-is 'en_US'. By default, this will also control determine which day is
+is 'en-US'. By default, this will also control determine which day is
 considered to be the first day of the week. See
 L<HTML::CalendarMonth::Locale> for more information. If for some reason
 you prefer to use different labels than those provided by C<locale>, see
-the C<alias> attribute below.
+the C<alias> attribute below. NOTE: DateTime::Locale versions 0.92 and
+earlier use underscores rather than dashes, e.g. 'en_US'.
 
 =item full_days
 
@@ -1122,11 +1117,11 @@ is determined based on the locale.
 Set some handy CSS class attributes on elements, enabled by default.
 Currently the classes are:
 
-  hcm-table       Set on the <lt>table<gt> tag of the calendar
-  hcm-day-head    Set on the day-of-week <lt>tr<gt> or <lt>td<gt> tags
-  hcm-year-head   Set on the <lt>td<gt> tag for the year
-  hcm-month-head  Set on the <lt>td<gt> tag for the month
-  hcm-week-head   Set on the <lt>td<gt> tags for the week-of-year
+  hcm-table       Set on the E<lt>tableE<gt> tag of the calendar
+  hcm-day-head    Set on the day-of-week E<lt>trE<gt> or E<lt>tdE<gt> tags
+  hcm-year-head   Set on the E<lt>tdE<gt> tag for the year
+  hcm-month-head  Set on the E<lt>tdE<gt> tag for the month
+  hcm-week-head   Set on the E<lt>tdE<gt> tags for the week-of-year
 
 =item semantic_css
 
@@ -1135,9 +1130,9 @@ default. The notion of 'today' is taken either from the system clock
 (default) or from the 'today' parameter as provided to new(). Currently
 these classes are:
 
-  hcm-today    Set on the <lt>td<gt> tag for today, if present
-  hcm-past     Set on the <lt>td<gt> tags for prior days, if present
-  hcm-future   Set on the <lt>td<gt> tags for subsequent days, if present
+  hcm-today    Set on the E<lt>tdE<gt> tag for today, if present
+  hcm-past     Set on the E<lt>tdE<gt> tags for prior days, if present
+  hcm-future   Set on the E<lt>tdE<gt> tags for subsequent days, if present
 
 =item today
 
@@ -1393,7 +1388,7 @@ Matthew P. Sisk, E<lt>F<sisk@mojotoad.com>E<gt>
 
 =head1 COPYRIGHT
 
-Copyright (c) 1998-2010 Matthew P. Sisk. All rights reserved. All wrongs
+Copyright (c) 1998-2015 Matthew P. Sisk. All rights reserved. All wrongs
 revenged. This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
 
index 0e752a3d5f9456c87045ba94b1f95d73ba68cf2a..e69328dbea19d42c932c7b84e83e7b9028a283f8 100644 (file)
@@ -450,7 +450,11 @@ methods are necessary:
 
 For a given day, and optionally C<month> and C<year> if they are
 different from those specified in C<new()>, provide the day of week
+<<<<<<< HEAD
 number. (1=Sunday, 7=Saturday).
+=======
+number. (0=Sunday, 6=Saturday).
+>>>>>>> upstream/2.04
 
 =item add_days($days, $delta, $day, [$month], [$year])
 
index f01543f6c199dd1ac7733794de576578153bcc80..6e03ee7b649ffe2a0ea7d8230b8fe80793be580d 100644 (file)
@@ -1,6 +1,6 @@
 package HTML::CalendarMonth::Locale;
 {
-  $HTML::CalendarMonth::Locale::VERSION = '1.26';
+  $HTML::CalendarMonth::Locale::VERSION = '2.00';
 }
 
 # Front end class around DateTime::Locale. In addition to providing
@@ -14,6 +14,18 @@ use Carp;
 
 use DateTime::Locale 0.45;
 
+sub _locale_version { $DateTime::Locale::VERSION }
+
+my($CODE_METHOD, $CODES_METHOD);
+if (_locale_version() > 0.92) {
+  $CODE_METHOD  = "code";
+  $CODES_METHOD = "codes";
+}
+else {
+  $CODE_METHOD  = "id";
+  $CODES_METHOD = "ids";
+}
+
 my %Register;
 
 sub new {
@@ -21,24 +33,30 @@ sub new {
   my $self = {};
   bless $self, $class;
   my %parms = @_;
-  my $id = $parms{id} or croak "Locale id required (eg 'en_US')\n";
-  $self->{id} = $id;
+  # id is for backwards compatibility
+  my $code = $parms{code} || $parms{id}
+    or croak "Locale code required (eg 'en-US')\n";
   $self->{full_days}   = defined $parms{full_days}   ? $parms{full_days}   : 0;
   $self->{full_months} = defined $parms{full_months} ? $parms{full_months} : 1;
-  unless ($Register{$id}) {
-    $Register{$id} = $self->locale->load($id)
-      or croak "Problem loading locale '$id'\n";
+  # returned code might be different from given code
+  unless ($Register{$code}) {
+    my $dtl = $self->locale->load($code)
+      or croak "Problem loading locale '$code'";
+    $Register{$code} = $Register{$dtl->$CODE_METHOD} = { loc => $dtl };
   }
+  $self->{code} = $Register{$code}{loc}->$CODE_METHOD;
   $self;
 }
 
 sub locale { 'DateTime::Locale' }
 
-sub loc { $Register{shift->id} }
+sub loc { $Register{shift->code}{loc} }
+
+sub locales { shift->locale->$CODES_METHOD }
 
-sub locales { shift->locale->ids }
+sub code { shift->{code} }
+*id = *code;
 
-sub id          { shift->{id}          }
 sub full_days   { shift->{full_days}   }
 sub full_months { shift->{full_months} }
 
@@ -46,54 +64,57 @@ sub first_day_of_week { shift->loc->first_day_of_week % 7 }
 
 sub days {
   my $self = shift;
-  my $id = $self->id;
-  unless ($Register{$id}{days}) {
-    my $method = $self->full_days > 0 ? 'day_stand_alone_wide'
-                                      : 'day_stand_alone_abbreviated';
+  my $code = $self->code;
+  unless ($Register{$code}{days}) {
+    my $method = $self->full_days ? 'day_stand_alone_wide'
+                                  : 'day_stand_alone_abbreviated';
     # adjust to H::CM standard expectation, 1st day Sun
     # Sunday is first, regardless of what the calendar considers to be
     # the first day of the week
     my @days  = @{$self->loc->$method};
     unshift(@days, pop @days);
-    $Register{$id}{days} = \@days;
+    $Register{$code}{days} = \@days;
   }
-  wantarray ? @{$Register{$id}{days}} : $Register{$id}{days};
+  wantarray ? @{$Register{$code}{days}} : $Register{$code}{days};
 }
 
 sub narrow_days {
   my $self = shift;
-  my $id   = $self->id;
-  unless ($Register{$id}{narrow_days}) {
+  my $code = $self->code;
+  unless ($Register{$code}{narrow_days}) {
     # Sunday is first, regardless of what the calendar considers to be
     # the first day of the week
     my @days = @{ $self->loc->day_stand_alone_narrow };
     unshift(@days, pop @days);
-    $Register{$id}{narrow_days} = \@days;
+    $Register{$code}{narrow_days} = \@days;
   }
-  wantarray ? @{$Register{$id}{narrow_days}} : $Register{$id}{narrow_days};
+  wantarray ? @{$Register{$code}{narrow_days}}
+            :   $Register{$code}{narrow_days};
 }
 
 sub months {
   my $self = shift;
-  my $id = $self->id;
-  unless ($Register{$id}{months}) {
+  my $code = $self->code;
+  unless ($Register{$code}{months}) {
     my $method = $self->full_months > 0 ? 'month_stand_alone_wide'
                                         : 'month_stand_alone_abbreviated';
-    $Register{$id}{months} = [@{$self->loc->$method}];
+    $Register{$code}{months} = [@{$self->loc->$method}];
   }
-  wantarray ? @{$Register{$id}{months}} : $Register{$id}{months};
+  wantarray ? @{$Register{$code}{months}} : $Register{$code}{months};
 }
 
 sub narrow_months {
   my $self = shift;
-  my $id   = $self->id;
-  $Register{$id}{narrow_months} ||= [$self->loc->month_stand_alone_narrow];
-  wantarray ? @{$Register{$id}{narrow_months}} : $Register{$id}{narrow_months};
+  my $code = $self->code;
+  $Register{$code}{narrow_months}
+    ||= [@{$self->loc->month_stand_alone_narrow}];
+  wantarray ? @{$Register{$code}{narrow_months}}
+            :   $Register{$code}{narrow_months};
 }
 
 sub days_minmatch {
   my $self = shift;
-  $Register{$self->id}{days_mm}
+  $Register{$self->code}{days_mm}
     ||= $self->lc_minmatch_hash($self->days);
 }
 *minmatch = \&days_minmatch;
@@ -104,10 +125,9 @@ sub _days_minmatch_pattern {
 }
 *minmatch_pattern = \&_days_minmatch_pattern;
 
-
 sub months_minmatch {
   my $self = shift;
-  $Register{$self->id}{months_mm}
+  $Register{$self->code}{months_mm}
     ||= $self->lc_minmatch_hash($self->months);
 }
 
@@ -118,14 +138,15 @@ sub _months_minmatch_pattern {
 
 sub daynums {
   my $self = shift;
-  my $id = $self->id;
-  unless ($Register{$id}{daynum}) {
+  my $code = $self->code;
+  unless ($Register{$code}{daynum}) {
     my %daynum;
     my $days = $self->days;
     $daynum{$days->[$_]} = $_ foreach 0 .. $#$days;
-    $Register{$id}{daynum} = \%daynum;
+    $Register{$code}{daynum} = \%daynum;
   }
-  $Register{$id}{daynum};
+  wantarray ? %{$Register{$code}{daynum}}
+            :   $Register{$code}{daynum};
 }
 
 sub _daymatch {
@@ -148,14 +169,15 @@ sub dayname { (shift->_daymatch(@_))[1] }
 
 sub monthnums {
   my $self = shift;
-  my $id = $self->id;
-  unless ($Register{$id}{monthnum}) {
+  my $code = $self->code;
+  unless ($Register{$code}{monthnum}) {
     my %monthnum;
     my $months = $self->months;
     $monthnum{$months->[$_]} = $_ foreach 0 .. $#$months;
-    $Register{$id}{monthnum} = \%monthnum;
+    $Register{$code}{monthnum} = \%monthnum;
   }
-  $Register{$id}{monthnum};
+  wantarray ? %{$Register{$code}{monthnum}}
+            :   $Register{$code}{monthnum};
 }
 
 sub _monthmatch {
@@ -181,8 +203,8 @@ sub monthname { (shift->_monthmatch(@_))[1] }
 sub locale_map {
   my $self = shift;
   my %map;
-  foreach my $id ($self->locales) {
-    $map{$id} = $self->locale->load($id)->name;
+  foreach my $code ($self->locales) {
+    $map{$code} = $self->locale->load($code)->name;
   }
   wantarray ? %map : \%map;
 }
@@ -263,7 +285,7 @@ HTML::CalendarMonth::Locale - Front end class for DateTime::Locale
 
   use HTML::CalendarMonth::Locale;
 
-  my $loc = HTML::CalendarMonth::Locale->new( id => 'en_US' );
+  my $loc = HTML::CalendarMonth::Locale->new( code => 'en-US' );
 
   # list of days of the week for locale
   my @days = $loc->days;
@@ -271,9 +293,9 @@ HTML::CalendarMonth::Locale - Front end class for DateTime::Locale
   # list of months of the year for locale
   my @months = $loc->months;
 
-  # the name of the current locale, as supplied the id parameter to
+  # the name of the current locale, as supplied the code parameter to
   # new()
-  my $locale_name = $loc->id;
+  my $locale_name = $loc->code;
 
   # the actual DateTime::Locale object
   my $loc = $loc->loc;
@@ -284,9 +306,9 @@ HTML::CalendarMonth::Locale - Front end class for DateTime::Locale
 
 HTML::CalendarMonth utilizes the powerful locale capabilities of
 DateTime::Locale for rendering its calendars. The default locale is
-'en_US' but many others are available. To see this list, invoke the
+'en-US' but many others are available. To see this list, invoke the
 class method HTML::CalendarMonth::Locale->locales() which in turn
-invokes DateTime::Locale::ids().
+invokes DateTime::Locale::codes().
 
 This module is mostly intended for internal usage within
 HTML::CalendarMonth, but some of its functionality may be of use for
@@ -300,9 +322,11 @@ developers:
 
 Constructor. Takes the following parameters:
 
-=item id
+=over
+
+=item code
 
-Locale id, e.g. 'en_US'.
+Locale code, e.g. 'en-US'.
 
 =item full_days
 
@@ -314,9 +338,11 @@ Default 0, use abbreviated days.
 Specifies whether full month names or their abbreviations are desired.
 Default 1, use full months.
 
-=item id()
+=back
+
+=item code()
 
-Returns the locale id used during object construction.
+Returns the locale code used during object construction.
 
 =item locale()
 
@@ -325,18 +351,18 @@ several class methods of specific interest. See L<DateTime::Locale>.
 
 =item locale_map()
 
-Returns a hash of all available locales, mapping their id to their
+Returns a hash of all available locales, mapping their code to their
 full name.
 
 =item loc()
 
-Accessor method for the DateTime::Locale instance as specified by C<id>.
+Accessor method for the DateTime::Locale instance as specified by C<code>.
 See L<DateTime::Locale>.
 
 =item locales()
 
-Lists all available locale ids. Equivalent to locale()->ids(), or
-DateTime::Locale->ids().
+Lists all available locale codes. Equivalent to locale()->codes(), or
+DateTime::Locale->codes().
 
 =item days()
 
@@ -426,7 +452,7 @@ Matthew P. Sisk, E<lt>F<sisk@mojotoad.com>E<gt>
 
 =head1 COPYRIGHT
 
-Copyright (c) 2010 Matthew P. Sisk. All rights reserved. All wrongs
+Copyright (c) 2010-2015 Matthew P. Sisk. All rights reserved. All wrongs
 revenged. This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
 
@@ -434,4 +460,4 @@ modify it under the same terms as Perl itself.
 
 HTML::CalendarMonth(3), DateTime::Locale(3)
 
-=for Pod::Coverage minmatch minmatch_pattern
+=for Pod::Coverage minmatch minmatch_pattern id
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 336f2d175fa122726d4167d0ded607f98224c30b..b014f5ed21e35272aca36bb5257102ad7c21a0da 100644 (file)
@@ -1,14 +1,14 @@
-2010/03 ga_IE
+2010/03 ga-IE
 <table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">M&aacute;rta</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">Domh</td><td class="hcm-day-head">Luan</td><td class="hcm-day-head">M&aacute;irt</td><td class="hcm-day-head">C&eacute;ad</td><td class="hcm-day-head">D&eacute;ar</td><td class="hcm-day-head">Aoine</td><td class="hcm-day-head">Sath</td></tr><tr><td></td><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td></tr><tr><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td></tr><tr><td>14</td><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td></tr><tr><td>21</td><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td></tr><tr><td>28</td><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td></tr></table>
-2010/03 es_MX
-<table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">marzo</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">lun</td><td class="hcm-day-head">mar</td><td class="hcm-day-head">mi&eacute;</td><td class="hcm-day-head">jue</td><td class="hcm-day-head">vie</td><td class="hcm-day-head">s&aacute;b</td><td class="hcm-day-head">dom</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
-2010/03 fr_FR
+2010/03 es-MX
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan=5>marzo</td><td class="hcm-year-head" colspan=2>2010</td></tr><tr><td class="hcm-day-head">dom.</td><td class="hcm-day-head">lun.</td><td class="hcm-day-head">mar.</td><td class="hcm-day-head">mi&eacute;.</td><td class="hcm-day-head">jue.</td><td class="hcm-day-head">vie.</td><td class="hcm-day-head">s&aacute;b.</td></tr><tr><td></td><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td></tr><tr><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td></tr><tr><td>14</td><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td></tr><tr><td>21</td><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td></tr><tr><td>28</td><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td></tr></table>
+2010/03 fr-FR
 <table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">mars</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">lun.</td><td class="hcm-day-head">mar.</td><td class="hcm-day-head">mer.</td><td class="hcm-day-head">jeu.</td><td class="hcm-day-head">ven.</td><td class="hcm-day-head">sam.</td><td class="hcm-day-head">dim.</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
-2010/03 de_DE
-<table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">M&auml;rz</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">Mo.</td><td class="hcm-day-head">Di.</td><td class="hcm-day-head">Mi.</td><td class="hcm-day-head">Do.</td><td class="hcm-day-head">Fr.</td><td class="hcm-day-head">Sa.</td><td class="hcm-day-head">So.</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
-2010/03 ru_RU
-<table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">&#x41C;&#x430;&#x440;&#x442;</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">&#x41F;&#x43D;</td><td class="hcm-day-head">&#x412;&#x442;</td><td class="hcm-day-head">&#x421;&#x440;</td><td class="hcm-day-head">&#x427;&#x442;</td><td class="hcm-day-head">&#x41F;&#x442;</td><td class="hcm-day-head">&#x421;&#x431;</td><td class="hcm-day-head">&#x412;&#x441;</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
-2010/03 pt_BR
-<table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">mar&ccedil;o</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">seg</td><td class="hcm-day-head">ter</td><td class="hcm-day-head">qua</td><td class="hcm-day-head">qui</td><td class="hcm-day-head">sex</td><td class="hcm-day-head">s&aacute;b</td><td class="hcm-day-head">dom</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
-2010/03 zu_ZA
-<table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">uMashi</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">Mso</td><td class="hcm-day-head">Bil</td><td class="hcm-day-head">Tha</td><td class="hcm-day-head">Sin</td><td class="hcm-day-head">Hla</td><td class="hcm-day-head">Mgq</td><td class="hcm-day-head">Son</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
+2010/03 de-DE
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan=5>M&auml;rz</td><td class="hcm-year-head" colspan=2>2010</td></tr><tr><td class="hcm-day-head">Mo</td><td class="hcm-day-head">Di</td><td class="hcm-day-head">Mi</td><td class="hcm-day-head">Do</td><td class="hcm-day-head">Fr</td><td class="hcm-day-head">Sa</td><td class="hcm-day-head">So</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
+2010/03 ru-RU
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan=5>&#x43C;&#x430;&#x440;&#x442;</td><td class="hcm-year-head" colspan=2>2010</td></tr><tr><td class="hcm-day-head">&#x43F;&#x43D;</td><td class="hcm-day-head">&#x432;&#x442;</td><td class="hcm-day-head">&#x441;&#x440;</td><td class="hcm-day-head">&#x447;&#x442;</td><td class="hcm-day-head">&#x43F;&#x442;</td><td class="hcm-day-head">&#x441;&#x431;</td><td class="hcm-day-head">&#x432;&#x441;</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
+2010/03 pt-BR
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan=5>mar&ccedil;o</td><td class="hcm-year-head" colspan=2>2010</td></tr><tr><td class="hcm-day-head">dom</td><td class="hcm-day-head">seg</td><td class="hcm-day-head">ter</td><td class="hcm-day-head">qua</td><td class="hcm-day-head">qui</td><td class="hcm-day-head">sex</td><td class="hcm-day-head">s&aacute;b</td></tr><tr><td></td><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td></tr><tr><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td></tr><tr><td>14</td><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td></tr><tr><td>21</td><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td></tr><tr><td>28</td><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td></tr></table>
+2010/03 zu-ZA
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan=5>Mashi</td><td class="hcm-year-head" colspan=2>2010</td></tr><tr><td class="hcm-day-head">Son</td><td class="hcm-day-head">Mso</td><td class="hcm-day-head">Bil</td><td class="hcm-day-head">Tha</td><td class="hcm-day-head">Sin</td><td class="hcm-day-head">Hla</td><td class="hcm-day-head">Mgq</td></tr><tr><td></td><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td></tr><tr><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td></tr><tr><td>14</td><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td></tr><tr><td>21</td><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td></tr><tr><td>28</td><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td></tr></table>
diff --git a/t/dat/i8n_leg1.dat b/t/dat/i8n_leg1.dat
new file mode 100644 (file)
index 0000000..336f2d1
--- /dev/null
@@ -0,0 +1,14 @@
+2010/03 ga_IE
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">M&aacute;rta</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">Domh</td><td class="hcm-day-head">Luan</td><td class="hcm-day-head">M&aacute;irt</td><td class="hcm-day-head">C&eacute;ad</td><td class="hcm-day-head">D&eacute;ar</td><td class="hcm-day-head">Aoine</td><td class="hcm-day-head">Sath</td></tr><tr><td></td><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td></tr><tr><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td></tr><tr><td>14</td><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td></tr><tr><td>21</td><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td></tr><tr><td>28</td><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td></tr></table>
+2010/03 es_MX
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">marzo</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">lun</td><td class="hcm-day-head">mar</td><td class="hcm-day-head">mi&eacute;</td><td class="hcm-day-head">jue</td><td class="hcm-day-head">vie</td><td class="hcm-day-head">s&aacute;b</td><td class="hcm-day-head">dom</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
+2010/03 fr_FR
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">mars</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">lun.</td><td class="hcm-day-head">mar.</td><td class="hcm-day-head">mer.</td><td class="hcm-day-head">jeu.</td><td class="hcm-day-head">ven.</td><td class="hcm-day-head">sam.</td><td class="hcm-day-head">dim.</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
+2010/03 de_DE
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">M&auml;rz</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">Mo.</td><td class="hcm-day-head">Di.</td><td class="hcm-day-head">Mi.</td><td class="hcm-day-head">Do.</td><td class="hcm-day-head">Fr.</td><td class="hcm-day-head">Sa.</td><td class="hcm-day-head">So.</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
+2010/03 ru_RU
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">&#x41C;&#x430;&#x440;&#x442;</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">&#x41F;&#x43D;</td><td class="hcm-day-head">&#x412;&#x442;</td><td class="hcm-day-head">&#x421;&#x440;</td><td class="hcm-day-head">&#x427;&#x442;</td><td class="hcm-day-head">&#x41F;&#x442;</td><td class="hcm-day-head">&#x421;&#x431;</td><td class="hcm-day-head">&#x412;&#x441;</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
+2010/03 pt_BR
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">mar&ccedil;o</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">seg</td><td class="hcm-day-head">ter</td><td class="hcm-day-head">qua</td><td class="hcm-day-head">qui</td><td class="hcm-day-head">sex</td><td class="hcm-day-head">s&aacute;b</td><td class="hcm-day-head">dom</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
+2010/03 zu_ZA
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">uMashi</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">Mso</td><td class="hcm-day-head">Bil</td><td class="hcm-day-head">Tha</td><td class="hcm-day-head">Sin</td><td class="hcm-day-head">Hla</td><td class="hcm-day-head">Mgq</td><td class="hcm-day-head">Son</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
diff --git a/t/dat/i8n_leg2.dat b/t/dat/i8n_leg2.dat
new file mode 100644 (file)
index 0000000..41d5b97
--- /dev/null
@@ -0,0 +1,14 @@
+2010/03 ga-IE
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">M&aacute;rta</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">Domh</td><td class="hcm-day-head">Luan</td><td class="hcm-day-head">M&aacute;irt</td><td class="hcm-day-head">C&eacute;ad</td><td class="hcm-day-head">D&eacute;ar</td><td class="hcm-day-head">Aoine</td><td class="hcm-day-head">Sath</td></tr><tr><td></td><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td></tr><tr><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td></tr><tr><td>14</td><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td></tr><tr><td>21</td><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td></tr><tr><td>28</td><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td></tr></table>
+2010/03 es-MX
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan=5>marzo</td><td class="hcm-year-head" colspan=2>2010</td></tr><tr><td class="hcm-day-head">dom.</td><td class="hcm-day-head">lun.</td><td class="hcm-day-head">mar.</td><td class="hcm-day-head">mi&eacute;.</td><td class="hcm-day-head">jue.</td><td class="hcm-day-head">vie.</td><td class="hcm-day-head">s&aacute;b.</td></tr><tr><td></td><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td></tr><tr><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td></tr><tr><td>14</td><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td></tr><tr><td>21</td><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td></tr><tr><td>28</td><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td></tr></table>
+2010/03 fr-FR
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">mars</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">lun.</td><td class="hcm-day-head">mar.</td><td class="hcm-day-head">mer.</td><td class="hcm-day-head">jeu.</td><td class="hcm-day-head">ven.</td><td class="hcm-day-head">sam.</td><td class="hcm-day-head">dim.</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
+2010/03 de-DE
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan=5>M&auml;rz</td><td class="hcm-year-head" colspan=2>2010</td></tr><tr><td class="hcm-day-head">Mo</td><td class="hcm-day-head">Di</td><td class="hcm-day-head">Mi</td><td class="hcm-day-head">Do</td><td class="hcm-day-head">Fr</td><td class="hcm-day-head">Sa</td><td class="hcm-day-head">So</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
+2010/03 ru-RU
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan=5>&#x43C;&#x430;&#x440;&#x442;</td><td class="hcm-year-head" colspan=2>2010</td></tr><tr><td class="hcm-day-head">&#x43F;&#x43D;</td><td class="hcm-day-head">&#x432;&#x442;</td><td class="hcm-day-head">&#x441;&#x440;</td><td class="hcm-day-head">&#x447;&#x442;</td><td class="hcm-day-head">&#x43F;&#x442;</td><td class="hcm-day-head">&#x441;&#x431;</td><td class="hcm-day-head">&#x432;&#x441;</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
+2010/03 pt-BR
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan="5">mar&ccedil;o</td><td class="hcm-year-head" colspan="2">2010</td></tr><tr><td class="hcm-day-head">seg</td><td class="hcm-day-head">ter</td><td class="hcm-day-head">qua</td><td class="hcm-day-head">qui</td><td class="hcm-day-head">sex</td><td class="hcm-day-head">s&aacute;b</td><td class="hcm-day-head">dom</td></tr><tr><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td></tr><tr><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td><td>14</td></tr><tr><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td><td>21</td></tr><tr><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td><td>28</td></tr><tr><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td><td></td></tr></table>
+2010/03 zu-ZA
+<table class="hcm-table"><tr><td class="hcm-month-head" colspan=5>Mashi</td><td class="hcm-year-head" colspan=2>2010</td></tr><tr><td class="hcm-day-head">Son</td><td class="hcm-day-head">Mso</td><td class="hcm-day-head">Bil</td><td class="hcm-day-head">Tha</td><td class="hcm-day-head">Sin</td><td class="hcm-day-head">Hla</td><td class="hcm-day-head">Mgq</td></tr><tr><td></td><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td></tr><tr><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td></tr><tr><td>14</td><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td></tr><tr><td>21</td><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td></tr><tr><td>28</td><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td></tr></table>
index fc4f23048a8c6b333ad591faf7487690760fff90..51c5fffbc6f8695fc23d2eb6900776a5476ccd93 100644 (file)
@@ -19,8 +19,10 @@ use vars qw(
   $Head_File
   $Odd_File
   $Woy_File
-  $I8N_File
   $Narrow_File
+  $I8N_File
+  $I8N_Legacy1_File
+  $I8N_Legacy2_File
 );
 
 @EXPORT = qw(
@@ -53,12 +55,14 @@ BEGIN {
   $Dat_Dir = File::Spec->catpath($vol, $dir, '');
 }
 
-$Bulk_File   = File::Spec->catdir($Dat_Dir,   'bulk.dat');
-$Head_File   = File::Spec->catdir($Dat_Dir,   'head.dat');
-$Odd_File    = File::Spec->catdir($Dat_Dir,    'odd.dat');
-$Woy_File    = File::Spec->catdir($Dat_Dir,    'woy.dat');
-$I8N_File    = File::Spec->catdir($Dat_Dir,    'i8n.dat');
-$Narrow_File = File::Spec->catdir($Dat_Dir, 'narrow.dat');
+$Bulk_File       = File::Spec->catdir($Dat_Dir,    'bulk.dat');
+$Head_File       = File::Spec->catdir($Dat_Dir,    'head.dat');
+$Odd_File        = File::Spec->catdir($Dat_Dir,     'odd.dat');
+$Woy_File        = File::Spec->catdir($Dat_Dir,     'woy.dat');
+$Narrow_File     = File::Spec->catdir($Dat_Dir,  'narrow.dat');
+$I8N_File        = File::Spec->catdir($Dat_Dir,     'i8n.dat');
+$I8N_Legacy1_File = File::Spec->catdir($Dat_Dir, 'i8n_leg1.dat');
+$I8N_Legacy2_File = File::Spec->catdir($Dat_Dir, 'i8n_leg2.dat');
 
 my(@Bulk, @Head, @Odd, @Woy, @I8N, @Nar);
 
@@ -82,8 +86,17 @@ _load_file($Bulk_File, \@Bulk    );
 _load_file($Head_File,  \@Head   );
 _load_file($Odd_File,    \@Odd   );
 _load_file($Woy_File,     \@Woy  );
-_load_file($I8N_File,      \@I8N );
-_load_file($Narrow_File,    \@Nar);
+_load_file($Narrow_File,   \@Nar);
+
+if (HTML::CalendarMonth::Locale->_locale_version >= 1.03) {
+  _load_file($I8N_File, \@I8N );
+}
+elsif (HTML::CalendarMonth::Locale->_locale_version >= 0.93) {
+  _load_file($I8N_Legacy2_File, \@I8N );
+}
+else {
+  _load_file($I8N_Legacy1_File, \@I8N );
+}
 
 sub bulk_count   { scalar @Bulk }
 sub head_count   { scalar @Head }