Changeset 484

Timestamp:

05/31/23 23:38:51 (11 months ago)

Author:

nanardon

Message:

Utf8 fixes

Location:

trunk

Files:

• lib/Epoll/View/Mail.pm (modified) (2 diffs)
• root/mail/ballot_confirm.tt (modified) (1 diff)
• root/mail/includes/loc.tt (modified) (1 diff)
• root/mail/poll_reminder_voting.tt (modified) (1 diff)
• root/mail/poll_request.tt (modified) (1 diff)
• root/mail/voting_passwd.tt (modified) (2 diffs)

trunk/lib/Epoll/View/Mail.pm

@@ -11 +11 @@
     INCLUDE_PATH => Epoll->path_to( 'root', 'mail' ),
     PLUGIN_BASE => 'Epoll::Template::Plugin',
-    PRE_PROCESS => [ 'includes/loc.tt', ],
+    PRE_PROCESS => [ 'includes/loc.tt' ],
+    expose_methods => [ qw(utf8fix) ],
+    ENCODING => 'utf-8',
 );
 
@@ -23 +25 @@
 
 =cut
+
+sub utf8fix {
+    my ($self, $c, @string) = @_;
+    map { utf8::encode($_) } @string;
+    @string;
+}
 
 sub render {

trunk/root/mail/ballot_confirm.tt

@@ -3 +3 @@
 
 --------
-[% poll.info.label %]
+[% utf8fix(poll.info.label) %]
 --------
 
 [% IF NOT poll.info.no_mail_ballot_id %]
 [% l('Your ballot ID') %]:
-[% ballotid %]
+[% utf8fix(ballotid) %]
 [% END %]
 

trunk/root/mail/includes/loc.tt

@@ -1 +1 @@
 [% MACRO l(text, args) BLOCK;
-    c.localize(text, args);
+    utf8fix(c.localize(text, args));
 END; %]
 

trunk/root/mail/poll_reminder_voting.tt

@@ -11 +11 @@
 [%- poll = vote.poll(p.poll) -%]
 [% c.uri_for('/', 'ballot', poll.uid) %]
-[% poll.info('label') %]
-[% l('This poll end') %]: [% poll.info.dend %] [% poll.info.hend %].
+[% utf8fix(poll.info('label')) %]
+[% l('This poll end') %]: [% utf8fix(poll.info.dend) %] [% utf8fix(poll.info.hend) %].
 
 [% END %]

trunk/root/mail/poll_request.tt

@@ -1 +1 @@
 [% l('You\'ve requested to create a new poll') %]:
-[% label %]
+[% utf8fix(label) %]
 
 [% l('Your request ID is') %]:

trunk/root/mail/voting_passwd.tt

@@ -2 +2 @@
 [% l('You are invited to participate in this poll') %]
 
-[% poll.info.label %]
+[% utf8fix(poll.info.label) %]
 
 --
@@ -19 +19 @@
 
 [% IF poll.info('description') %]
-[% poll.info('description') %]
+[% utf8fix(poll.info('description')) %]
 --------
 [%- END %]
 [% IF poll.info('procedure') %]
-[% poll.info('procedure') %]
+[% utf8fix(poll.info('procedure')) %]
 --------
 [%- END %]