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

Annotation 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

Revision 1.5 - (hide annotations) (download)
Sat Jul 16 06:19:59 2016 UTC (8 years, 4 months ago) by stephdl
Branch: MAIN
CVS Tags: smeserver-vacation-1_1-22_el6_sme, smeserver-vacation-1_1-24_el6_sme, smeserver-vacation-1_1-26_el6_sme, smeserver-vacation-1_1-25_el6_sme, smeserver-vacation-1_1-23_el6_sme, HEAD
Changes since 1.4: +4 -4 lines 
* Sat Jul 16 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 1.1-22.sme
- Added a capital to subject : Subject [SME: 8772]
1 stephdl 1.2 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 stephdl 1.3 +++ 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 stephdl 1.2 @@ -80,19 +80,15 @@
5 stephdl 1.1 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 stephdl 1.2 + <trans>I will not be reading my mail for a while. Your mail regarding $SUBJECT will be read when I return.</trans>
19 stephdl 1.1 </entry>
20     <entry>
21     <base>NO_USERS_IN_GRANTED_GROUPS</base>
22 stephdl 1.2 <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 stephdl 1.3 + <trans>Re: $SUBJECT - Away from my email </trans>
27 stephdl 1.2 + </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 stephdl 1.4 +++ 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 stephdl 1.2 @@ -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 stephdl 1.5 + my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."Subject: $return\n".
42 stephdl 1.4 + "\n$away\n"."\n--\n$fullname";
43 stephdl 1.2
44     # if exists and is not empty
45     if (( -e $vfile ) && (! -z $vfile ))
46 stephdl 1.3 @@ -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 stephdl 1.5 + my $vacation_text = "$from $fullname \<$user\@$domain\>\n"."Subject: $return\n".
55 stephdl 1.4 + "\n$away \n"."\n--\n$fullname";
56 stephdl 1.3
57     my $reset = $vacation_text;
58    
59     @@ -322,9 +324,10 @@
60 stephdl 1.2
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 stephdl 1.5 + my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."Subject: $return\n".
68 stephdl 1.4 + "\n$away"."\n--\n$fullname";
69 stephdl 1.2
70     # if exists and is not empty
71     if (( -e $vfile ) && (! -z $vfile ))
72 stephdl 1.3 @@ -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 stephdl 1.5 + my $vacation_text = "$from $fullname \<$user\@$domain\>\n"."Subject: $return\n".
81 stephdl 1.4 + "\n$away \n"."\n--\n$fullname";
82 stephdl 1.3
83     my $reset = $vacation_text;
84    
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed