Merge branch 'gifi'

[mfinanz.git] / SL / Locale.pm

diff --git a/SL/Locale.pm b/SL/Locale.pm
index ccf494343e9fbf843ced5e3acd17738ed6af8fa8..5503c1b9595b5c93c9ea4e96ebd5f8da7d840bc3 100644 (file)
--- a/SL/Locale.pm
+++ b/SL/Locale.pm
@@ -403,8 +403,7 @@ sub format_date_object {
   my ($self, $datetime, %params)    = @_;
 
   my $format             =  $::myconfig{dateformat} || 'yyyy-mm-dd';
-  $format                =~ s/yyyy/\%Y/;
-  $format                =~ s/yy/\%y/;
+  $format                =~ s/yy(?:yy)?/\%Y/;
   $format                =~ s/mm/\%m/;
   $format                =~ s/dd/\%d/;