smeserver-vacation/contribs9/smeserver-vacation-1.1.bz8772.fix.vacation.message.translation.patch

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 14:15:43.357251137 +0200
@@ -80,19 +80,15 @@
     and don't translate $SUBJECT -->
     <entry>
       <base>AWAY_FROM_MAIL</base>
-      <trans> <![CDATA[ Subject: Re: $SUBJECT - Away from my email 
-<p>
-I will not be reading my mail for a while. Your mail regarding  
-</p><p>
-    $SUBJECT
-</p><p>
-will be read when I return.
-</p>   
-        ]]>
-      </trans>
+      <trans>I will not be reading my mail for a while. Your mail regarding  $SUBJECT will be read when I return.</trans>
     </entry>
     <entry>
       <base>NO_USERS_IN_GRANTED_GROUPS</base>
       <trans>There are no users in the group(s) that you are granted to manage.</trans>
     </entry>
+    <entry>
+      <base>ANSWER_TO_OBJECT_SENDER</base>
+      <trans>Subject: Re: $SUBJECT - Away from my email </trans>
+    </entry>
+
 </lexicon>
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 14:12:35.775649855 +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 &lt\;$user\@$domain&gt\;\n".
-                          "$away";
+    my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."$return\n".
+                          "\n$away";
 
     # if exists and is not empty
     if (( -e $vfile ) && (! -z $vfile ))
@@ -322,9 +323,10 @@
 
     my $from = 'From:';
     my $away = $self->localise('AWAY_FROM_MAIL');
+    my $return = $self->localise('ANSWER_TO_OBJECT_SENDER');
 
-    my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n".
-                          "$away";
+    my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."$return\n".
+                          "\n$away";
 
     # if exists and is not empty
     if (( -e $vfile ) && (! -z $vfile ))
1	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
2	--- 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
3	+++ smeserver-vacation-1.1.bz8772.new/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations 2016-07-13 14:15:43.357251137 +0200
4	@@ -80,19 +80,15 @@
5	and don't translate $SUBJECT -->
6	<entry>
7	<base>AWAY_FROM_MAIL</base>
8	- <trans> <![CDATA[ Subject: Re: $SUBJECT - Away from my email
9	-<p>
10	-I will not be reading my mail for a while. Your mail regarding
11	-</p><p>
12	- $SUBJECT
13	-</p><p>
14	-will be read when I return.
15	-</p>
16	- ]]>
17	- </trans>
18	+ <trans>I will not be reading my mail for a while. Your mail regarding $SUBJECT will be read when I return.</trans>
19	</entry>
20	<entry>
21	<base>NO_USERS_IN_GRANTED_GROUPS</base>
22	<trans>There are no users in the group(s) that you are granted to manage.</trans>
23	</entry>
24	+ <entry>
25	+ <base>ANSWER_TO_OBJECT_SENDER</base>
26	+ <trans>Subject: Re: $SUBJECT - Away from my email </trans>
27	+ </entry>
28	+
29	</lexicon>
30	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
31	--- 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
32	+++ smeserver-vacation-1.1.bz8772.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm 2016-07-13 14:12:35.775649855 +0200
33	@@ -165,9 +165,10 @@
34
35	my $from = 'From:';
36	my $away = $self->localise('AWAY_FROM_MAIL');
37	+ my $return = $self->localise('ANSWER_TO_OBJECT_SENDER');
38
39	- my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n".
40	- "$away";
41	+ my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."$return\n".
42	+ "\n$away";
43
44	# if exists and is not empty
45	if (( -e $vfile ) && (! -z $vfile ))
46	@@ -322,9 +323,10 @@
47
48	my $from = 'From:';
49	my $away = $self->localise('AWAY_FROM_MAIL');
50	+ my $return = $self->localise('ANSWER_TO_OBJECT_SENDER');
51
52	- my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n".
53	- "$away";
54	+ my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."$return\n".
55	+ "\n$away";
56
57	# if exists and is not empty
58	if (( -e $vfile ) && (! -z $vfile ))