From 5af8f20e98554d121b3a81e3260dbfd64db74a2b Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Sat, 28 Feb 2015 22:32:07 +0100
Subject: No decode() on strftime()

---
 jm2l/templates/Logistique/Dialog_Covoit.mako | 2 +-
 jm2l/templates/Logistique/Dialog_Heberg.mako | 2 +-
 jm2l/templates/Logistique/Dialog_Matos.mako  | 4 ++--
 jm2l/templates/Logistique/Logistique.mako    | 8 ++++----
 jm2l/templates/Logistique/Tables.mako        | 8 ++++----
 jm2l/templates/Public/Programme.mako         | 2 +-
 jm2l/templates/Staff/list.mako               | 4 ++--
 jm2l/templates/edit_event.mako               | 8 ++++----
 jm2l/templates/helpers.mako                  | 2 +-
 jm2l/templates/show_user.mako                | 2 +-
 jm2l/templates/view_event.mako               | 4 ++--
 jm2l/templates/view_tiers.mako               | 2 +-
 jm2l/templates/view_user.mako                | 2 +-
 13 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/jm2l/templates/Logistique/Dialog_Covoit.mako b/jm2l/templates/Logistique/Dialog_Covoit.mako
index 7e2bf9b..3530f15 100644
--- a/jm2l/templates/Logistique/Dialog_Covoit.mako
+++ b/jm2l/templates/Logistique/Dialog_Covoit.mako
@@ -30,7 +30,7 @@
                 </tbody>
             </table>
             <center>
-            Pour un co-voiturage le <u>${Exch.start_time.strftime("%a %d %b").decode('utf-8')}</u>
+            Pour un co-voiturage le <u>${Exch.start_time.strftime("%a %d %b")}</u>
             vers <strong>${Exch.start_time.strftime("%H:%M")}</strong>
             </center>            
             Temps de voyage estimé à <span id="summary"></span>
diff --git a/jm2l/templates/Logistique/Dialog_Heberg.mako b/jm2l/templates/Logistique/Dialog_Heberg.mako
index 75f6ce3..737dfd5 100644
--- a/jm2l/templates/Logistique/Dialog_Heberg.mako
+++ b/jm2l/templates/Logistique/Dialog_Heberg.mako
@@ -12,7 +12,7 @@
             <dd>Un hébergement</dd>
         % endif
         <dt>Quand </dt>
-        <dd>La nuit du ${Exch.start_time.strftime('%A %d %b %Y').decode('utf-8')} jusqu'au lendemain</dd>
+        <dd>La nuit du ${Exch.start_time.strftime('%A %d %b %Y')} jusqu'au lendemain</dd>
         % if Exch.description:
             <dt>Détails </dt>
             <dd>${Exch.description}</dd>
diff --git a/jm2l/templates/Logistique/Dialog_Matos.mako b/jm2l/templates/Logistique/Dialog_Matos.mako
index 4f2085c..4974dd9 100644
--- a/jm2l/templates/Logistique/Dialog_Matos.mako
+++ b/jm2l/templates/Logistique/Dialog_Matos.mako
@@ -8,8 +8,8 @@
         <dt>Catégorie</dt>
         <dd>${Exch.Category.exch_subtype}</dd>
         <dt>Quand </dt>
-        <dd>de ${Exch.start_time.strftime('%A %d %b %Y').decode('utf-8')} vers ${Exch.start_time.strftime('%Hh%M')}
-            à ${Exch.end_time.strftime('%A %d %b %Y').decode('utf-8')} vers ${Exch.end_time.strftime('%Hh%M')}
+        <dd>de ${Exch.start_time.strftime('%A %d %b %Y')} vers ${Exch.start_time.strftime('%Hh%M')}
+            à ${Exch.end_time.strftime('%A %d %b %Y')} vers ${Exch.end_time.strftime('%Hh%M')}
         </dd>
         <dt>Détails </dt>
         <dd>${Exch.description}</dd>
diff --git a/jm2l/templates/Logistique/Logistique.mako b/jm2l/templates/Logistique/Logistique.mako
index adb55ae..ce3f86b 100644
--- a/jm2l/templates/Logistique/Logistique.mako
+++ b/jm2l/templates/Logistique/Logistique.mako
@@ -112,7 +112,7 @@ elif Type=='M':
                         <a href="/user/${item.provider.slug}"> ${item.provider.prenom} ${item.provider.nom} </a> offre 
                     % endif
                         % if item.exch_type=="C":
-                        un co-voiturage le ${item.start_time.strftime('%a %d %b vers %Hh%M').decode('utf-8')}
+                        un co-voiturage le ${item.start_time.strftime('%a %d %b vers %Hh%M')}
                         de <a href="javascript:DoGetLieu('/2015/modal/Place/${item.Itin.start.place_id}')">${item.Itin.start.display_name}</a>
                         à <a href="javascript:DoGetLieu('/2015/modal/Place/${item.Itin.arrival.place_id}')">${item.Itin.arrival.display_name}</a>
                         % elif item.exch_type=="M":
@@ -122,8 +122,8 @@ elif Type=='M':
                             % if item.description:
                                 ${item.description[:30]}
                             % endif
-                             de ${item.start_time.strftime('%a %d %b %Hh%M').decode('utf-8')}
-                             à ${item.end_time.strftime('%a %d %b %Hh%M').decode('utf-8')}
+                             de ${item.start_time.strftime('%a %d %b %Hh%M')}
+                             à ${item.end_time.strftime('%a %d %b %Hh%M')}
                         % else:
                             % if item.Category:
                                 <i>${item.Category.exch_subtype}</i>
@@ -131,7 +131,7 @@ elif Type=='M':
                             % if item.description:
                                 ${item.description[:30]}
                             % endif
-                            ${item.start_time.strftime('%a %d %b').decode('utf-8')} soir
+                            ${item.start_time.strftime('%a %d %b')} soir
                         % endif
                         </p>                        
                     </td>
diff --git a/jm2l/templates/Logistique/Tables.mako b/jm2l/templates/Logistique/Tables.mako
index c97ea83..a8bbf06 100644
--- a/jm2l/templates/Logistique/Tables.mako
+++ b/jm2l/templates/Logistique/Tables.mako
@@ -97,17 +97,17 @@ elif Type=='M':
                     </td>
                     <td>
                         %if Type=='C':
-                            ${item.start_time.strftime('%A %d %b %Y').decode('utf-8')} vers ${item.start_time.strftime('%Hh%M')}
+                            ${item.start_time.strftime('%A %d %b %Y')} vers ${item.start_time.strftime('%Hh%M')}
                             de <a href="javascript:DoGetLieu('/2015/modal/Place/${item.Itin.start.place_id}')">${item.Itin.start.display_name}</a>
                             à <a href="javascript:DoGetLieu('/2015/modal/Place/${item.Itin.arrival.place_id}')">${item.Itin.arrival.display_name}</a>
                         %elif Type=='H':
                             % if item.Category:
                             <i>${item.Category.exch_subtype}</i>, 
                             % endif
-                            La nuit du ${item.start_time.strftime('%A %d %b %Y').decode('utf-8')}<br>
+                            La nuit du ${item.start_time.strftime('%A %d %b %Y')}<br>
                         %elif Type=='M':
-                            de ${item.start_time.strftime('%A %d %b %Y').decode('utf-8')} vers ${item.start_time.strftime('%Hh%M')}
-                            à ${item.end_time.strftime('%A %d %b %Y').decode('utf-8')} vers ${item.end_time.strftime('%Hh%M')}<br>
+                            de ${item.start_time.strftime('%A %d %b %Y')} vers ${item.start_time.strftime('%Hh%M')}
+                            à ${item.end_time.strftime('%A %d %b %Y')} vers ${item.end_time.strftime('%Hh%M')}<br>
                             ${item.Category.exch_subtype}
                         %endif                            
                         %if item.description:
diff --git a/jm2l/templates/Public/Programme.mako b/jm2l/templates/Public/Programme.mako
index a3274a1..cc066cf 100644
--- a/jm2l/templates/Public/Programme.mako
+++ b/jm2l/templates/Public/Programme.mako
@@ -105,7 +105,7 @@ if Counter==0:
                     vid = event.video.first()
                     pres = event.presentation.first()
                 %>  
-                    ${event.start_time.strftime("%a %d %b").decode('utf-8')}<br>
+                    ${event.start_time.strftime("%a %d %b")}<br>
                     ${event.start_time.strftime("%H:%M")} - ${event.end_time.strftime("%H:%M")}
                 </td>
                 <td style="position: relative;">
diff --git a/jm2l/templates/Staff/list.mako b/jm2l/templates/Staff/list.mako
index a7abbf9..6746bea 100644
--- a/jm2l/templates/Staff/list.mako
+++ b/jm2l/templates/Staff/list.mako
@@ -56,7 +56,7 @@ from slugify import slugify
                     <a href="/Staff/tasks/${task.uid}">
                         <span class="name">${task.name}</span>
                     </a>
-                    <span style="float:right;">${task.due_date.strftime("%d %b").decode("utf-8")}</span>
+                    <span style="float:right;">${task.due_date.strftime("%d %b")}</span>
                 % endif
             </td>
             <td style="position: relative;width:70px;">
@@ -95,4 +95,4 @@ from slugify import slugify
         $('a[href="' + location.hash + '"]').tab('show');
     }
 </script>
-</%def>
\ No newline at end of file
+</%def>
diff --git a/jm2l/templates/edit_event.mako b/jm2l/templates/edit_event.mako
index f033810..1c6aa66 100644
--- a/jm2l/templates/edit_event.mako
+++ b/jm2l/templates/edit_event.mako
@@ -46,7 +46,7 @@
 
 % if 'uid' in form._fields:
     <div class="borderboxtime">
-    ${event.start_time.strftime('%d %b %Y').decode('utf-8')} -
+    ${event.start_time.strftime('%d %b %Y')} -
     ${event.start_time.strftime('%H:%M')} à ${event.end_time.strftime('%H:%M')}
     %if event.Salle:
         - <strong>Salle</strong>: ${event.Salle.name}
@@ -177,10 +177,10 @@ TabFields = [
     </form>
 </fieldset>
 <div class="clearfix">&nbsp;</div>
-    <p style="float:right;">Créé le ${event.created.strftime('%d %b %Y').decode('utf-8')}</p>
+    <p style="float:right;">Créé le ${event.created.strftime('%d %b %Y')}</p>
 %else:
     <p style="float:right;">Créé le  
-        ${datetime.now().strftime('%d %b %Y').decode('utf-8')}
+        ${datetime.now().strftime('%d %b %Y')}
     </p>
 % endif
 <br/>
@@ -217,4 +217,4 @@ if formAdd:
         context._kwargs['postpone_js'].append( "$('#%s-help').popover();" % jsitem )
 %>
 ##${helpers.uploader_js()}
-% endif
\ No newline at end of file
+% endif
diff --git a/jm2l/templates/helpers.mako b/jm2l/templates/helpers.mako
index 525ea62..d02f12c 100644
--- a/jm2l/templates/helpers.mako
+++ b/jm2l/templates/helpers.mako
@@ -282,7 +282,7 @@ TabJs = {'select':[], 'desc':[]}
                 vid = event.video.first()
                 pres = event.presentation.first()
             %>  
-                ${event.start_time.strftime('%d %b %Y').decode('utf-8')}
+                ${event.start_time.strftime('%d %b %Y')}
                 ${start.hour}:${"%.2d" % start.minute}-${end.hour}:${"%.2d" % end.minute}                 
         </td>
         <td style="position: relative;">${event.event_type}:
diff --git a/jm2l/templates/show_user.mako b/jm2l/templates/show_user.mako
index f661346..e96ee0b 100644
--- a/jm2l/templates/show_user.mako
+++ b/jm2l/templates/show_user.mako
@@ -73,5 +73,5 @@
 </div>
 <br/>
 <hr/>
-<p style="float:right;">Créé le ${DispUser.created.strftime('%d %b %Y').decode('utf-8')}</p>
+<p style="float:right;">Créé le ${DispUser.created.strftime('%d %b %Y')}</p>
 
diff --git a/jm2l/templates/view_event.mako b/jm2l/templates/view_event.mako
index 64d90d9..bc6b782 100644
--- a/jm2l/templates/view_event.mako
+++ b/jm2l/templates/view_event.mako
@@ -1,7 +1,7 @@
 <%inherit file="jm2l:templates/layout.mako"/>
     <strong>${event.event_type}</strong>: 
 <div class="borderboxtime">
-${event.start_time.strftime('%d %b %Y').decode('utf-8')} -
+${event.start_time.strftime('%d %b %Y')} -
 ${event.start_time.strftime('%H:%M')} à ${event.end_time.strftime('%H:%M')}
 %if event.Salle:
     - <strong>Salle</strong>: ${event.Salle.name}
@@ -63,7 +63,7 @@ ${event.start_time.strftime('%H:%M')} à ${event.end_time.strftime('%H:%M')}
 </p>
 % endfor
 <div class="clearfix">&nbsp;</div>
-<p style="float:right;">Créé le ${event.created.strftime('%d %b %Y').decode('utf-8')}</p>
+<p style="float:right;">Créé le ${event.created.strftime('%d %b %Y')}</p>
 <br/>
 <hr/>
 
diff --git a/jm2l/templates/view_tiers.mako b/jm2l/templates/view_tiers.mako
index cbb84f2..d7b9d25 100644
--- a/jm2l/templates/view_tiers.mako
+++ b/jm2l/templates/view_tiers.mako
@@ -78,7 +78,7 @@ ${The_entity_type.entity_subtype}
 </p>
 % endfor
 
-<p style="float:right;">Créé le ${entity.created.strftime('%d %b %Y').decode('utf-8')}</p>
+<p style="float:right;">Créé le ${entity.created.strftime('%d %b %Y')}</p>
 <br/>
 <hr/>
 
diff --git a/jm2l/templates/view_user.mako b/jm2l/templates/view_user.mako
index 4a9f6d1..5012da4 100644
--- a/jm2l/templates/view_user.mako
+++ b/jm2l/templates/view_user.mako
@@ -41,5 +41,5 @@
     <h4>Ses interventions :</h4>
     ${helpers.show_Interventions(DispUser.events)}
 % endif
-<p style="float:right;">Créé le ${DispUser.created.strftime('%d %b %Y').decode('utf-8')}</p>
+<p style="float:right;">Créé le ${DispUser.created.strftime('%d %b %Y')}</p>
 
-- 
cgit v1.2.3-54-g00ecf