From d432fdba21ba5c1ba3008b2a21e44920c329ab1f Mon Sep 17 00:00:00 2001

From: Jitka Plesnikova <jplesnik@redhat.com>

Date: Thu, 24 May 2018 10:36:25 +0200

Subject: [PATCH] Upgrade to 1.29

---

 lib/Locale/Maketext.pm  | 13 ++++++-------

 lib/Locale/Maketext.pod |  2 +-

 t/60_super.t            | 15 ++++++---------

 t/70_fail_auto.t        |  6 ++----

 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/lib/Locale/Maketext.pm b/lib/Locale/Maketext.pm

index 36d0c05..f70438b 100644

--- a/lib/Locale/Maketext.pm

+++ b/lib/Locale/Maketext.pm

@@ -1,7 +1,6 @@

 package Locale::Maketext;

 use strict;

-use vars qw( @ISA $VERSION $MATCH_SUPERS $USING_LANGUAGE_TAGS

-$USE_LITERALS $MATCH_SUPERS_TIGHTLY);

+our $USE_LITERALS;

 use Carp ();

 use I18N::LangTags ();

 use I18N::LangTags::Detect ();

@@ -26,12 +25,12 @@ BEGIN {

 }

-$VERSION = '1.28';

-@ISA = ();

+our $VERSION = '1.29';

+our @ISA = ();

-$MATCH_SUPERS = 1;

-$MATCH_SUPERS_TIGHTLY = 1;

-$USING_LANGUAGE_TAGS  = 1;

+our $MATCH_SUPERS = 1;

+our $MATCH_SUPERS_TIGHTLY = 1;

+our $USING_LANGUAGE_TAGS  = 1;

 # Turning this off is somewhat of a security risk in that little or no

 # checking will be done on the legality of tokens passed to the

 # eval("use $module_name") in _try_use.  If you turn this off, you have

diff --git a/lib/Locale/Maketext.pod b/lib/Locale/Maketext.pod

index 564e5af..24c8f24 100644

--- a/lib/Locale/Maketext.pod

+++ b/lib/Locale/Maketext.pod

@@ -1226,7 +1226,7 @@ If you get tired of constantly saying C<print $lh-E<gt>maketext>,

 consider making a functional wrapper for it, like so:

   use Projname::L10N;

-  use vars qw($lh);

+  our $lh;

   $lh = Projname::L10N->get_handle(...) || die "Language?";

   sub pmt (@) { print( $lh->maketext(@_)) }

    # "pmt" is short for "Print MakeText"

diff --git a/t/60_super.t b/t/60_super.t

index d54fc33..5ac0959 100644

--- a/t/60_super.t

+++ b/t/60_super.t

@@ -9,23 +9,20 @@ BEGIN {

 {

     package Whunk::L10N;

-    use vars qw(@ISA %Lexicon);

-    @ISA =  'Locale::Maketext';

-    %Lexicon = ('hello' => 'SROBLR!');

+    our @ISA =  'Locale::Maketext';

+    our %Lexicon = ('hello' => 'SROBLR!');

 }

 {

     package Whunk::L10N::en;

-    use vars qw(@ISA %Lexicon);

-    @ISA =  'Whunk::L10N';

-    %Lexicon = ('hello' => 'HI AND STUFF!');

+    our @ISA =  'Whunk::L10N';

+    our %Lexicon = ('hello' => 'HI AND STUFF!');

 }

 {

     package Whunk::L10N::zh_tw;

-    use vars qw(@ISA %Lexicon);

-    @ISA =  'Whunk::L10N';

-    %Lexicon = ('hello' => 'NIHAU JOE!');

+    our @ISA =  'Whunk::L10N';

+    our %Lexicon = ('hello' => 'NIHAU JOE!');

 }

 $ENV{'REQUEST_METHOD'} = 'GET';

diff --git a/t/70_fail_auto.t b/t/70_fail_auto.t

index 44fe54d..df0de3e 100644

--- a/t/70_fail_auto.t

+++ b/t/70_fail_auto.t

@@ -9,14 +9,12 @@ BEGIN {

 {

     package Whunk::L10N;

-    use vars qw(@ISA);

-    @ISA =  'Locale::Maketext';

+    our @ISA =  'Locale::Maketext';

 }

 {

     package Whunk::L10N::en;

-    use vars qw(@ISA);

-    @ISA = 'Whunk::L10N';

+    our @ISA = 'Whunk::L10N';

 }

 my $lh = Whunk::L10N->get_handle('en');

-- 

2.14.3