/[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.1 by stephdl, Sun Jul 10 15:34:32 2016 UTC Revision 1.4 by stephdl, Fri Jul 15 18:22:13 2016 UTC
# Line 1  Line 1 
1  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  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.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.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.9661.new/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations       2016-07-08 04:48:25.062730686 +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,16 +80,15 @@  @@ -80,19 +80,15 @@
5       and don't translate $SUBJECT -->       and don't translate $SUBJECT -->
6       <entry>       <entry>
7         <base>AWAY_FROM_MAIL</base>         <base>AWAY_FROM_MAIL</base>
# Line 15  diff -Nur smeserver-vacation-1.1.9661.ol Line 15  diff -Nur smeserver-vacation-1.1.9661.ol
15  -</p>    -</p>  
16  -        ]]>  -        ]]>
17  -      </trans>  -      </trans>
18  +       <trans> <![CDATA[ Subject: Re: $SUBJECT - Away from my email  +      <trans>I will not be reading my mail for a while. Your mail regarding  $SUBJECT will be read when I return.</trans>
 +  
 +I will not be reading my mail for a while. Your mail regarding  
 +  
 +     $SUBJECT  
 +  
 + will be read when I return.  
 +         ]]>  
 +       </trans>  
19       </entry>       </entry>
20       <entry>       <entry>
21         <base>NO_USERS_IN_GRANTED_GROUPS</base>         <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>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-14 05:45:17.766830058 +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"."subject: $return\n".
42    +                          "\n$away\n"."\n--\n$fullname";
43    
44         # if exists and is not empty
45         if (( -e $vfile ) && (! -z $vfile ))
46    @@ -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:';
62         my $away = $self->localise('AWAY_FROM_MAIL');
63    +    my $return = $self->localise('ANSWER_TO_OBJECT_SENDER');
64    
65    -    my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n".
66    -                          "$away";
67    +    my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."subject: $return\n".
68    +                          "\n$away"."\n--\n$fullname";
69    
70         # if exists and is not empty
71         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