improvements to i18n development experience

5 files changed, 11 insertions, 11 deletions

diff --git a/templates/headers/_display_bot_nav.html.ep b/templates/headers/_display_bot_nav.html.ep
index 9064d6e..5a58b77 100644
--- a/templates/headers/_display_bot_nav.html.ep
+++ b/templates/headers/_display_bot_nav.html.ep
@@ -5,14 +5,14 @@
   </div>
 
   <div class="pure-u-1-2 pure-u-md-1-4">
-    <label for=allbox><%= l 'check_all' %></label>
+    <label for=allbox><%= l 'check all' %></label>
     <input name=allbox type=checkbox onclick="check_all(this)">
   </div>
 
   <div class="pure-u-1-1 pure-u-md-1-2">
     %= form_for move => (id => 'move-mail') => (class => 'pure-form') => begin
       <fieldset>
-      %= label_for 'select-folder' => l('move') . ' ' . l('to')
+      %= label_for 'select-folder' => l('move to')
       %= select_field folder => [grep {$_ ne $folder} @$mail_folders] => (id => 'select-folder')
       %= csrf_field
       %= submit_button l('move') => (class => 'pure-button')
diff --git a/templates/headers/_display_folders.html.ep b/templates/headers/_display_folders.html.ep
index bf8a346..856844d 100644
--- a/templates/headers/_display_folders.html.ep
+++ b/templates/headers/_display_folders.html.ep
@@ -4,14 +4,14 @@
     <nav class="pure-menu pure-menu-horizontal">
 
       <strong class="pure-menu-heading">
-        %= l($folder) || $folder || 'Root'
+        %= l($folder || '_mailbox_root')
       </strong>
 
       <ul class="pure-menu-list">
 % for my $v (grep {$_ ne $folder} @$mail_folders) {
       <li class="pure-menu-item">
         %= link_to '' => {folder => $v} => (class => 'bright') => begin
-          %= $v ? (l($v) || $v) : l 'Home'
+          %= l($v || '_mailbox_root')
         % end
       </li>
 % }
@@ -21,9 +21,9 @@
   </div>
 
   <p class="pure-u-1-1 pure-u-md-1-2">
-    <%= "$first_item - $last_item " . l('of') . " $total_items " . l('messages') %>\
-    <%= ", $total_new_mails " . l('new') if $total_new_mails > 0 =%>
-    <%= ' - ' . ucfirst(l 'mbox_size') . ": " . print_sizes10 $total_size if $total_size %>
+    <%= l('[_1] of [_2] messages', $last_item - $first_item + 1, $total_items) %>\
+    <%= l(', [_1] new', $total_new_mails) if $total_new_mails > 0 =%>
+    <%= l(' - mailbox size: [_1]', print_sizes10 $total_size) if $total_size %>
   </p>
 
 </div>
diff --git a/templates/headers/_display_headers.html.ep b/templates/headers/_display_headers.html.ep
index f391259..42f927c 100644
--- a/templates/headers/_display_headers.html.ep
+++ b/templates/headers/_display_headers.html.ep
@@ -14,7 +14,7 @@
   <thead>
     <tr id=sort>
       <th class="hide-small">
-        No.
+        #
       </th>
 
       <th>
@@ -76,7 +76,7 @@
 
         <!--
         <div class="pure-u-1-4">
-          %= ucfirst($msg->{is_multipart} ? l('yes') : l('no'));
+          %# ucfirst($msg->{is_multipart} ? l('yes') : l('no'));
         </div>
         -->
 
diff --git a/templates/headers/_pagination1.html.ep b/templates/headers/_pagination1.html.ep
index 010bdbd..9b6121a 100644
--- a/templates/headers/_pagination1.html.ep
+++ b/templates/headers/_pagination1.html.ep
@@ -1,7 +1,7 @@
 <div>
   <a href="<%= url_with->query({start => $prev_page->[0]-1}) %>"><img src="/left.gif" alt="←"></a>
   <a href="<%= url_with->query({start => $first_page->[0]-1}) %>"><img src="/first.gif" alt="↞"></a>
-  [<%= join(' ', ucfirst l('page'), $current_page, l('of'), $total_pages) %>]
+  [<%= l('page [_1] of [_2]', $current_page, $total_pages) %>]
   <a href="<%= url_with->query({start => $last_page->[0]-1}) %>"><img src="/last.gif" alt="↠"></a>
   <a href="<%= url_with->query({start => $next_page->[0]-1}) %>"><img src="/right.gif" alt="→"></a>
 </div>
diff --git a/templates/webmail/displayheaders.html.ep b/templates/webmail/displayheaders.html.ep
index 42e52fd..23f48d3 100644
--- a/templates/webmail/displayheaders.html.ep
+++ b/templates/webmail/displayheaders.html.ep
@@ -17,7 +17,7 @@
 % }
 % else {
   <p id=empty-folder>
-    %= l 'empty_folder'
+    %= l 'This folder is empty!'
   </p>
 % }