From cb712f43cd97d33fc04bde3dddab896639331036 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 17 Jul 2015 12:26:16 +0200
Subject: [PATCH] Update templates syntaxe so gettext.pl can extract strings

---
 templates/default/about.html.ep              | 16 +++---
 templates/default/admin.html.ep              |  4 +-
 templates/default/admin_audit.html.ep        | 16 +++---
 templates/default/admin_manage_rooms.html.ep | 10 ++--
 templates/default/auth_modal.html.ep         | 10 ++--
 templates/default/configure_modal.html.ep    | 52 ++++++++---------
 templates/default/delete_room_modal.html.ep  |  8 +--
 templates/default/error.html.ep              | 12 ++--
 templates/default/feedback.html.ep           | 16 +++---
 templates/default/feedback.mail.ep           |  6 +-
 templates/default/feedback_thanks.html.ep    |  6 +-
 templates/default/footer.html.ep             |  4 +-
 templates/default/goodbye.html.ep            |  8 +--
 templates/default/header.html.ep             |  2 +-
 templates/default/help.html.ep               | 24 ++++----
 templates/default/index.html.ep              | 44 +++++++--------
 templates/default/invitation.html.ep         | 22 ++++----
 templates/default/invitation_thanks.html.ep  |  6 +-
 templates/default/invite.mail.ep             | 20 +++----
 templates/default/invite_modal.html.ep       | 14 ++---
 templates/default/join.html.ep               | 84 ++++++++++++++--------------
 templates/default/kicked.html.ep             |  6 +-
 templates/default/noscript.html.ep           |  2 +-
 templates/default/notification.mail.ep       | 10 ++--
 templates/default/public_toolbar.html.ep     | 12 ++--
 25 files changed, 207 insertions(+), 207 deletions(-)

diff --git a/templates/default/about.html.ep b/templates/default/about.html.ep
index 0fbda21..f3bb2c5 100644
--- a/templates/default/about.html.ep
+++ b/templates/default/about.html.ep
@@ -5,12 +5,12 @@
   <div class="panel panel-default">
     <div class="panel-heading">
       <h3 class="panel-title">
-        <%=l 'ABOUT' %>
+        <%= l('ABOUT') %>
       </h3>
     </div>
     <div class="panel-body">
       <p>
-        <%==l 'ABOUT_VROOM' %>
+        <%== l('ABOUT_VROOM') %>
       </p>
     </div>
   </div>
@@ -18,12 +18,12 @@
   <div class="panel panel-default">
     <div class="panel-heading">
       <h3 class="panel-title">
-        <%=l 'WHO_IS_BEHIND_VROOM' %>
+        <%= l('WHO_IS_BEHIND_VROOM') %>
       </h3>
     </div>
     <div class="panel-body">
       <p>
-        <%==l 'ABOUT_WHO_IS_BEHIND_VROOM' %>
+        <%== l('ABOUT_WHO_IS_BEHIND_VROOM') %>
       </p>
     </div>
   </div>
@@ -31,12 +31,12 @@
   <div class="panel panel-default">
     <div class="panel-heading">
       <h3 class="panel-title">
-        <%=l 'THANKS' %>
+        <%= l('THANKS') %>
       </h3>
     </div>
     <div class="panel-body">
       <p>
-        <%==l 'ABOUT_THANKS' %>
+        <%== l('ABOUT_THANKS') %>
         <ul>
           <% foreach my $component (sort keys %{$components}) { %>
             <li>
@@ -46,11 +46,11 @@
         </ul>
       </p>
       <p>
-        <%=l 'ABOUT_MUSICS' %>
+        <%= l('ABOUT_MUSICS') %>
         <ul>
           <% foreach my $music (sort keys %{$musics}) { %>
             <li>
-              <%= $music %> <%=l 'FROM_AUTHOR' %> <a href="<%= $musics->{$music}->{author_url} %>"><%= $musics->{$music}->{author} %></a> (<a href="<%= $musics->{$music}->{licence_url} %>"><%= $musics->{$music}->{licence} %></a>)
+              <%= $music %> <%= l('FROM_AUTHOR') %> <a href="<%= $musics->{$music}->{author_url} %>"><%= $musics->{$music}->{author} %></a> (<a href="<%= $musics->{$music}->{licence_url} %>"><%= $musics->{$music}->{licence} %></a>)
             </li>
           <% } %>
       </p>
diff --git a/templates/default/admin.html.ep b/templates/default/admin.html.ep
index 40cbd7e..d8ef1ad 100644
--- a/templates/default/admin.html.ep
+++ b/templates/default/admin.html.ep
@@ -4,10 +4,10 @@
 
 <div class="col-sm-offset-3 col-md-offset-4 col-sm-6 col-md-4">
   <a class="btn btn-lg btn-primary btn-block" href="<%= $self->url_for('/admin/rooms') %>">
-    <%=l 'ROOM_MANAGEMENT' %>
+    <%= l('ROOM_MANAGEMENT') %>
   </a>
   <a class="btn btn-lg btn-primary btn-block" href="<%= $self->url_for('/admin/audit') %>">
-    <%=l 'AUDIT' %>
+    <%= l('AUDIT') %>
   </a>
 </div>
 
diff --git a/templates/default/admin_audit.html.ep b/templates/default/admin_audit.html.ep
index 6360884..f16c178 100644
--- a/templates/default/admin_audit.html.ep
+++ b/templates/default/admin_audit.html.ep
@@ -22,12 +22,12 @@
           <div class="input-group">
             <input type="text" id="dateEnd" name="dateEnd" class="form-control date-picker" value="<%= DateTime->now->ymd %>"/>
             <span class="input-group-btn">
-              <button id="events_refresh" class="btn btn-primary help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'REFRESH_EVENTS' %>">
+              <button id="events_refresh" class="btn btn-primary help" data-toggle="tooltip" data-placement="bottom" title="<%= l('REFRESH_EVENTS') %>">
                 <span class="glyphicon glyphicon-play">
                 </span>
               </button>
               <% if ($self->get_opt_features->{excel}){ %>
-              <button id="events_export" class="btn btn-default help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'EXPORT_EVENTS' %>">
+              <button id="events_export" class="btn btn-default help" data-toggle="tooltip" data-placement="bottom" title="<%= l('EXPORT_EVENTS') %>">
                 <span class="glyphicon glyphicon-save">
                 </span>
               </button>
@@ -47,22 +47,22 @@
         <thead>
           <tr>
             <th class="hidden-xs">
-              <%=l 'EVENT_ID' %>
+              <%= l('EVENT_ID') %>
             </th>
             <th>
-              <%=l 'EVENT_DATE' %>
+              <%= l('EVENT_DATE') %>
             </th>
             <th>
-              <%=l 'EVENT_FROM_IP' %>
+              <%= l('EVENT_FROM_IP') %>
             </th>
             <th class="hidden-xs">
-              <%=l 'EVENT' %>
+              <%= l('EVENT') %>
             </th>
             <th class="hidden-xs">
-              <%=l 'EVENT_USER' %>
+              <%= l('EVENT_USER') %>
             </th>
             <th>
-              <%=l 'EVENT_MESSAGE' %>
+              <%= l('EVENT_MESSAGE') %>
             </th>
           </tr>
         </thead>
diff --git a/templates/default/admin_manage_rooms.html.ep b/templates/default/admin_manage_rooms.html.ep
index fb84479..b35e573 100644
--- a/templates/default/admin_manage_rooms.html.ep
+++ b/templates/default/admin_manage_rooms.html.ep
@@ -26,19 +26,19 @@
         <thead>
           <tr>
             <th>
-              <%=l 'ROOM_NAME' %>
+              <%= l('ROOM_NAME') %>
             </th>
             <th class="hidden-xs">
-              <%=l 'CREATION_DATE' %>
+              <%= l('CREATION_DATE') %>
             </th>
             <th class="hidden-xs">
-              <%=l 'LAST_ACTIVITY' %>
+              <%= l('LAST_ACTIVITY') %>
             </th>
             <th class="hidden-xs hidden-sm">
-              <%=l 'NUMBER_OF_PARTICIPANTS' %>
+              <%= l('NUMBER_OF_PARTICIPANTS') %>
             </th>
             <th>
-              <%=l 'MANAGE' %>
+              <%= l('MANAGE') %>
             </th>
           </tr>
         </thead>
diff --git a/templates/default/auth_modal.html.ep b/templates/default/auth_modal.html.ep
index 8a4474d..971a696 100644
--- a/templates/default/auth_modal.html.ep
+++ b/templates/default/auth_modal.html.ep
@@ -6,26 +6,26 @@
               &times;
             </button>
             <h4 class="modal-title">
-              <%=l 'AUTHENTICATE' %>
+              <%= l('AUTHENTICATE') %>
             </h4>
           </div>
           <div class="modal-body">
             <form class="form-horizontal" role="form" id="ownerAuthForm">
               <div class="form-group">
                 <label for="ownerAuthPass" class="col-sm-4 control-label">
-                  <%=l 'PASSWORD' %>
+                  <%= l('PASSWORD') %>
                 </label>
                 <div class="col-sm-8">
-                  <input type="password" id="ownerAuthPass" class="form-control" placeholder="<%=l 'PASSWORD' %>"/>
+                  <input type="password" id="ownerAuthPass" class="form-control" placeholder="<%= l('PASSWORD') %>"/>
                 </div>
               </div>
               <div class="form-group">
                 <div class="col-sm-offset-4 col-sm-8">
                   <button type="submit" class="btn btn-default btn-primary">
-                    <%=l 'SUBMIT' %>
+                    <%= l('SUBMIT') %>
                   </button>
                   <button class="btn btn-default" data-dismiss="modal">
-                    <%=l 'CANCEL' %>
+                    <%= l('CANCEL') %>
                   </button>
                 </div>
               </div>
diff --git a/templates/default/configure_modal.html.ep b/templates/default/configure_modal.html.ep
index accc6b7..cb6b64e 100644
--- a/templates/default/configure_modal.html.ep
+++ b/templates/default/configure_modal.html.ep
@@ -6,15 +6,15 @@
               &times;
             </button>
             <h4 class="modal-title">
-              <%=l 'CONFIGURE' %>
+              <%= l('CONFIGURE') %>
             </h4>
           </div>
           <div class="modal-body">
             <form id="configureRoomForm" class="form-horizontal" role="form">
               <div class="form-group">
                 <label class="col-sm-4 control-label" for="lockedSet">
-                  <%=l 'LOCK_ROOM' %>
-                  <a href="#" class="popup" data-container="body" data-toggle="popover" data-content="<%=l 'TOOLTIP_LOCK_ROOM' %>">
+                  <%= l('LOCK_ROOM') %>
+                  <a href="#" class="popup" data-container="body" data-toggle="popover" data-content="<%= l('TOOLTIP_LOCK_ROOM') %>">
                     &nbsp;&nbsp
                     <span class="glyphicon glyphicon-question-sign">
                     </span>
@@ -26,8 +26,8 @@
               </div>
               <div class="form-group">
                 <label class="col-sm-4 control-label" for="askForNameSet">
-                  <%=l 'ASK_FOR_NAME' %>
-                  <a href="#" class="popup" data-container="body" data-toggle="popover" data-content="<%=l 'TOOLTIP_ASK_FOR_NAME' %>">
+                  <%= l('ASK_FOR_NAME') %>
+                  <a href="#" class="popup" data-container="body" data-toggle="popover" data-content="<%= l('TOOLTIP_ASK_FOR_NAME') %>">
                     &nbsp;&nbsp
                     <span class="glyphicon glyphicon-question-sign">
                     </span>
@@ -39,8 +39,8 @@
               </div>
               <div class="form-group">
                 <label class="col-sm-4 control-label" for="joinPassSet">
-                  <%=l 'PASSWORD_PROTECT' %>
-                  <a href="#" class="popup" data-container="body" data-toggle="popover" data-content="<%=l 'TOOLTIP_PASSWORD_PROTECT' %>">
+                  <%= l('PASSWORD_PROTECT') %>
+                  <a href="#" class="popup" data-container="body" data-toggle="popover" data-content="<%= l('TOOLTIP_PASSWORD_PROTECT') %>">
                     &nbsp;&nbsp
                     <span class="glyphicon glyphicon-question-sign">
                     </span>
@@ -52,22 +52,22 @@
               </div>
               <div class="form-group hidden-form" id="joinPassFields">
                 <label class="col-sm-4 control-label" for="joinPass">
-                  <%=l 'PASSWORD' %>
+                  <%= l('PASSWORD') %>
                 </label>
                 <div class="col-sm-8">
-                  <input id="joinPass" type="password" class="form-control" placeholder="<%=l 'PASSWORD' %>"/>
+                  <input id="joinPass" type="password" class="form-control" placeholder="<%= l('PASSWORD') %>"/>
                 </div>
                 <label class="col-sm-4 control-label" for="joinPassConfirm">
-                  <%=l 'CONFIRM_PASSWORD' %>
+                  <%= l('CONFIRM_PASSWORD') %>
                 </label>
                 <div class="col-sm-8">
-                  <input id="joinPassConfirm" type="password" class="form-control" placeholder="<%=l 'CONFIRM_PASSWORD' %>"/>
+                  <input id="joinPassConfirm" type="password" class="form-control" placeholder="<%= l('CONFIRM_PASSWORD') %>"/>
                 </div>
               </div>
               <div class="form-group">
                 <label class="col-sm-4 control-label" for="ownerPassSet">
-                  <%=l 'RESERVE_THIS_ROOM' %>
-                  <a href="#" class="popup" data-container="body" data-toggle="popover" data-content="<%=l 'TOOLTIP_RESERVE_THIS_ROOM' %>">
+                  <%= l('RESERVE_THIS_ROOM') %>
+                  <a href="#" class="popup" data-container="body" data-toggle="popover" data-content="<%= l('TOOLTIP_RESERVE_THIS_ROOM') %>">
                     &nbsp;&nbsp
                     <span class="glyphicon glyphicon-question-sign">
                     </span>
@@ -79,23 +79,23 @@
               </div>
               <div class="form-group hidden-form" id="ownerPassFields">
                 <label class="col-sm-4 control-label" for="ownerPass">
-                  <%=l 'PASSWORD' %>
+                  <%= l('PASSWORD') %>
                 </label>
                 <div class="col-sm-8">
-                  <input id="ownerPass" type="password" class="form-control" placeholder="<%=l 'PASSWORD' %>"/>
+                  <input id="ownerPass" type="password" class="form-control" placeholder="<%= l('PASSWORD') %>"/>
                 </div>
                 <label class="col-sm-4 control-label" for="ownerPassConfirm">
-                  <%=l 'CONFIRM_PASSWORD' %>
+                  <%= l('CONFIRM_PASSWORD') %>
                 </label>
                 <div class="col-sm-8">
-                  <input id="ownerPassConfirm" type="password" class="form-control" placeholder="<%=l 'CONFIRM_PASSWORD' %>"/>
+                  <input id="ownerPassConfirm" type="password" class="form-control" placeholder="<%= l('CONFIRM_PASSWORD') %>"/>
                 </div>
               </div>
               <% if (defined(stash("page")) && stash("page") eq 'admin'){ %>
               <div class="form-group">
                 <label class="col-sm-4 control-label" for="persistentSet">
-                  <%=l 'PERSISTENT' %>
-                  <a href="#" class="popup" data-container="body" data-toggle="popover" data-content="<%=l 'TOOLTIP_PERSISTENT' %>">
+                  <%= l('PERSISTENT') %>
+                  <a href="#" class="popup" data-container="body" data-toggle="popover" data-content="<%= l('TOOLTIP_PERSISTENT') %>">
                     &nbsp;&nbsp
                     <span class="glyphicon glyphicon-question-sign">
                     </span>
@@ -107,8 +107,8 @@
               </div>
               <div class="form-group">
                 <label class="col-sm-4 control-label" for="maxMembers">
-                  <%=l 'MAX_MEMBERS' %>
-                  <a href="#" class="popup" data-container="body" data-toggle="popover" data-content="<%=l 'TOOLTIP_MAX_MEMBERS' %>">
+                  <%= l('MAX_MEMBERS') %>
+                  <a href="#" class="popup" data-container="body" data-toggle="popover" data-content="<%= l('TOOLTIP_MAX_MEMBERS') %>">
                     &nbsp;&nbsp
                     <span class="glyphicon glyphicon-question-sign">
                     </span>
@@ -125,8 +125,8 @@
               <% } %>
               <div class="form-group">
                 <label class="col-sm-4 control-label" for="emailNotifications">
-                  <%=l 'NOTIFICATION_ON_JOIN' %>
-                  <a href="#" class="popup" data-container="body" data-toggle="popover" data-placement="left" data-content="<%=l 'TOOLTIP_NOTIFICATION_ON_JOIN' %>">
+                  <%= l('NOTIFICATION_ON_JOIN') %>
+                  <a href="#" class="popup" data-container="body" data-toggle="popover" data-placement="left" data-content="<%= l('TOOLTIP_NOTIFICATION_ON_JOIN') %>">
                     &nbsp;&nbsp
                     <span class="glyphicon glyphicon-question-sign">
                     </span>
@@ -134,7 +134,7 @@
                 </label>
                 <div class="col-sm-8 email-list" id="email-list-notification">
                   <div class="email-entry input-group">
-                    <input class="form-control" autocomplete="off" name="emails[]" type="text" placeholder="<%=l 'EMAIL_PLACEHOLDER' %>" />
+                    <input class="form-control" autocomplete="off" name="emails[]" type="text" placeholder="<%= l('EMAIL_PLACEHOLDER') %>" />
                     <span class="input-group-btn">
                       <button class="btn btn-primary btn-add-email" type="button">
                         <span class="glyphicon glyphicon-plus">
@@ -147,10 +147,10 @@
               <div class="form-group">
                 <div class="col-sm-offset-4 col-sm-8">
                   <button type="submit" id="configureButton" class="btn btn-primary">
-                    <%=l 'SUBMIT' %>
+                    <%= l('SUBMIT') %>
                   </button>
                   <button class="btn btn-default" data-dismiss="modal">
-                    <%=l 'CANCEL' %>
+                    <%= l('CANCEL') %>
                   </button>
                 </div>
               </div>
diff --git a/templates/default/delete_room_modal.html.ep b/templates/default/delete_room_modal.html.ep
index b52541c..003a6d1 100644
--- a/templates/default/delete_room_modal.html.ep
+++ b/templates/default/delete_room_modal.html.ep
@@ -6,12 +6,12 @@
               &times;
             </button>
             <h4 class="modal-title">
-              <%=l 'CONFIRM_DELETE' %>
+              <%= l('CONFIRM_DELETE') %>
             </h4>
           </div>
           <div class="modal-body">
             <p>
-              <%=l 'ROOM_WILL_BE_DELETED' %>
+              <%= l('ROOM_WILL_BE_DELETED') %>
             </p>
           </div>
           <div class="modal-footer">
@@ -19,10 +19,10 @@
               <div class="form-group">
                 <div class="col-sm-offset-4 col-sm-8">
                   <button type="submit" class="btn btn-danger">
-                    <%=l 'DELETE' %>
+                    <%= l('DELETE') %>
                   </button>
                   <button class="btn btn-default" data-dismiss="modal">
-                    <%=l 'CANCEL' %>
+                    <%= l('CANCEL') %>
                   </button>
                 </div>
               </div>
diff --git a/templates/default/error.html.ep b/templates/default/error.html.ep
index c789fd5..99be24e 100644
--- a/templates/default/error.html.ep
+++ b/templates/default/error.html.ep
@@ -4,7 +4,7 @@
 <div class="container-fluid">
   <div class="jumbotron alert-danger">
     <h2>
-      <%=l 'ERROR_OCCURRED' %>
+      <%= l('ERROR_OCCURRED') %>
     </h2>
     <p>
       <%= $msg %>
@@ -12,25 +12,25 @@
     <div class="row">
       <div class="col-sm-6 col-lg-4 col-xl-3">
         <a class="btn btn-primary btn-lg btn-full" role="button" href="<%= $self->url_for('/') %>">
-          <%=l 'BACK_TO_MAIN_MENU' %>
+          <%= l('BACK_TO_MAIN_MENU') %>
         </a>
       </div>
       <div class="col-sm-6 col-lg-4 col-xl-3">
         <% if ($err eq 'ERROR_NAME_CONFLICT'){ %>
         <a class="btn btn-default btn-lg btn-full" role="button" href="<%= $self->url_for("/$room") %>">
-          <%=l 'JOIN_THIS_ROOM' %>
+          <%= l('JOIN_THIS_ROOM') %>
         </a>
         <% } elsif ($err eq 'WRONG_PASSWORD'){ %>
         <a class="btn btn-default btn-lg btn-full" role="button" href="<%= $self->url_for("/password/$room") %>">
-          <%=l 'TRY_AGAIN' %>
+          <%= l('TRY_AGAIN') %>
         </a>
         <% } elsif ($err eq 'ERROR_ROOM_s_LOCKED' && stash 'ownerPass'){ %>
         <a class="btn btn-default btn-lg btn-full" role="button" href="<%= $self->url_for("/password/$room") %>">
-          <%=l 'AUTH_IF_OWNER' %>
+          <%= l('AUTH_IF_OWNER') %>
         </a>
         <% } elsif ($err eq 'ERROR_ROOM_s_DOESNT_EXIST'){ %>
         <button class="btn btn-default btn-lg btn-full" style="width: 100%" type="submit" form="createRoom">
-          <%=l 'CREATE_THIS_ROOM' %>
+          <%= l('CREATE_THIS_ROOM') %>
         </button>
         <% } %>
       </div>
diff --git a/templates/default/feedback.html.ep b/templates/default/feedback.html.ep
index d9645f8..dd0e601 100644
--- a/templates/default/feedback.html.ep
+++ b/templates/default/feedback.html.ep
@@ -5,27 +5,27 @@
   <div class="well publicForm">
     <form role="form" action="<%= $self->url_for('/feedback') %>" method="post">
       <legend class=text-center">
-        <%=l 'GIVE_US_YOUR_FEEDBACK' %>
+        <%= l('GIVE_US_YOUR_FEEDBACK') %>
       </legend>
       <center>
-        <%=l 'YOUR_FEEDBACK_HELPS_US' %>
+        <%= l('YOUR_FEEDBACK_HELPS_US') %>
       </center>
       <br>
       <div class="form-group">
-        <label for="email"><%=l 'YOUR_MAIL_OPTIONAL' %></label>
-        <input type="email" class="form-control" id="email" name="email" placeholder="<%=l 'EMAIL_PLACEHOLDER' %>">
+        <label for="email"><%= l('YOUR_MAIL_OPTIONAL') %></label>
+        <input type="email" class="form-control" id="email" name="email" placeholder="<%= l('EMAIL_PLACEHOLDER') %>">
       </div>
       <div class="form-group">
         <label for="comment">
-          <%=l 'COMMENT' %>
+          <%= l('COMMENT') %>
         </label>
-        <textarea id="comment" name="comment" class="form-control" rows="10" placeholder="<%=l 'VROOM_IS_AWESOME' %>" required></textarea>
+        <textarea id="comment" name="comment" class="form-control" rows="10" placeholder="<%= l('VROOM_IS_AWESOME') %>" required></textarea>
       </div>
       <button type="submit" class="btn btn-primary">
-        <%=l 'SUBMIT' %>
+        <%= l('SUBMIT') %>
       </button>
       <a href="<%= $self->url_for('/') %>" class="btn btn-default">
-        <%=l 'CANCEL' %>
+        <%= l('CANCEL') %>
       </a>
     </form>
   </div>
diff --git a/templates/default/feedback.mail.ep b/templates/default/feedback.mail.ep
index 6017ac5..cae8ac3 100644
--- a/templates/default/feedback.mail.ep
+++ b/templates/default/feedback.mail.ep
@@ -1,14 +1,14 @@
 <html>
   <p>
-  <%=l 'FROM' %>: <%= $email %>
+  <%= l('FROM') %>: <%= $email %>
   </p>
   <p>
-  <%=l 'COMMENT' %>: <%= $comment %>
+  <%= l('COMMENT') %>: <%= $comment %>
   </p>
   <p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">
     &mdash;
     <br>
-    <%=l 'EMAIL_SIGN' %>
+    <%= l('EMAIL_SIGN') %>
   </p>
 </html>
 
diff --git a/templates/default/feedback_thanks.html.ep b/templates/default/feedback_thanks.html.ep
index b137d6a..9d00f8d 100644
--- a/templates/default/feedback_thanks.html.ep
+++ b/templates/default/feedback_thanks.html.ep
@@ -4,10 +4,10 @@
 <div class="container-fluid">
   <br/>
   <div class="jumbotron">
-    <h2><%=l 'THANK_YOU' %></h2>
-    <p><%=l 'THANKS_FOR_YOUR_FEEDBACK' %></p>
+    <h2><%= l('THANK_YOU') %></h2>
+    <p><%= l('THANKS_FOR_YOUR_FEEDBACK') %></p>
     <div class='btn-group'>
-      <a class="btn btn-primary btn-lg" role="button" href="<%= $self->url_for('/') %>"><%=l 'BACK_TO_MAIN_MENU' %></a>
+      <a class="btn btn-primary btn-lg" role="button" href="<%= $self->url_for('/') %>"><%= l('BACK_TO_MAIN_MENU') %></a>
     </div>
   </div>
 </div>
diff --git a/templates/default/footer.html.ep b/templates/default/footer.html.ep
index 0f5d8a9..2e52783 100644
--- a/templates/default/footer.html.ep
+++ b/templates/default/footer.html.ep
@@ -2,10 +2,10 @@
   <div id="footerContainer">
     <div class="container-fluid footer">
       <div class="col-xs-6">
-        <p class="text-muted pull-left"><%==l 'VROOM_IS_FREE_SOFTWARE' %></p>
+        <p class="text-muted pull-left"><%== l('VROOM_IS_FREE_SOFTWARE') %></p>
       </div>
       <div class="col-xs-6">
-        <p class="text-muted pull-right brand"><%=l 'POWERED_BY' %> <%== $config->{'interface.powered_by'} %></p>
+        <p class="text-muted pull-right brand"><%= l('POWERED_BY') %> <%== $config->{'interface.powered_by'} %></p>
       </div>
     </div>
   </div>
diff --git a/templates/default/goodbye.html.ep b/templates/default/goodbye.html.ep
index 187bedf..7a2a3a2 100644
--- a/templates/default/goodbye.html.ep
+++ b/templates/default/goodbye.html.ep
@@ -5,20 +5,20 @@
   <br/>
   <div class="jumbotron">
     <h2>
-      <%=l 'THANKS_SEE_YOU_SOON' %>
+      <%= l('THANKS_SEE_YOU_SOON') %>
     </h2>
     <p>
-      <%=l 'THANKS_FOR_USING' %>
+      <%= l('THANKS_FOR_USING') %>
     </p>
     <div class='row'>
       <div class="col-sm-6 col-lg-4 col-xl-3">
         <a class="btn btn-primary btn-lg btn-full" role="button" href="<%= $self->url_for('/') %>">
-          <%=l 'BACK_TO_MAIN_MENU' %>
+          <%= l('BACK_TO_MAIN_MENU') %>
         </a>
       </div>
       <div class="col-sm-6 col-lg-4 col-xl-3">
         <a class="btn btn-default btn-lg btn-full" role="button" href="<%= $self->url_for('/feedback') %>">
-          <%=l 'GIVE_US_YOUR_FEEDBACK' %>
+          <%= l('GIVE_US_YOUR_FEEDBACK') %>
         </a>
       </div>
     </div>
diff --git a/templates/default/header.html.ep b/templates/default/header.html.ep
index 3a45691..f0dbe6a 100644
--- a/templates/default/header.html.ep
+++ b/templates/default/header.html.ep
@@ -3,7 +3,7 @@
 <head>
   <title><%= $title %></title>
   <meta name="viewport" content="width=device-width, initial-scale=1"/>
-  <meta name="description" content=" <%=l 'VROOM_DESC' %>" />
+  <meta name="description" content=" <%= l('VROOM_DESC') %>" />
   <%
     my @css = qw(bootstrap.css bootstrap-switch.css toc-scroll.css bootstrap-datepicker3.css vroom.css);
     @css = map { $self->url_for('/') . 'css/' . $_ } @css;
diff --git a/templates/default/help.html.ep b/templates/default/help.html.ep
index 891e4e1..9b63859 100644
--- a/templates/default/help.html.ep
+++ b/templates/default/help.html.ep
@@ -8,13 +8,13 @@
       <div class="panel-heading">
         <h4 class="panel-title">
           <a data-toggle="collapse" data-parent="#accordion" href="#collapseBrowsers">
-            <%=l 'SUPPORTED_BROWSERS' %>
+            <%= l('SUPPORTED_BROWSERS') %>
           </a>
         </h4>
       </div>
       <div id="collapseBrowsers" class="panel-collapse collapse">
         <div class="panel-body">
-          <%=l 'HELP_BROWSERS_SUPPORTED' %>
+          <%= l('HELP_BROWSERS_SUPPORTED') %>
         </div>
       </div>
     </div>
@@ -22,13 +22,13 @@
       <div class="panel-heading">
         <h4 class="panel-title">
           <a data-toggle="collapse" data-parent="#accordion" href="#collapseNowebcam">
-            <%=l 'I_DONT_HAVE_A_WEBCAM' %>
+            <%= l('I_DONT_HAVE_A_WEBCAM') %>
           </a>
         </h4>
       </div>
       <div id="collapseNowebcam" class="panel-collapse collapse">
         <div class="panel-body">
-          <%=l 'HELP_I_DONT_HAVE_A_WEBCAM' %>
+          <%= l('HELP_I_DONT_HAVE_A_WEBCAM') %>
         </div>
       </div>
     </div>
@@ -36,14 +36,14 @@
       <div class="panel-heading">
         <h4 class="panel-title">
           <a data-toggle="collapse" data-parent="#accordion" href="#collapseScreenShare">    
-            <%=l 'SCREEN_SHARING' %>
+            <%= l('SCREEN_SHARING') %>
           </a>
         </h4>
       </div>
       <div id="collapseScreenShare" class="panel-collapse collapse">
         <div class="panel-body">
           <p>
-            <%=l 'HELP_SCREEN_SHARING' %>
+            <%= l('HELP_SCREEN_SHARING') %>
           </p>
           <p>
             <%== sprintf $self->l('SCREEN_SHARING_ABOUT_CONFIG_s'), $self->req->url->to_abs->host %>
@@ -55,13 +55,13 @@
       <div class="panel-heading">
         <h4 class="panel-title">
           <a data-toggle="collapse" data-parent="#accordion" href="#collapseOwnerPrivilege">
-            <%=l 'OWNER_PRIVILEGES' %>
+            <%= l('OWNER_PRIVILEGES') %>
           </a>
         </h4>
       </div>
       <div id="collapseOwnerPrivilege" class="panel-collapse collapse">
         <div class="panel-body">
-          <%=l 'HELP_OWNER_PRIVILEGES' %>
+          <%= l('HELP_OWNER_PRIVILEGES') %>
         </div>
       </div>
     </div>
@@ -69,13 +69,13 @@
       <div class="panel-heading">
         <h4 class="panel-title">
           <a data-toggle="collapse" data-parent="#accordion" href="#collapsePersistentRooms">
-            <%=l 'RESERVED_ROOMS' %>
+            <%= l('RESERVED_ROOMS') %>
           </a>
         </h4>
       </div>
       <div id="collapsePersistentRooms" class="panel-collapse collapse">
         <div class="panel-body">
-          <%==l 'HELP_RESERVED_ROOMS' %>
+          <%== l('HELP_RESERVED_ROOMS') %>
         </div>
       </div>
     </div>
@@ -83,13 +83,13 @@
       <div class="panel-heading">
         <h4 class="panel-title">
           <a data-toggle="collapse" data-parent="#accordion" href="#collapseBeNotified">
-            <%=l 'BE_NOTIFIED' %>
+            <%= l('BE_NOTIFIED') %>
           </a>
         </h4>
       </div>
       <div id="collapseBeNotified" class="panel-collapse collapse">
         <div class="panel-body">
-          <%==l 'HELP_BE_NOTIFIED' %>
+          <%== l('HELP_BE_NOTIFIED') %>
         </div>
       </div>
     </div>
diff --git a/templates/default/index.html.ep b/templates/default/index.html.ep
index 77b3625..1f333fa 100644
--- a/templates/default/index.html.ep
+++ b/templates/default/index.html.ep
@@ -6,7 +6,7 @@
 %= include 'noscript'
   <div class="well publicForm">
     <h1 class="text-center">
-      <%=l 'CREATE_ROOM' %>
+      <%= l('CREATE_ROOM') %>
     </h1>
     <form id="createRoom" class="form-horizontal">
       <fieldset>
@@ -22,7 +22,7 @@
             </strong>
           </span>
           <div class="control-group">
-            <input id="roomName" name="roomName" type="text" placeholder="<%=l 'ROOM_NAME' %>" class="form-control input-lg help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'RANDOM_IF_EMPTY' %>" autofocus>
+            <input id="roomName" name="roomName" type="text" placeholder="<%= l('ROOM_NAME') %>" class="form-control input-lg help" data-toggle="tooltip" data-placement="bottom" title="<%= l('RANDOM_IF_EMPTY') %>" autofocus>
           </div>
           <span class="input-group-btn">
             <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-log-in"></span></button>
@@ -36,17 +36,17 @@
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title"><%=l 'THIS_ROOM_ALREADY_EXISTS' %></h4>
+          <h4 class="modal-title"><%= l('THIS_ROOM_ALREADY_EXISTS') %></h4>
         </div>
         <div class="modal-body">
           <div class="panel" id="confirmJoinForm">
-            <label><%=l 'CONFIRM_OR_CHOOSE_ANOTHER_NAME' %></label>
+            <label><%= l('CONFIRM_OR_CHOOSE_ANOTHER_NAME') %></label>
             <div class="btn-group btn-group-justified">
               <div class="btn-group">
-                <button class="btn btn-primary" id="confirmJoinButton"><%=l 'JOIN_THIS_ROOM' %></button>
+                <button class="btn btn-primary" id="confirmJoinButton"><%= l('JOIN_THIS_ROOM') %></button>
               </div>
               <div class="btn-group">
-                <button class="btn btn-default" id="chooseAnotherNameButton"><%=l 'CHOOSE_ANOTHER_NAME' %></button>
+                <button class="btn btn-default" id="chooseAnotherNameButton"><%= l('CHOOSE_ANOTHER_NAME') %></button>
               </div>
             </div>
           </div>
@@ -74,77 +74,77 @@
           <div class="item carouselIndexItem col-xs-10 col-xs-offset-1">
             %= image '/img/lock.png', alt => $self->l('SECURE'), class => "img-responsive carouselLogo"
             <p>
-              <%=l 'P2P_COMMUNICATION' %>
+              <%= l('P2P_COMMUNICATION') %>
             </p>
             <div class="carousel-caption hidden-xs carouselIndexCaption">
               <h2>
-                <%=l 'SECURE' %>
+                <%= l('SECURE') %>
               </h2>
             </div>
           </div>
           <div class="item active carouselIndexItem col-xs-10 col-xs-offset-1">
             %= image '/img/universal.png', alt => $self->l('WORKS_EVERYWHERE'), class => "img-responsive carouselLogo"
             <p>
-              <%=l 'MODERN_BROWSERS' %>
+              <%= l('MODERN_BROWSERS') %>
             </p>
             <div class="carousel-caption hidden-xs carouselIndexCaption">
               <h2>
-                <%=l 'WORKS_EVERYWHERE' %>
+                <%= l('WORKS_EVERYWHERE') %>
               </h2>
             </div>
           </div>
           <div class="item carouselIndexItem col-xs-10 col-xs-offset-1">
             %= image '/img/multi.png', alt => $self->l('MULTI_USER'), class => "img-responsive carouselLogo"
             <p>
-              <%=l 'THE_LIMIT_IS_YOUR_PIPE' %>
+              <%= l('THE_LIMIT_IS_YOUR_PIPE') %>
             </p>
             <div class="carousel-caption hidden-xs carouselIndexCaption">
               <h2>
-                <%=l 'MULTI_USER' %>
+                <%= l('MULTI_USER') %>
               </h2>
             </div>
           </div>
           <div class="item carouselIndexItem col-xs-10 col-xs-offset-1">
             %= image '/img/signin.png', alt => $self->l('NO_SIGNIN'), class => "img-responsive carouselLogo"
             <p>
-              <%=l 'YOU_DONT_HAVE_TO_REGISTER' %>
+              <%= l('YOU_DONT_HAVE_TO_REGISTER') %>
             </p>
             <div class="carousel-caption hidden-xs carouselIndexCaption">
               <h2>
-                <%=l 'NO_SIGNIN' %>
+                <%= l('NO_SIGNIN') %>
               </h2>
             </div>
           </div>
           <div class="item carouselIndexItem col-xs-10 col-xs-offset-1">
             %= image '/img/clock.png', alt => $self->l('QUICK'), class => "img-responsive carouselLogo"
             <p>
-              <%=l 'STOP_WASTING_TIME' %>
+              <%= l('STOP_WASTING_TIME') %>
             </p>
             <div class="carousel-caption hidden-xs carouselIndexCaption">
               <h2>
-                <%=l 'QUICK' %>
+                <%= l('QUICK') %>
               </h2>
             </div>
           </div>
           <div class="item carouselIndexItem col-xs-10 col-xs-offset-1">
             %= image '/img/screen.png', alt => $self->l('SCREEN_SHARING'), class => "img-responsive carouselLogo"
             <p>
-              <%=l 'SHARE_DESKTOP_OR_WINDOW' %>
+              <%= l('SHARE_DESKTOP_OR_WINDOW') %>
             </p>
             <div class="carousel-caption hidden-xs carouselIndexCaption">
               <h2>
-                <%=l 'SCREEN_SHARING' %>
+                <%= l('SCREEN_SHARING') %>
               </h2>
             </div>
           </div>
           <div class="item carouselIndexItem col-xs-10 col-xs-offset-1">
             %= image '/img/chat.png', alt => $self->l('TEXT_CHAT'), class => "img-responsive carouselLogo"
             <p>
-              <%=l 'SECURED_TEXT_CHAT' %>
+              <%= l('SECURED_TEXT_CHAT') %>
             </p>
             <div class="carousel-caption hidden-xs carouselIndexCaption">
               <h2>
-                <%=l 'TEXT_CHAT' %>
+                <%= l('TEXT_CHAT') %>
               </h2>
             </div>
           </div>
@@ -152,11 +152,11 @@
           <div class="item carouselIndexItem col-xs-10 col-xs-offset-1">
             %= image '/img/note.png', alt => $self->l('COLLABORATIVE_NOTETAKING'), class => "img-responsive carouselLogo"
             <p>
-              <%=l 'TAKE_NOTE_IN_REALTIME' %>
+              <%= l('TAKE_NOTE_IN_REALTIME') %>
             </p>
             <div class="carousel-caption hidden-xs carouselIndexCaption">
               <h2>
-                <%=l 'COLLABORATIVE_NOTETAKING' %>
+                <%= l('COLLABORATIVE_NOTETAKING') %>
               </h2>
             </div>
           </div>
diff --git a/templates/default/invitation.html.ep b/templates/default/invitation.html.ep
index 2634b28..004d144 100644
--- a/templates/default/invitation.html.ep
+++ b/templates/default/invitation.html.ep
@@ -5,43 +5,43 @@
   <div class="well publicForm">
     <form role="form" method="post">
       <legend class="text-center">
-        <%=l 'INVITATION_RESPONSE' %>
+        <%= l('INVITATION_RESPONSE') %>
       </legend>
       <p class="text-center">
-        <%=l 'CANNOT_JOIN_NOW' %>
+        <%= l('CANNOT_JOIN_NOW') %>
       </p>
       <div class="form-group">
         <label for="response">
-          <%=l 'WILL_YOU_JOIN' %>
+          <%= l('WILL_YOU_JOIN') %>
         </label>
         <select name="response" id="response" class="form-control">
           <option value="later">
-            <%=l 'WILL_TRY_TO_JOIN_LATER' %>
+            <%= l('WILL_TRY_TO_JOIN_LATER') %>
           </option>
           <option value="decline" selected>
-            <%=l 'WONT_BE_ABLE_TO_JOIN' %>
+            <%= l('WONT_BE_ABLE_TO_JOIN') %>
           </option>
         </select>
       </div>
       <div class="form-group">
         <label for="message">
-          <%=l 'MESSAGE' %>
+          <%= l('MESSAGE') %>
         </label>
-        <textarea name="message" id="message" class="form-control" rows="5" placeholder="<%=l 'DONT_WAIT_FOR_ME' %>"></textarea>
+        <textarea name="message" id="message" class="form-control" rows="5" placeholder="<%= l('DONT_WAIT_FOR_ME') %>"></textarea>
       </div>
       <div class="form-group">
         <label>
-          <%=l 'YOU_CAN_STILL_CHANGE_YOUR_MIND' %>
+          <%= l('YOU_CAN_STILL_CHANGE_YOUR_MIND') %>
         </label>
         <p>
-          <%=l 'CLICK_SEND_OR_JOIN_NOW' %>
+          <%= l('CLICK_SEND_OR_JOIN_NOW') %>
         </p>
       </div>
         <a class="btn btn-default btn-lg" role="button" href="<%= $self->url_for("/$room") %><% if ($token ne ''){ %>?token=<%= $token %><% } %>">
-          <%=l 'JOIN_THIS_ROOM' %>
+          <%= l('JOIN_THIS_ROOM') %>
         </a>
         <button type="submit" class="btn btn-primary btn-lg">
-          <%=l 'SUBMIT' %>
+          <%= l('SUBMIT') %>
         </button>
     </form>
   </div>
diff --git a/templates/default/invitation_thanks.html.ep b/templates/default/invitation_thanks.html.ep
index 70bcf4f..4508a18 100644
--- a/templates/default/invitation_thanks.html.ep
+++ b/templates/default/invitation_thanks.html.ep
@@ -4,10 +4,10 @@
 <div class="container-fluid">
   <br/>
   <div class="jumbotron">
-    <h2><%=l 'MESSAGE_SENT' %></h2>
-    <p><%=l 'ORGANIZER_WILL_GET_YOUR_MESSAGE' %></p>
+    <h2><%= l('MESSAGE_SENT') %></h2>
+    <p><%= l('ORGANIZER_WILL_GET_YOUR_MESSAGE') %></p>
     <div class='btn-group'>
-      <a class="btn btn-primary btn-lg" role="button" href="<%= $self->url_for('/') %>"><%=l 'BACK_TO_MAIN_MENU' %></a>
+      <a class="btn btn-primary btn-lg" role="button" href="<%= $self->url_for('/') %>"><%= l('BACK_TO_MAIN_MENU') %></a>
     </div>
   </div>
 </div>
diff --git a/templates/default/invite.mail.ep b/templates/default/invite.mail.ep
index a304ad3..deab718 100644
--- a/templates/default/invite.mail.ep
+++ b/templates/default/invite.mail.ep
@@ -3,21 +3,21 @@
   $url .= ($url =~ m/\/$/) ? '' : '/';
 %>
 <p>
-  <%=l 'YOU_ARE_INVITED_TO_A_MEETING' %>
+  <%= l('YOU_ARE_INVITED_TO_A_MEETING') %>
   <ul>
     <li>
-      <%=l 'A_MODERN_BROWSER' %>
+      <%= l('A_MODERN_BROWSER') %>
     </li>
     <li>
-      <%=l 'A_WEBCAM' %>
+      <%= l('A_WEBCAM') %>
     </li>
     <li>
-      <%=l 'A_MIC' %>
+      <%= l('A_MIC') %>
     </li>
   </ul>
 </p>
 <p>
-  <%=l 'WHEN_YOU_ARE_READY' %>
+  <%= l('WHEN_YOU_ARE_READY') %>
   <center>
     <h1>
       <% my $roomAccess = $room;
@@ -33,26 +33,26 @@
 </p>
 <% if ($message && $message ne ''){ %>
 <p>
-  <%=l 'MESSAGE_FROM_ORGANIZER' %>:
+  <%= l('MESSAGE_FROM_ORGANIZER') %>:
 </p>
 <p>
   <%= $message %>
 </p>
 <% } %>
 <p>
-  <%=l 'IF_YOU_CANNOT_JOIN' %>
+  <%= l('IF_YOU_CANNOT_JOIN') %>
     <h3>
       <a style="color:red" href="<%= $url . 'invitation/' . $token %>">
-        <%=l 'YOU_CAN_NOTIFY_THE_ORGANIZER' %>
+        <%= l('YOU_CAN_NOTIFY_THE_ORGANIZER') %>
       </a>
     </h3>
 </p>
 <br>
 <p>
-  <%=l 'HAVE_A_NICE_MEETING' %>
+  <%= l('HAVE_A_NICE_MEETING') %>
 </p>
 <p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">
   &mdash;
   <br>
-  <%=l 'EMAIL_SIGN' %>
+  <%= l('EMAIL_SIGN') %>
 </p>
diff --git a/templates/default/invite_modal.html.ep b/templates/default/invite_modal.html.ep
index 44c3eac..ef041f4 100644
--- a/templates/default/invite_modal.html.ep
+++ b/templates/default/invite_modal.html.ep
@@ -6,18 +6,18 @@
               &times;
             </button>
             <h4 class="modal-title">
-              <%=l 'SEND_INVITE' %>
+              <%= l('SEND_INVITE') %>
             </h4>
           </div>
           <div class="modal-body">
             <form id="inviteEmail" class="form-horizontal" role="form">
               <div class="form-group">
                 <label for="recipient" class="col-sm-4 control-label">
-                  <%=l 'RECIPIENT' %>
+                  <%= l('RECIPIENT') %>
                 </label>
                 <div class="col-sm-8 email-list" id="email-list-invite">
                   <div class="email-entry input-group col-sm-8">
-                    <input class="form-control" autocomplete="off" name="invitation-recipients[]" type="text" placeholder="<%=l 'EMAIL_PLACEHOLDER' %>" />
+                    <input class="form-control" autocomplete="off" name="invitation-recipients[]" type="text" placeholder="<%= l('EMAIL_PLACEHOLDER') %>" />
                     <span class="input-group-btn">
                       <button class="btn btn-primary btn-add-email" type="button">
                         <span class="glyphicon glyphicon-plus">
@@ -29,19 +29,19 @@
               </div>
               <div class="form-group">
                 <label for="message" class="col-sm-4 control-label">
-                  <%=l 'MESSAGE' %>
+                  <%= l('MESSAGE') %>
                 </label>
                 <div class="col-sm-8">
-                  <textarea id="message" name="message" class="form-control" placeholder="<%=l 'MESSAGE' %>"></textarea>
+                  <textarea id="message" name="message" class="form-control" placeholder="<%= l('MESSAGE') %>"></textarea>
                 </div>
               </div>
               <div class="form-group">
                 <div class="col-sm-offset-4 col-sm-8">
                   <button type="submit" id="inviteEmailButton" class="btn btn-primary">
-                    <%=l 'SUBMIT' %>
+                    <%= l('SUBMIT') %>
                   </button>
                   <button class="btn btn-default" data-dismiss="modal">
-                    <%=l 'CANCEL' %>
+                    <%= l('CANCEL') %>
                   </button>
                 </div>
               </div>
diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep
index e294d84..4d93345 100644
--- a/templates/default/join.html.ep
+++ b/templates/default/join.html.ep
@@ -24,7 +24,7 @@
           </button>
         </div>
         <div class="btn-group visible-xs-block header-btn-group col-xs-push-1">
-          <button class="btn btn-lg btn-default help btn-logout navbar-btn" data-toggle="tooltip" data-placement="bottom" title="<%=l 'LOGOUT' %>">
+          <button class="btn btn-lg btn-default help btn-logout navbar-btn" data-toggle="tooltip" data-placement="bottom" title="<%= l('LOGOUT') %>">
             <span class="glyphicon glyphicon-log-out">
             </span>
           </button>
@@ -34,9 +34,9 @@
       <div id="roomToolBar" class="collapse navbar-collapse">
         <div class="navbar-form navbar-btn-group navbar-left input-group">
           <div class="input-group">
-            <input type="text" id="displayName" class="form-control input-lg help" placeholder="<%=l 'YOUR_NAME' %>" data-toggle="tooltip" data-placement="bottom" title="<%=l 'NAME_SENT_TO_OTHERS' %>"/>
+            <input type="text" id="displayName" class="form-control input-lg help" placeholder="<%= l('YOUR_NAME') %>" data-toggle="tooltip" data-placement="bottom" title="<%= l('NAME_SENT_TO_OTHERS') %>"/>
             <span class="input-group-btn">
-              <button id="changeColorButton" class="btn btn-lg btn-default help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'CHANGE_COLOR' %>">
+              <button id="changeColorButton" class="btn btn-lg btn-default help" data-toggle="tooltip" data-placement="bottom" title="<%= l('CHANGE_COLOR') %>">
                 <span class="glyphicon glyphicon-tag">
                 </span>
               </button>
@@ -44,7 +44,7 @@
           </div>
         </div>
         <div class="btn-group navbar-form navbar-btn-group navbar-left hidden-xs">
-          <button id="chatDropdown" class="btn btn-lg btn-default collapsed help" data-toggle="collapse" data-target="#chatMenu" data-toggle="tooltip" data-placement="bottom" title="<%=l 'CLICK_TO_CHAT' %>">
+          <button id="chatDropdown" class="btn btn-lg btn-default collapsed help" data-toggle="collapse" data-target="#chatMenu" data-toggle="tooltip" data-placement="bottom" title="<%= l('CLICK_TO_CHAT') %>">
             <span class="glyphicon glyphicon-comment">
             </span>
             <span class="badge" id="unreadMsg">
@@ -52,48 +52,48 @@
             </span>
           </button>
           <% if ($self->get_opt_features->{etherpad}){ %>
-          <button class="btn btn-lg btn-default help btn-etherpad" data-toggle="tooltip" data-placement="bottom" title="<%=l 'OPEN_ETHERPAD' %>">
+          <button class="btn btn-lg btn-default help btn-etherpad" data-toggle="tooltip" data-placement="bottom" title="<%= l('OPEN_ETHERPAD') %>">
             <span class="glyphicon glyphicon-pencil">
             </span>
           </button>
         <% } %>
         </div>
         <div class="btn-group navbar-form navbar-btn-group navbar-left hidden-xs">
-          <button class="btn btn-lg btn-default btn-mute-mic help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'MUTE_MIC' %>">
+          <button class="btn btn-lg btn-default btn-mute-mic help" data-toggle="tooltip" data-placement="bottom" title="<%= l('MUTE_MIC') %>">
             <span class="glyphicon glyphicon-volume-off">
             </span>
           </button>
-          <button class="btn btn-lg btn-default btn-suspend-cam help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'SUSPEND_CAM' %>">
+          <button class="btn btn-lg btn-default btn-suspend-cam help" data-toggle="tooltip" data-placement="bottom" title="<%= l('SUSPEND_CAM') %>">
             <span class="glyphicon glyphicon-facetime-video">
             </span>
           </button>
-          <button class="btn btn-lg btn-default help btn-share-screen" data-toggle="tooltip" data-placement="bottom" title="<%=l 'SHARE_YOUR_SCREEN' %>">
+          <button class="btn btn-lg btn-default help btn-share-screen" data-toggle="tooltip" data-placement="bottom" title="<%= l('SHARE_YOUR_SCREEN') %>">
             <span class="glyphicon glyphicon-blackboard">
             </span>
           </button>
         </div>
         <div class="btn-group navbar-form navbar-btn-group navbar-left hidden-xs aloneEl">
-          <button class="btn btn-lg btn-default btn-moh help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'WAIT_WITH_MUSIC' %>">
+          <button class="btn btn-lg btn-default btn-moh help" data-toggle="tooltip" data-placement="bottom" title="<%= l('WAIT_WITH_MUSIC') %>">
             <span class="glyphicon glyphicon-music">
             </span>
           </button>
         </div>
         <div class="btn-group navbar-form navbar-btn-group navbar-left">
           <div class="btn-group ownerEl">
-            <button class="btn btn-lg btn-default help" type="button" data-toggle="modal" data-target="#inviteModal" data-toggle="tooltip" data-placement="bottom" title="<%=l 'INVITE_PEOPLE' %>">
+            <button class="btn btn-lg btn-default help" type="button" data-toggle="modal" data-target="#inviteModal" data-toggle="tooltip" data-placement="bottom" title="<%= l('INVITE_PEOPLE') %>">
               <span class="glyphicon glyphicon-user">
               </span>
             </button>
           </div>
           <div class="btn-group ownerEl">
-            <button class="btn btn-lg btn-default help" type="button" data-toggle="modal" data-target="#configureModal" data-toggle="tooltip" data-placement="bottom" title="<%=l 'CONFIGURE' %>">
+            <button class="btn btn-lg btn-default help" type="button" data-toggle="modal" data-target="#configureModal" data-toggle="tooltip" data-placement="bottom" title="<%= l('CONFIGURE') %>">
               <span class="glyphicon glyphicon-cog">
               </span>
             </button>
           </div>
         </div>
         <div class="btn-group navbar-form navbar-btn-group navbar-left">
-          <button class="btn btn-lg btn-default dropdown-toggle help unauthEl" data-toggle="modal" data-target="#ownerAuthModal" data-toggle="dropdown" data-toggle="tooltip" data-placement="bottom" title="<%=l 'AUTHENTICATE' %>">
+          <button class="btn btn-lg btn-default dropdown-toggle help unauthEl" data-toggle="modal" data-target="#ownerAuthModal" data-toggle="dropdown" data-toggle="tooltip" data-placement="bottom" title="<%= l('AUTHENTICATE') %>">
             <span class="glyphicon glyphicon-log-in">
             </span>
           </button>
@@ -103,7 +103,7 @@
             <div id="timeCounter" class="btn btn-lg btn-default disabled">
               00:00
             </div>
-            <button class="btn btn-lg btn-default help btn-logout" data-toggle="tooltip" data-placement="bottom" title="<%=l 'LOGOUT' %>">
+            <button class="btn btn-lg btn-default help btn-logout" data-toggle="tooltip" data-placement="bottom" title="<%= l('LOGOUT') %>">
               <span class="glyphicon glyphicon-log-out">
               </span>
             </button>
@@ -119,20 +119,20 @@
               &times;
             </button>
             <h4 class="modal-title">
-              <%=l 'LEAVE_THIS_ROOM' %>
+              <%= l('LEAVE_THIS_ROOM') %>
             </h4>
           </div>
           <div class="modal-body">
             <p>
-              <%=l 'ARE_YOU_SURE_YOU_WANT_TO_LEAVE' %>
+              <%= l('ARE_YOU_SURE_YOU_WANT_TO_LEAVE') %>
             </p>
           </div>
           <div class="modal-footer">
             <button id="confirmQuitButton" class="btn btn-primary">
-              <%=l 'QUIT' %>
+              <%= l('QUIT') %>
             </button>
             <button class="btn btn-default" data-dismiss="modal" data-target="#quitModal">
-              <%=l 'CANCEL' %>
+              <%= l('CANCEL') %>
             </button>
           </div>
         </div>
@@ -146,12 +146,12 @@
               &times;
             </button>
             <h4 class="modal-title" id="chromeExtMessageTitle">
-              <%=l 'EXTENSION_REQUIRED' %>
+              <%= l('EXTENSION_REQUIRED') %>
             </h4>
           </div>
           <div class="modal-body">
             <p>
-              <%=l 'VROOM_CHROME_EXTENSION' %>
+              <%= l('VROOM_CHROME_EXTENSION') %>
             </p>
             <p>
               <a class="btn btn-default btn-lg" href="https://chrome.google.com/webstore/detail/<%= $config->{'interface.chrome_extension_id'} %>" target="_blank">
@@ -171,12 +171,12 @@
               &times;
             </button>
             <h4 class="modal-title">
-              <%=l 'ALLOW_SCREEN_SHARING' %>
+              <%= l('ALLOW_SCREEN_SHARING') %>
             </h4>
           </div>
           <div class="modal-body">
             <p>
-              <%=l 'ALLOW_SCREEN_SHARING_ON_FF' %>
+              <%= l('ALLOW_SCREEN_SHARING_ON_FF') %>
               <%== sprintf $self->l('SCREEN_SHARING_ABOUT_CONFIG_s'), $self->req->url->to_abs->host %>
             </p>
           </div>
@@ -191,14 +191,14 @@
               &times;
             </button>
             <h4 class="modal-title">
-              <%=l 'CONNECTION_LOST' %>
+              <%= l('CONNECTION_LOST') %>
             </h4>
           </div>
           <div class="modal-body">
             %= image '/img/flash.png', alt => $self->l('CONNECTION_LOST'), class => "img-responsive center-block"
             <br>
             <p class="text-center">
-              <%=l 'CHECK_INTERNET_ACCESS' %>
+              <%= l('CHECK_INTERNET_ACCESS') %>
             </p>
           </div>
         </div>
@@ -209,7 +209,7 @@
         <div class="modal-content">
           <div class="modal-header">
             <h4 class="modal-title">
-              <%=l 'CONNECTING' %>
+              <%= l('CONNECTING') %>
             </h4>
           </div>
           <div class="modal-body">
@@ -217,7 +217,7 @@
               %= image '/img/connecting.gif', alt => $self->l('CONNECTING'), class => "img-responsive center-block"
               <br>
               <p class="text-center">
-                <%=l 'CONNECTING_PLEASE_WAIT' %>
+                <%= l('CONNECTING_PLEASE_WAIT') %>
               </p>
               <p class="text-center connecting-err-reason">
               </p>
@@ -229,12 +229,12 @@
             </div>
             <div id="no-webcam-msg" class="connecting-msg" style="display: none">
               <p class="text-center">
-                <%=l 'CANT_ACCESS_WEBCAM' %>
+                <%= l('CANT_ACCESS_WEBCAM') %>
               </p>
               %= image '/img/webcam.png', alt => "Webcam", class => "img-responsive center-block"
               <br>
               <p class="text-center">
-                <%=l 'CLICK_IF_NO_WEBCAM' %>
+                <%= l('CLICK_IF_NO_WEBCAM') %>
               </p>
               <p class="text-center">
                 <a class="btn btn-default btn-lg" href="<%= $self->url_for("/$room") %>?video=false">
@@ -247,19 +247,19 @@
               <form role="form" class="form-horizontal" id="authBeforeJoinForm">
                 <div class="form-group">
                   <label for="authBeforJoinPass" class="col-sm-4 control-label">
-                    <%=l 'PASSWORD' %>
+                    <%= l('PASSWORD') %>
                   </label>
                   <div class="col-sm-4">
-                    <input type="password" class="form-control" id="authBeforeJoinPass" placeholder="<%=l 'PASSWORD' %>">
+                    <input type="password" class="form-control" id="authBeforeJoinPass" placeholder="<%= l('PASSWORD') %>">
                   </div>
                 </div>
                 <div class="form-group">
                   <div class="col-sm-offset-4 col-sm-8">
                     <button id="authBeforeJoinButton" class="btn btn-primary disabled" type="submit">
-                      <%=l 'SUBMIT' %>
+                      <%= l('SUBMIT') %>
                     </button>
                     <a class="btn btn-default" href="<%= $self->url_for('/') %>">
-                      <%=l 'CANCEL' %>
+                      <%= l('CANCEL') %>
                     </a>
                   </div>
                 </div>
@@ -268,23 +268,23 @@
             <div id="display-name-pre" class="connecting-msg" style="display: none">
               <form role="form" class="form-horizontal" id="displayNamePreForm">
                 <p class="text-center">
-                  <%=l 'SET_A_DISPLAY_NAME' %>
+                  <%= l('SET_A_DISPLAY_NAME') %>
                 </p>
                 <div class="form-group">
                   <label for="displayNamePre" class="col-sm-4 control-label">
-                    <%=l 'DISPLAY_NAME' %>
+                    <%= l('DISPLAY_NAME') %>
                   </label>
                   <div class="col-sm-4">
-                    <input type="text" class="form-control" autocomplete="off" id="displayNamePre" placeholder="<%=l 'YOUR_NAME' %>">
+                    <input type="text" class="form-control" autocomplete="off" id="displayNamePre" placeholder="<%= l('YOUR_NAME') %>">
                   </div>
                 </div>
                 <div class="form-group">
                   <div class="col-sm-offset-4 col-sm-8">
                     <button id="displayNamePreButton" class="btn btn-primary disabled" type="submit">
-                      <%=l 'SUBMIT' %>
+                      <%= l('SUBMIT') %>
                     </button>
                     <a class="btn btn-default" href="<%= $self->url_for('/') %>">
-                      <%=l 'CANCEL' %>
+                      <%= l('CANCEL') %>
                     </a>
                   </div>
                 </div>
@@ -292,11 +292,11 @@
             </div>
             <div id="no-webrtc-msg" class="connecting-msg" style="display: none">
               <p>
-                <%=l 'NO_WEBRTC_SUPPORT' %>
+                <%= l('NO_WEBRTC_SUPPORT') %>
               </p>
               <% if ($ua !~ m/iphone|ipad|ipod/i){ %>
               <p>
-                <%=l 'DOWNLOAD_ONE_OF_THESE_BROWSERS' %>
+                <%= l('DOWNLOAD_ONE_OF_THESE_BROWSERS') %>
               </p>
               <div class="row">
                 <%
@@ -341,13 +341,13 @@
         </div>
         <form role="form" id="chatForm">
           <div class="input-group">
-            <textarea class="form-control" id="chatBox" form_id="chatForm" placeholder="<%=l 'SET_YOUR_NAME_TO_CHAT' %>" rows=1 disabled></textarea>
+            <textarea class="form-control" id="chatBox" form_id="chatForm" placeholder="<%= l('SET_YOUR_NAME_TO_CHAT') %>" rows=1 disabled></textarea>
             <span class="input-group-btn">
-              <button type="submit" id="sendChat" class="btn btn-default help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'SEND_MESSAGE' %>">
+              <button type="submit" id="sendChat" class="btn btn-default help" data-toggle="tooltip" data-placement="bottom" title="<%= l('SEND_MESSAGE') %>">
                 <span class="glyphicon glyphicon-share-alt">
                 </span>
               </button>
-              <button type="button" id="saveChat" class="btn btn-default help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'SAVE_HISTORY' %>">
+              <button type="button" id="saveChat" class="btn btn-default help" data-toggle="tooltip" data-placement="bottom" title="<%= l('SAVE_HISTORY') %>">
                 <span class="glyphicon glyphicon-floppy-save">
                 </span>
               </button>
@@ -375,7 +375,7 @@
           </div>
           <div id="aloneMsg" class="aloneEl">
             <h2 class="text-center">
-              <%=l 'ALONE_IN_ROOM' %>
+              <%= l('ALONE_IN_ROOM') %>
             </h2>
           </div>
         </div>
diff --git a/templates/default/kicked.html.ep b/templates/default/kicked.html.ep
index 709989a..a5757f4 100644
--- a/templates/default/kicked.html.ep
+++ b/templates/default/kicked.html.ep
@@ -3,10 +3,10 @@
 %= include 'public_toolbar'
 <div class="container-fluid">
   <div class="jumbotron alert-danger">
-    <h2><%=l 'YOU_HAVE_BEEN_KICKED' %></h2>
-    <p><%=l 'AN_ADMIN_HAS_KICKED_YOU' %></p>
+    <h2><%= l('YOU_HAVE_BEEN_KICKED') %></h2>
+    <p><%= l('AN_ADMIN_HAS_KICKED_YOU') %></p>
     <div class="btn-group">
-      <a class="btn btn-primary btn-lg" role="button" href="<%= $self->url_for('/') %>"><%=l 'BACK_TO_MAIN_MENU' %></a>
+      <a class="btn btn-primary btn-lg" role="button" href="<%= $self->url_for('/') %>"><%= l('BACK_TO_MAIN_MENU') %></a>
     </div>
   </div>
 </div>
diff --git a/templates/default/noscript.html.ep b/templates/default/noscript.html.ep
index f51e96b..4c79fba 100644
--- a/templates/default/noscript.html.ep
+++ b/templates/default/noscript.html.ep
@@ -2,7 +2,7 @@
     <div class="row">
       <div class="col-md-6 col-md-offset-3 alert alert-danger">
         <p class="text-center">
-          <%=l 'JS_REQUIRED' %>
+          <%= l('JS_REQUIRED') %>
         </p>
       </div>
     </div>
diff --git a/templates/default/notification.mail.ep b/templates/default/notification.mail.ep
index 4bbd39c..55e268d 100644
--- a/templates/default/notification.mail.ep
+++ b/templates/default/notification.mail.ep
@@ -3,15 +3,15 @@
   $url .= ($url =~ m/\/$/) ? '' : '/';
 %>
 <p>
-  <%=l 'SOMEONE_JOINED_A_ROOM' %>
+  <%= l('SOMEONE_JOINED_A_ROOM') %>
 </p>
 <% if ($name && $name ne ''){ %>
 <p>
-  <%=l 'PARTICIPANT_NAME' %>: <%= $name %>
+  <%= l('PARTICIPANT_NAME') %>: <%= $name %>
 </p>
 <% } %>
 <p>
-  <%=l 'WHEN_YOU_ARE_READY' %>
+  <%= l('WHEN_YOU_ARE_READY') %>
   <center>
     <h1>
       <a href="<%= $url . $room %>">
@@ -22,10 +22,10 @@
 </p>
 <br>
 <p>
-  <%=l 'HAVE_A_NICE_MEETING' %>
+  <%= l('HAVE_A_NICE_MEETING') %>
 </p>
 <p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">
   &mdash;
   <br>
-  <%=l 'EMAIL_SIGN' %>
+  <%= l('EMAIL_SIGN') %>
 </p>
diff --git a/templates/default/public_toolbar.html.ep b/templates/default/public_toolbar.html.ep
index ae16bc8..6f1a7a2 100644
--- a/templates/default/public_toolbar.html.ep
+++ b/templates/default/public_toolbar.html.ep
@@ -12,24 +12,24 @@
       <div class="collapse navbar-collapse" id="toolbar">
         <ul class="nav navbar-nav navbar-right">
           <li id='lnk_index'>
-            <a href="<%= $self->url_for('/') %>"><%=l 'HOME' %></a>
+            <a href="<%= $self->url_for('/') %>"><%= l('HOME') %></a>
           </li>
           <li id='lnk_help'>
-            <a href="<%= $self->url_for('/help') %>"><%=l 'HELP' %></a>
+            <a href="<%= $self->url_for('/help') %>"><%= l('HELP') %></a>
           </li>
           <li id='lnk_about'>
-            <a href="<%= $self->url_for('/about') %>"><%=l 'ABOUT' %></a>
+            <a href="<%= $self->url_for('/about') %>"><%= l('ABOUT') %></a>
           </li>
           <li id='lnk_feedback'>
-            <a href="<%= $self->url_for('/feedback') %>"><%=l 'FEEDBACK' %></a>
+            <a href="<%= $self->url_for('/feedback') %>"><%= l('FEEDBACK') %></a>
           </li>
           <% if ($config->{'interface.demo'}){ %>
           <li id='lnk_documentation'>
-            <a href="<%= $self->url_for('/documentation') %>"><%=l 'DOCUMENTATION' %></a>
+            <a href="<%= $self->url_for('/documentation') %>"><%= l('DOCUMENTATION') %></a>
           </li>
           <% } %>
           <li id='lnk_admin'>
-            <a href="<%= $self->url_for('/admin') %>"><%=l 'ADMINISTRATION' %></a>
+            <a href="<%= $self->url_for('/admin') %>"><%= l('ADMINISTRATION') %></a>
           </li>
           <li class="hidden-xs">
             <select class="form-control navbar-btn" id="switch_lang">