/[smecontribs]/rpms/smeserver-vacation/contribs9/smeserver-vacation-1.1.bz8772.fix.vacation.message.translation.patch
ViewVC logotype

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

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.2 by stephdl, Thu Jul 14 20:56:10 2016 UTC Revision 1.5 by stephdl, Sat Jul 16 06:19:59 2016 UTC
# Line 1  Line 1 
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  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  --- 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  +++ 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
4  @@ -80,19 +80,15 @@  @@ -80,19 +80,15 @@
5       and don't translate $SUBJECT -->       and don't translate $SUBJECT -->
6       <entry>       <entry>
# Line 23  diff -Nur smeserver-vacation-1.1.bz8772. Line 23  diff -Nur smeserver-vacation-1.1.bz8772.
23       </entry>       </entry>
24  +    <entry>  +    <entry>
25  +      <base>ANSWER_TO_OBJECT_SENDER</base>  +      <base>ANSWER_TO_OBJECT_SENDER</base>
26  +      <trans>Subject: Re: $SUBJECT - Away from my email </trans>  +      <trans>Re: $SUBJECT - Away from my email </trans>
27  +    </entry>  +    </entry>
28  +  +
29   </lexicon>   </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  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  --- 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  +++ smeserver-vacation-1.1.bz8772.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm 2016-07-14 05:45:17.766830058 +0200
33  @@ -165,9 +165,10 @@  @@ -165,9 +165,10 @@
34    
35       my $from = 'From:';       my $from = 'From:';
# Line 38  diff -Nur smeserver-vacation-1.1.bz8772. Line 38  diff -Nur smeserver-vacation-1.1.bz8772.
38    
39  -    my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n".  -    my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n".
40  -                          "$away";  -                          "$away";
41  +    my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."$return\n".  +    my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."Subject: $return\n".
42  +                          "\n$away";  +                          "\n$away\n"."\n--\n$fullname";
43    
44       # if exists and is not empty       # if exists and is not empty
45       if (( -e $vfile ) && (! -z $vfile ))       if (( -e $vfile ) && (! -z $vfile ))
46  @@ -322,9 +323,10 @@  @@ -218,9 +219,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 $vacation_text   = "$from $fullname \<$user\@$domain\>\n".
53    -                          "$away \n";
54    +    my $vacation_text   = "$from $fullname \<$user\@$domain\>\n"."Subject: $return\n".
55    +                          "\n$away \n"."\n--\n$fullname";
56    
57         my $reset = $vacation_text;
58    
59    @@ -322,9 +324,10 @@
60    
61       my $from = 'From:';       my $from = 'From:';
62       my $away = $self->localise('AWAY_FROM_MAIL');       my $away = $self->localise('AWAY_FROM_MAIL');
# Line 51  diff -Nur smeserver-vacation-1.1.bz8772. Line 64  diff -Nur smeserver-vacation-1.1.bz8772.
64    
65  -    my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n".  -    my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n".
66  -                          "$away";  -                          "$away";
67  +    my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."$return\n".  +    my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."Subject: $return\n".
68  +                          "\n$away";  +                          "\n$away"."\n--\n$fullname";
69    
70       # if exists and is not empty       # if exists and is not empty
71       if (( -e $vfile ) && (! -z $vfile ))       if (( -e $vfile ) && (! -z $vfile ))
72    @@ -377,9 +380,10 @@
73    
74         my $from = 'From:';
75         my $away = $self->localise('AWAY_FROM_MAIL');
76    +    my $return = $self->localise('ANSWER_TO_OBJECT_SENDER');
77    
78    -    my $vacation_text   = "$from $fullname \<$user\@$domain\>\n".
79    -                          "$away \n";
80    +    my $vacation_text   = "$from $fullname \<$user\@$domain\>\n"."Subject: $return\n".
81    +                          "\n$away \n"."\n--\n$fullname";
82    
83         my $reset = $vacation_text;
84    

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed