Merge branch 'master' of github.com:mquinson/po4a

mquinson · Oct 16, 2024 · 63522db · 63522db
2 parents 10e3593 + b07cb3b
commit 63522db
Show file tree

Hide file tree

Showing 26 changed files with 103 additions and 111 deletions.
diff --git a/Po4aBuilder.pm b/Po4aBuilder.pm
@@ -7,15 +7,16 @@ package Po4aBuilder;
 
 use 5.16.0;
 use strict;
-use Module::Build;
+use warnings;
+
+use parent qw(Module::Build);
+
 use File::Basename;
 use File::Path qw(mkpath rmtree);
 use File::Spec;
 use File::Copy qw(copy);
 use File::stat;
 
-our @ISA = qw(Module::Build);
-
 sub ACTION_build {
     my $self = shift;
     $self->depends_on('code');

diff --git a/lib/Locale/Po4a/AsciiDoc.pm b/lib/Locale/Po4a/AsciiDoc.pm
@@ -25,12 +25,12 @@ use 5.16.0;
 use strict;
 use warnings;
 
+use parent qw(Locale::Po4a::TransTractor);
+
 require Exporter;
-use vars qw(@ISA @EXPORT);
-@ISA    = qw(Locale::Po4a::TransTractor);
+use vars qw(@EXPORT);
 @EXPORT = qw();
 
-use Locale::Po4a::TransTractor;
 use Locale::Po4a::Common;
 use YAML::Tiny;
 

diff --git a/lib/Locale/Po4a/BibTeX.pm b/lib/Locale/Po4a/BibTeX.pm
@@ -54,12 +54,12 @@ use 5.16.0;
 use strict;
 use warnings;
 
+use parent qw(Locale::Po4a::TransTractor);
+
 require Exporter;
-use vars qw(@ISA @EXPORT);
-@ISA    = qw(Locale::Po4a::TransTractor);
+use vars qw(@EXPORT);
 @EXPORT = qw();
 
-use Locale::Po4a::TransTractor;
 use Locale::Po4a::Common;
 
 sub initialize { }

diff --git a/lib/Locale/Po4a/Common.pm b/lib/Locale/Po4a/Common.pm
@@ -34,15 +34,15 @@ Locale::Po4a::Common, the first time this module is loaded determines whether Te
 
 package Locale::Po4a::Common;
 
-require Exporter;
-use vars qw(@ISA @EXPORT);
-@ISA    = qw(Exporter);
-@EXPORT = qw(wrap_msg wrap_mod wrap_ref_mod textdomain gettext dgettext);
-
 use 5.16.0;
 use strict;
 use warnings;
 
+use parent qw(Exporter);
+
+use vars qw(@EXPORT);
+@EXPORT = qw(wrap_msg wrap_mod wrap_ref_mod textdomain gettext dgettext);
+
 sub import {
     my $class = shift;
 

diff --git a/lib/Locale/Po4a/Dia.pm b/lib/Locale/Po4a/Dia.pm
@@ -83,11 +83,9 @@ use 5.16.0;
 use strict;
 use warnings;
 
-use Locale::Po4a::Common;
-use Locale::Po4a::Xml;
+use parent qw(Locale::Po4a::Xml);
 
-use vars qw(@ISA);
-@ISA = qw(Locale::Po4a::Xml);
+use Locale::Po4a::Common;
 
 sub initialize {
     my $self    = shift;
@@ -112,3 +110,5 @@ sub found_string {
 
     return $text;
 }
+
+1;
diff --git a/lib/Locale/Po4a/Docbook.pm b/lib/Locale/Po4a/Docbook.pm
@@ -99,11 +99,9 @@ use 5.16.0;
 use strict;
 use warnings;
 
-use Locale::Po4a::Common;
-use Locale::Po4a::Xml;
+use parent qw(Locale::Po4a::Xml);
 
-use vars qw(@ISA);
-@ISA = qw(Locale::Po4a::Xml);
+use Locale::Po4a::Common;
 
 sub initialize {
     my $self    = shift;
@@ -2058,3 +2056,5 @@ sub initialize {
       if $self->{options}{'debug'};
     $self->treat_options;
 }
+
+1;
diff --git a/lib/Locale/Po4a/Gemtext.pm b/lib/Locale/Po4a/Gemtext.pm
@@ -21,19 +21,19 @@
 #
 ########################################################################
 
-require Exporter;
-
 package Locale::Po4a::Gemtext;
 
 use 5.006;
 use strict;
 use warnings;
 
-use vars qw(@ISA @EXPORT @AUTOLOAD);
-@ISA    = qw(Locale::Po4a::TransTractor);
+use parent qw(Locale::Po4a::TransTractor);
+
+require Exporter;
+
+use vars qw(@EXPORT @AUTOLOAD);
 @EXPORT = qw();
 
-use Locale::Po4a::TransTractor qw(process new);
 use Locale::Po4a::Common;
 
 =encoding UTF-8

diff --git a/lib/Locale/Po4a/Guide.pm b/lib/Locale/Po4a/Guide.pm
@@ -75,11 +75,9 @@ use 5.16.0;
 use strict;
 use warnings;
 
-use Locale::Po4a::Common;
-use Locale::Po4a::Xml;
+use parent qw(Locale::Po4a::Xml);
 
-use vars qw(@ISA);
-@ISA = qw(Locale::Po4a::Xml);
+use Locale::Po4a::Common;
 
 sub initialize {
     my $self    = shift;
@@ -151,3 +149,5 @@ sub initialize {
     print "Call treat_options\n" if $self->{options}{'debug'};
     $self->treat_options;
 }
+
+1;
diff --git a/lib/Locale/Po4a/Halibut.pm b/lib/Locale/Po4a/Halibut.pm
@@ -81,14 +81,14 @@ use 5.16.0;
 use strict;
 use warnings;
 
+use parent qw(Locale::Po4a::TeX);
+
 require Exporter;
-use vars qw($VERSION @ISA @EXPORT);
+use vars qw($VERSION @EXPORT);
 $VERSION = $Locale::Po4a::TeX::VERSION;
-@ISA     = qw(Locale::Po4a::TeX);
 @EXPORT  = qw();
 
 use Locale::Po4a::Common;
-use Locale::Po4a::TeX;
 use subs qw(&parse_definition_file
   &register_generic_command &is_closed &translate_buffer
   &register_verbatim_environment

diff --git a/lib/Locale/Po4a/InProgress/Debconf.pm b/lib/Locale/Po4a/InProgress/Debconf.pm
@@ -63,12 +63,12 @@ use 5.16.0;
 use strict;
 use warnings;
 
+use parent qw(Locale::Po4a::TransTractor);
+
 require Exporter;
-use vars qw(@ISA @EXPORT);
-@ISA    = qw(Locale::Po4a::TransTractor);
+use vars qw(@EXPORT);
 @EXPORT = qw();
 
-use Locale::Po4a::TransTractor;
 use Locale::Po4a::Common;
 
 sub initialize { }

diff --git a/lib/Locale/Po4a/InProgress/NewsDebian.pm b/lib/Locale/Po4a/InProgress/NewsDebian.pm
@@ -57,12 +57,12 @@ use 5.16.0;
 use strict;
 use warnings;
 
+use parent qw(Locale::Po4a::TransTractor);
+
 require Exporter;
-use vars qw(@ISA @EXPORT);
-@ISA    = qw(Locale::Po4a::TransTractor);
+use vars qw(@EXPORT);
 @EXPORT = qw();
 
-use Locale::Po4a::TransTractor;
 use Locale::Po4a::Common;
 
 sub initialize { }

diff --git a/lib/Locale/Po4a/Ini.pm b/lib/Locale/Po4a/Ini.pm
@@ -8,19 +8,19 @@
 # Modules and declarations
 ############################################################################
 
-use Locale::Po4a::TransTractor qw(process new);
-use Locale::Po4a::Common;
-
 package Locale::Po4a::Ini;
 
 use 5.16.0;
 use strict;
 use warnings;
 
+use parent qw(Locale::Po4a::TransTractor);
+
+use Locale::Po4a::Common;
+
 require Exporter;
 
-use vars qw(@ISA @EXPORT $AUTOLOAD);
-@ISA    = qw(Locale::Po4a::TransTractor);
+use vars qw(@EXPORT $AUTOLOAD);
 @EXPORT = qw();
 
 my $debug = 0;

diff --git a/lib/Locale/Po4a/KernelHelp.pm b/lib/Locale/Po4a/KernelHelp.pm
@@ -9,21 +9,21 @@
 # Modules and declarations
 ############################################################################
 
-use Pod::Parser;
-use Locale::Po4a::TransTractor qw(process new);
-use Locale::Po4a::Common;
-
 package Locale::Po4a::KernelHelp;
 
 use 5.16.0;
 use strict;
 use warnings;
 
+use parent qw(Locale::Po4a::TransTractor);
+
+use Pod::Parser;
+use Locale::Po4a::Common;
+
 require Exporter;
 
-use vars qw(@ISA @EXPORT $AUTOLOAD);
-@ISA    = qw(Locale::Po4a::TransTractor);
-@EXPORT = qw();                             # new process write read writepo readpo);
+use vars qw(@EXPORT $AUTOLOAD);
+@EXPORT = qw();    # new process write read writepo readpo);
 
 my $debug = 0;
 
@@ -119,13 +119,13 @@ sub docheader {
 #
 EOT
 }
-1;
 
 ##############################################################################
 # Module return value and documentation
 ##############################################################################
 
 1;
+
 __END__
 
 =encoding UTF-8

diff --git a/lib/Locale/Po4a/LaTeX.pm b/lib/Locale/Po4a/LaTeX.pm
@@ -68,13 +68,13 @@ use 5.16.0;
 use strict;
 use warnings;
 
+use parent qw(Locale::Po4a::TeX);
+
 require Exporter;
-use vars qw($VERSION @ISA @EXPORT);
+use vars qw($VERSION @EXPORT);
 $VERSION = $Locale::Po4a::TeX::VERSION;
-@ISA     = qw(Locale::Po4a::TeX);
 @EXPORT  = qw();
 
-use Locale::Po4a::TeX;
 use subs qw(&generic_command
   &parse_definition_file
   &register_generic_command

diff --git a/lib/Locale/Po4a/Man.pm b/lib/Locale/Po4a/Man.pm
@@ -398,12 +398,12 @@ use 5.16.0;
 use strict;
 use warnings;
 
+use parent qw(Locale::Po4a::TransTractor);
+
 require Exporter;
-use vars qw(@ISA @EXPORT);
-@ISA    = qw(Locale::Po4a::TransTractor);
-@EXPORT = qw();                                        #  new initialize);
+use vars qw(@EXPORT);
+@EXPORT = qw();    #  new initialize);
 
-use Locale::Po4a::TransTractor;
 use Locale::Po4a::Common;
 
 use File::Spec;

diff --git a/lib/Locale/Po4a/Po.pm b/lib/Locale/Po4a/Po.pm
@@ -96,26 +96,25 @@ Set the package version for the POT header. The default is "VERSION".
 
 =cut
 
-use IO::File;
+package Locale::Po4a::Po;
 
-require Exporter;
+use 5.16.0;
+use strict;
+use warnings;
 
-package Locale::Po4a::Po;
+use parent qw(Exporter);
+
+use IO::File;
 
 use Locale::Po4a::Common qw(wrap_msg wrap_mod wrap_ref_mod dgettext);
 
 use subs qw(makespace);
-use vars qw(@ISA @EXPORT_OK);
-@ISA       = qw(Exporter);
+use vars qw(@EXPORT @EXPORT_OK);
 @EXPORT    = qw(%debug);
 @EXPORT_OK = qw(&move_po_if_needed);
 
 use Locale::Po4a::TransTractor;
 
-use 5.16.0;
-use strict;
-use warnings;
-
 use Carp qw(croak);
 use File::Basename;
 use File::Path;    # mkdir before write

diff --git a/lib/Locale/Po4a/Pod.pm b/lib/Locale/Po4a/Pod.pm
@@ -11,19 +11,15 @@
 # Modules and declarations
 ############################################################################
 
-use Pod::Parser;
-use Locale::Po4a::TransTractor qw(process new get_in_charset get_out_charset);
-
 package Locale::Po4a::Pod;
 
 use 5.16.0;
 use strict;
 use warnings;
 
-require Exporter;
+use parent qw(Locale::Po4a::TransTractor Pod::Parser);
 
-use vars qw(@ISA);
-@ISA = qw(Locale::Po4a::TransTractor Pod::Parser);
+require Exporter;
 
 use Carp qw(croak confess);
 
@@ -203,13 +199,13 @@ If the PO get lost, keeping this translation up-to-date will be harder.
 $encoding
 EOT
 }
-1;
 
 ##############################################################################
 # Module return value and documentation
 ##############################################################################
 
 1;
+
 __END__
 
 =encoding UTF-8