--- rpms/smeserver-vacation/contribs9/smeserver-vacation-1.1.bz8772.fix.vacation.message.translation.patch 2016/07/10 15:34:32 1.1
+++ rpms/smeserver-vacation/contribs9/smeserver-vacation-1.1.bz8772.fix.vacation.message.translation.patch 2016/07/15 10:19:31 1.3
@@ -1,7 +1,7 @@
-diff -Nur smeserver-vacation-1.1.9661.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations smeserver-vacation-1.1.9661.new/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations
---- smeserver-vacation-1.1.9661.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations 2016-07-08 04:15:46.219929123 +0200
-+++ smeserver-vacation-1.1.9661.new/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations 2016-07-08 04:48:25.062730686 +0200
-@@ -80,16 +80,15 @@
+diff -Nur smeserver-vacation-1.1.bz8772.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations smeserver-vacation-1.1.bz8772.new/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations
+--- smeserver-vacation-1.1.bz8772.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations 2016-07-13 14:09:44.470013967 +0200
++++ smeserver-vacation-1.1.bz8772.new/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations 2016-07-13 21:38:38.050822215 +0200
+@@ -80,19 +80,15 @@
and don't translate $SUBJECT -->
AWAY_FROM_MAIL
@@ -15,15 +15,75 @@ diff -Nur smeserver-vacation-1.1.9661.ol
-
- ]]>
-
-+
-+
++ I will not be reading my mail for a while. Your mail regarding $SUBJECT will be read when I return.
NO_USERS_IN_GRANTED_GROUPS
+ There are no users in the group(s) that you are granted to manage.
+
++
++ ANSWER_TO_OBJECT_SENDER
++ Re: $SUBJECT - Away from my email
++
++
+
+diff -Nur smeserver-vacation-1.1.bz8772.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm smeserver-vacation-1.1.bz8772.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm
+--- smeserver-vacation-1.1.bz8772.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm 2016-07-13 14:09:44.471013965 +0200
++++ smeserver-vacation-1.1.bz8772.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm 2016-07-13 21:37:43.779937434 +0200
+@@ -165,9 +165,10 @@
+
+ my $from = 'From:';
+ my $away = $self->localise('AWAY_FROM_MAIL');
++ my $return = $self->localise('ANSWER_TO_OBJECT_SENDER');
+
+- my $ExistingMessage = "$from $fullname <\;$user\@$domain>\;\n".
+- "$away";
++ my $ExistingMessage = "$from $fullname <\;$user\@$domain>\;\n"."subject: $return\n".
++ "\n$away";
+
+ # if exists and is not empty
+ if (( -e $vfile ) && (! -z $vfile ))
+@@ -218,9 +219,10 @@
+
+ my $from = 'From:';
+ my $away = $self->localise('AWAY_FROM_MAIL');
++ my $return = $self->localise('ANSWER_TO_OBJECT_SENDER');
+
+- my $vacation_text = "$from $fullname \<$user\@$domain\>\n".
+- "$away \n";
++ my $vacation_text = "$from $fullname \<$user\@$domain\>\n"."subject: $return\n".
++ "\n$away \n";
+
+ my $reset = $vacation_text;
+
+@@ -322,9 +324,10 @@
+
+ my $from = 'From:';
+ my $away = $self->localise('AWAY_FROM_MAIL');
++ my $return = $self->localise('ANSWER_TO_OBJECT_SENDER');
+
+- my $ExistingMessage = "$from $fullname <\;$user\@$domain>\;\n".
+- "$away";
++ my $ExistingMessage = "$from $fullname <\;$user\@$domain>\;\n"."subject: $return\n".
++ "\n$away";
+
+ # if exists and is not empty
+ if (( -e $vfile ) && (! -z $vfile ))
+@@ -377,9 +380,10 @@
+
+ my $from = 'From:';
+ my $away = $self->localise('AWAY_FROM_MAIL');
++ my $return = $self->localise('ANSWER_TO_OBJECT_SENDER');
+
+- my $vacation_text = "$from $fullname \<$user\@$domain\>\n".
+- "$away \n";
++ my $vacation_text = "$from $fullname \<$user\@$domain\>\n"."subject: $return\n".
++ "\n$away \n";
+
+ my $reset = $vacation_text;
+
+@@ -438,3 +442,4 @@
+ }
+
+ 1;
++