v1.9983

CHANGES

@@ -1,6 +1,8 @@
 Revision history for Perl module Geo::Address::Formatter.
 
-1.9983
+1.9983 2024-10-28
+      - more tests for abbreviations (one yaml file per language)
+      - change regex used in abbreviations
 
 1.9982 2023-06-08
       - no longer use File::Find::Rule to find config files (still used in tests)

lib/Geo/Address/Formatter.pm

@@ -839,21 +839,21 @@ sub _abbreviate {
         foreach my $lang (@langs) {
             # do we have abbrv for this lang?
             if (defined($self->{abbreviations}->{$lang})) {
-
+                # we have abbreviations
                 my $rh_abbr = $self->{abbreviations}->{$lang};
+
                 foreach my $comp_name (keys %$rh_abbr) {
                     next if (!defined($rh_comp->{$comp_name}));
                     foreach my $long (keys %{$rh_abbr->{$comp_name}}) {
                         my $short = $rh_abbr->{$comp_name}->{$long};
-                        $rh_comp->{$comp_name} =~ s/\b$long\b/$short/;
+                        $rh_comp->{$comp_name} =~ s/(^|\s)$long\b/$1$short/;
                     }
                 }
             } else {
                 #warn "no abbreviations defined for lang $lang";
             }
         }
     }
-
     return $rh_comp;
 }