alchemy_cms 2.5.0.b5 → 2.5.0.b9

data/app/views/alchemy/admin/clipboard/insert.js.erb

@@ -5,9 +5,9 @@
 <%- if @item.class.to_s == 'Element' -%>
   $('#element_area .sortable_cell').sortable('refresh');
 <%- end -%>
-  Alchemy.growl('<%= escape_javascript t("item moved to clipboard", :name => @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) -%>');
+  Alchemy.growl('<%= escape_javascript _t("item moved to clipboard", :name => @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) -%>');
 <%- else -%>
-  Alchemy.growl('<%= escape_javascript t("item copied to clipboard", :name => @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) -%>')
+  Alchemy.growl('<%= escape_javascript _t("item copied to clipboard", :name => @item.class.to_s == "Alchemy::Element" ? @item.display_name_with_preview_text : @item.name) -%>')
 <%- end -%>
   $('#clipboard_button .icon.clipboard').addClass('full');
 

data/app/views/alchemy/admin/clipboard/remove.js.erb

@@ -1,10 +1,10 @@
 (function($) {
-  
+
   $("#clipboard_item_<%= @item.id -%>").remove();
-  Alchemy.growl('<%= t("item removed from clipboard", :name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name) -%>');
+  Alchemy.growl('<%= _t("item removed from clipboard", :name => @item.class.to_s == "Element" ? @item.display_name_with_preview_text : @item.name) -%>');
 <%- if @clipboard.blank? -%>
   $('#clipboard_button .icon.clipboard').removeClass('full');
-  $("#clipboard_items").replaceWith("<p><%= t('No items in your clipboard') -%></p>");
+  $("#clipboard_items").replaceWith("<p><%= _t('No items in your clipboard') -%></p>");
 <%- end -%>
-  
+
 })(jQuery);

data/app/views/alchemy/admin/contents/_missing.html.erb

@@ -2,9 +2,9 @@
   <label><%= Alchemy::I18n.t("content_names.#{element.name}.#{name}", :default => ["content_names.#{name}".to_sym, name.capitalize]) %></label>
   <p>
     <%= render_icon('warning') %>
-    <%= t('content_not_found') %>
+    <%= _t('content_not_found') %>
     <%= link_to(
-      t('create'),
+      _t('create'),
       alchemy.admin_contents_path(
         :content => {
           :element_id => element.id,

data/app/views/alchemy/admin/contents/create.js.erb

@@ -18,7 +18,7 @@
     )
   ) %>');
   Alchemy.Buttons.enable();
-  Alchemy.growl('<%= t("Successfully added content") % {:content => @content.name_for_label} %>')
+  Alchemy.growl('<%= _t("Successfully added content") % {:content => @content.name_for_label} %>')
 
 <% end %>
 

data/app/views/alchemy/admin/contents/new.html.erb

@@ -3,17 +3,17 @@
   <%= f.hidden_field :element_id %>
   <table>
     <tr>
-      <td class="label"><%= f.label :name, t('name') %></td>
+      <td class="label"><%= f.label :name, _t('name') %></td>
       <td class="select">
         <%= f.select('name', @contents.map { |a|
-          [t("content_names.#{a['name']}"), a['name']]
+          [_t("content_names.#{a['name']}"), a['name']]
         }, {}, {:class => 'alchemy_selectbox'}) %>
       </td>
     </tr>
     <tr>
       <td class="submit" colspan="2">
         <%= hidden_field_tag('options', @options) %>
-        <%= f.button t(:create), :class => 'button' %>
+        <%= f.button _t(:create), :class => 'button' %>
       </td>
     </tr>
   </table>

data/app/views/alchemy/admin/dashboard/index.html.erb

@@ -2,19 +2,19 @@
   <div class="with_padding">
     <h1>
       <% if @first_time -%>
-      <%= t('Welcome, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
+      <%= _t('Welcome, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
       <% else -%>
-      <%= t('Welcome back, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
+      <%= _t('Welcome back, %{name}', :name => current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
       <% end -%>
     </h1>
     <p>
-      <small><%= t('Your last login was on %{time}', :time => l(current_user.last_login_at)) unless current_user.last_login_at.blank? %></small>
+      <small><%= _t('Your last login was on %{time}', :time => l(current_user.last_login_at)) unless current_user.last_login_at.blank? %></small>
     </p>
   </div>
   <div class="widget">
-    <h2><%= t('Your last updated pages') %>:</h2>
+    <h2><%= _t('Your last updated pages') %>:</h2>
     <%- if @last_edited_pages.blank? -%>
-    <ul><li class="even"><%= t('no pages') %></li></ul>
+    <ul><li class="even"><%= _t('no pages') %></li></ul>
     <%- else -%>
     <ul>
       <%- @last_edited_pages.each do |page| -%>
@@ -25,9 +25,9 @@
   </div>
   <%- reset_cycle('edited_pages') -%>
   <div class="widget">
-    <h2><%= t('Currently locked pages') %>:</h2>
+    <h2><%= _t('Currently locked pages') %>:</h2>
     <%- if @locked_pages.blank? -%>
-    <ul><li class="even"><%= t('no pages') %></li></ul>
+    <ul><li class="even"><%= _t('no pages') %></li></ul>
     <%- else -%>
     <ul>
       <%- @locked_pages.each do |page| -%>
@@ -35,7 +35,7 @@
         <%- if current_user.id == page.locked_by -%>
         <%= link_to(page.name, alchemy.edit_admin_page_path(page)) %> <small>(<%= page.locker.name %>)</small>
         <%= form_tag(alchemy.unlock_admin_page_path(page, :redirect_to => alchemy.admin_dashboard_url)) do %>
-          <button class="icon_button small" title="<%= t('explain_unlocking') %>">
+          <button class="icon_button small" title="<%= _t('explain_unlocking') %>">
             <%= render_icon('close small') %>
           </button>
         <% end %>
@@ -49,9 +49,9 @@
   </div>
   <%- reset_cycle('locked_pages') -%>
   <div class="widget">
-    <h2><%= t('Who else is online') %>:</h2>
+    <h2><%= _t('Who else is online') %>:</h2>
     <%- if @online_users.blank? -%>
-    <ul><li class="even"><%= t('no users') %></li></ul>
+    <ul><li class="even"><%= _t('no users') %></li></ul>
     <%- else -%>
     <ul>
       <%- @online_users.each do |user| -%>
@@ -63,9 +63,9 @@
 </div>
 <div id="sideboard">
   <%= image_tag("alchemy/alchemy-logo.png", :style => "width: 240px; height: 70px") %>
-  <p><%= t("Version") %>: <%= @alchemy_version %></p>
+  <p><%= _t("Version") %>: <%= @alchemy_version %></p>
   <div class="sideboard_body" style="display: none">
-    <p><%= t('Alchemy is open software and itself uses open software and free resources:') %></p>
+    <p><%= _t('Alchemy is open software and itself uses open software and free resources:') %></p>
     <ul>
       <li>
         <a href="http://rubyonrails.org" target="_blank">RubyOnRails</a>

data/app/views/alchemy/admin/elements/_add_picture.html.erb

@@ -6,7 +6,7 @@
       :options => options
     ),
     {
-      :title => t('add_image_to_element'),
+      :title => _t('add_image_to_element'),
       :size => '780x580',
       :resizable => true
     }

data/app/views/alchemy/admin/elements/_element.html.erb

@@ -8,7 +8,7 @@
       </div>
       <% if element.has_validations? %>
       <p class="validation_notice">
-        <span class="validation_indicator">*</span> <%= t('Mandatory') %>
+        <span class="validation_indicator">*</span> <%= _t('Mandatory') %>
       </p>
       <% end %>
       <% if element.taggable? %>

data/app/views/alchemy/admin/elements/_element_foot.html.erb

@@ -6,7 +6,7 @@
       alchemy.trash_admin_element_path(element),
       :method => :delete,
       :class => "delete_element_button",
-      :title => t("trash element"),
+      :title => _t("trash element"),
       :remote => true
     ) -%>
     <%= link_to(
@@ -15,7 +15,7 @@
       :remote => true,
       :method => :post,
       :class => "element_move_button",
-      :title => t("cut_element")
+      :title => _t("cut_element")
     ) %>
     <%= link_to(
       "",
@@ -23,14 +23,14 @@
       :remote => true,
       :method => :post,
       :class => "element_copy_button",
-      :title => t("copy_element")
+      :title => _t("copy_element")
     ) %>
   </span>
   <span class="element_public">
     <%= f.check_box :public, :id => "element_#{element.id}_public" -%>
-    <%= label_tag "element_#{element.id}_public", t("visible") -%>
+    <%= label_tag "element_#{element.id}_public", _t("visible") -%>
   </span>
   <button type="submit" class="button">
-    <%= t('save') %>
+    <%= _t('save') %>
   </button>
 </div>

data/app/views/alchemy/admin/elements/_element_head.html.erb

@@ -1,11 +1,11 @@
 <div class="element_head">
   <div class="element_handle">
     <span class="element_icon"></span>
-    <%- if element.description.nil? -%>
-    <span class="warning icon" title="<%= t("Warning: Element '%{elementname}' is missing its description.", :elementname => element.name) %>"></span>
-    <%- else -%>
+    <% if element.description.blank? %>
+    <span class="warning icon" title="<%= _t(:element_description_missing) %>"></span>
+    <% else %>
     <%= render_icon("element_#{element.public? ? 'public' : 'draft'}") %>
-    <%- end -%>
+    <% end %>
   </div>
   <span class="element_heading">
     <span class="preview_text_element_name"><%= element.display_name %></span>
@@ -20,9 +20,9 @@
       :class => "element_folder_spinner"
     ) %>
     <%= link_to('', '#', {
-      :onclick => "Alchemy.toggleElement(#{element.id}, '#{alchemy.fold_admin_element_path(element)}', '#{form_authenticity_token}', {title: '#{t('Warning!')}', message: '#{t(:element_dirty_notice)}', okLabel: '#{t('Yes')}', cancelLabel: '#{t('No')}'})",
+      :onclick => "Alchemy.toggleElement(#{element.id}, '#{alchemy.fold_admin_element_path(element)}', '#{form_authenticity_token}', {title: '#{_t('Warning!')}', message: '#{_t(:element_dirty_notice)}', okLabel: '#{_t('Yes')}', cancelLabel: '#{_t('No')}'})",
       :class => element.folded? ? 'expand_element' : 'fold_element',
-      :title => element.folded? ? t(:show_element_content) : t(:hide_element_content),
+      :title => element.folded? ? _t(:show_element_content) : _t(:hide_element_content),
       :id => "element_#{element.id}_folder"
     }) %>
   </span>

data/app/views/alchemy/admin/elements/_elements_select.html.erb

@@ -1,9 +1,9 @@
 <%= select_tag(
   "element_from_page_#{@page_id}_to_link",
   options_for_select(@elements.collect{ |m| [m.display_name_with_preview_text, "##{m.dom_id}"] }),
-  :prompt => t("choose_element_to_link"),
+  :prompt => _t("choose_element_to_link"),
   :class => "elements_from_page_selector alchemy_selectbox",
   :onchange => "jQuery('#page_anchor').val(value)",
-  :title => t("choose_element_as_target"),
+  :title => _t("choose_element_as_target"),
   :autofocus => true
 ) %>

data/app/views/alchemy/admin/elements/_new_element_form.html.erb

@@ -2,7 +2,7 @@
 <%- if @elements.blank? -%>
   <div class="info with_margin">
     <%= render_icon('info') %>
-    <%= t('no_more_elements_to_add') %>
+    <%= _t('no_more_elements_to_add') %>
   </div>
 <%- else -%>
   <%= form_for [:admin, @element], :remote => true, :class => "add_element_content" do |form| %>
@@ -10,13 +10,13 @@
     <table>
       <tr>
         <td class="label">
-          <%= form.label :name, t("element_of_type") %>
+          <%= form.label :name, _t("element_of_type") %>
         </td>
         <td class="select">
           <%= form.select(
             'name',
             @page.can_have_cells? ? grouped_elements_for_select(@elements) : elements_for_select(@elements),
-            { :prompt => t('select_element') },
+            { :prompt => _t('select_element') },
             { :class => "alchemy_selectbox", :autofocus => true }
           ) -%>
         </td>
@@ -24,7 +24,7 @@
       <tr>
         <td colspan="2" class="submit">
           <%= form.hidden_field 'page_id' %>
-          <%= form.button t('add'), :class => 'button' %>
+          <%= form.button _t('add'), :class => 'button' %>
         </td>
       </tr>
     </table>

data/app/views/alchemy/admin/elements/_picture_gallery_editor.html.erb

@@ -1,6 +1,6 @@
 <%- max_image_count = options[:maximum_amount_of_images] || options[:max_images] -%>
 <div class="content_editor picture_gallery_editor">
-  <label><%= t("picture_gallery_editor.#{element.name}", :default => t('picture_gallery_editor')) %></label>
+  <label><%= _t("picture_gallery_editor.#{element.name}", :default => _t('picture_gallery_editor')) %></label>
   <div class="picture_gallery_images" id="element_<%= element.id %>_contents">
     <%- pictures.each do |picture| -%>
       <%= render_essence_editor(picture, {:dragable => (pictures.size > 1)}.merge(options)) %>

data/app/views/alchemy/admin/elements/create.js.erb

@@ -7,7 +7,7 @@ $('.element_editor[data-element-id="<%= @cutted_element_id %>"]').remove();
 <% end %>
 
 <% if @page.can_have_cells? %>
-Alchemy.selectOrCreateCellTab('<%= @cell_name -%>', '<%= @cell.nil? ? t("other Elements") : @cell.name_for_label -%>');
+Alchemy.selectOrCreateCellTab('<%= @cell_name -%>', '<%= @cell.nil? ? _t("other Elements") : @cell.name_for_label -%>');
 <% end %>
 
 $element_area = $('#cell_<%= @cell_name -%>');
@@ -24,7 +24,7 @@ if ($element_area.find('.element_editor').length > 0) {
   $element_area.sortable('refresh');
 }
 
-Alchemy.growl('<%= t("successfully_added_element") -%>');
+Alchemy.growl('<%= _t("successfully_added_element") -%>');
 Alchemy.closeCurrentWindow();
 
 <% @element.contents.essence_richtexts.each do |content| %>

data/app/views/alchemy/admin/elements/index.html.erb

@@ -2,11 +2,11 @@
   <% if @cells.any? %>
     <div id="cells">
       <ul>
-        <li><a href="#cell_for_other_elements"><%= t(:main_content) %></a></li>
+        <li><a href="#cell_for_other_elements"><%= _t(:main_content) %></a></li>
         <% @elements.each do |cell, elements| %>
           <li>
             <a href="#cell_<%= cell.name %>">
-              <%= t(cell.name, :scope => :cell_names) %>
+              <%= _t(cell.name, :scope => :cell_names) %>
             </a>
           </li>
         <% end %>

data/app/views/alchemy/admin/elements/list.js.erb

@@ -1,6 +1,6 @@
 (function($) {
 
-  var close = $('<a class="close_elements_from_page_selector" title="<%= t(:remove) -%>">–</a>');
+  var close = $('<a class="close_elements_from_page_selector" title="<%= _t(:remove) -%>">–</a>');
   $('#elements_for_page_<%= @page_id -%>').html('<%= escape_javascript(render("elements_select")) %>');
   $('#elements_for_page_<%= @page_id -%>').append(close);
 

data/app/views/alchemy/admin/elements/new.html.erb

@@ -3,8 +3,8 @@
 <%- else -%>
 <div id="overlay_tabs">
   <ul>
-    <li><a href="#create_element_tab"><%= t('New') %></a></li>
-    <li><a href="#paste_element_tab"><%= t('Paste from clipboard') %></a></li>
+    <li><a href="#create_element_tab"><%= _t('New') %></a></li>
+    <li><a href="#paste_element_tab"><%= _t('Paste from clipboard') %></a></li>
   </ul>
   <div id="create_element_tab">
     <%= render :partial => 'new_element_form' %>
@@ -15,7 +15,7 @@
       <table>
         <tr>
           <td class="label">
-            <label for="paste_from_clipboard"><%= t("Element") %></label>
+            <label for="paste_from_clipboard"><%= _t("Element") %></label>
           </td>
           <td class="select">
             <%= clipboard_select_tag(@clipboard_items) %>
@@ -24,7 +24,7 @@
         <tr>
           <td colspan="2" class="submit">
             <%= f.hidden_field(:page_id) %>
-            <%= f.button t("paste"), :class => 'button' %>
+            <%= f.button _t("paste"), :class => 'button' %>
           </td>
         </tr>
       </table>

data/app/views/alchemy/admin/elements/order.js.erb

@@ -1,6 +1,6 @@
 (function($) {
 
-  Alchemy.growl('<%= t("successfully_saved_element_position") -%>');
+  Alchemy.growl('<%= _t("successfully_saved_element_position") -%>');
   $('#element_area .ajax_folder').show();
   Alchemy.PreviewWindow.refresh();
 

data/app/views/alchemy/admin/elements/trash.js.erb

@@ -1,6 +1,6 @@
 $('#element_<%= @element.id %>').hide(200, function() {
   $(this).remove();
-  Alchemy.growl('<%= escape_javascript(t("Element trashed")) %>');
+  Alchemy.growl('<%= escape_javascript(_t("Element trashed")) %>');
   $('#element_area .sortable_cell').sortable('refresh');
   Alchemy.refreshTrashWindow(<%= @page.id %>);
   $('#element_trash_button .icon').addClass('full');

data/app/views/alchemy/admin/elements/update.js.erb

@@ -7,7 +7,7 @@ $('.element_heading .preview_text_quote', $el).html('<%= escape_javascript(@elem
 $('div.content_editor').removeClass('validation_failed');
 $("#element_<%= @element.id %>_errors").hide();
 Alchemy.setElementSaved($el);
-Alchemy.growl('<%= t("element_saved") %>');
+Alchemy.growl('<%= _t("element_saved") %>');
 Alchemy.PreviewWindow.refresh();
 
 <%=raw update_elements_with_essence_selects(@page, @element) %>

data/app/views/alchemy/admin/essence_files/edit.html.erb

@@ -9,10 +9,10 @@
       <td class="select">
         <%= f.select(
           "css_class", [
-            [t("Layout default"), ""],
-            [t("above"), "no_float"],
-            [t("left"), "left"],
-            [t("right"), "right"]
+            [_t("Layout default"), ""],
+            [_t("above"), "no_float"],
+            [_t("left"), "left"],
+            [_t("right"), "right"]
           ],
           :class => 'alchemy_selectbox'
         ) %>
@@ -20,7 +20,7 @@
     </tr>
     <tr>
       <td colspan="2" class="submit">
-        <%= f.button t("save"), :class => 'button' %>
+        <%= f.button _t("save"), :class => 'button' %>
       </td>
     </tr>
   </table>

data/app/views/alchemy/admin/essence_pictures/crop.html.erb

@@ -11,21 +11,21 @@
     <%= f.hidden_field :crop_from %>
     <%= f.hidden_field :crop_size %>
     <%= hidden_field_tag 'content_id', @content.id %>
-    <%= f.button t("save"), :class => 'button' %>
+    <%= f.button _t("save"), :class => 'button' %>
   <% end %>
   <div class="toolbar_spacer"></div>
   <div class="button_with_label">
     <%= link_to(render_icon('delete-small'), '#', {
       :onclick => 'Alchemy.ImageCropper.reset()',
       :class => 'icon_button',
-      :title => t('Reset Imagemask')
+      :title => _t('Reset Imagemask')
     }) %>
-    <label><%= t("Reset Imagemask") %></label>
+    <label><%= _t("Reset Imagemask") %></label>
   </div>
 </div>
 
 <div id="crop_explain" class="tip">
-  <%= t('explain cropping') %>
+  <%= _t('explain cropping') %>
 </div>
 
 <div id="jscropper">

data/app/views/alchemy/admin/essence_pictures/edit.html.erb

@@ -30,7 +30,7 @@
       <%= f.select(
         "render_size",
         options_for_select(
-          [[t('Layout default'), @options[:image_size]]] + @options[:sizes].sort,
+          [[_t('Layout default'), @options[:image_size]]] + @options[:sizes].sort,
           @essence_picture.render_size
         ), :class => 'alchemy_selectbox'
       ) %>
@@ -49,7 +49,7 @@
       <td class="select">
         <%= f.select(
           "css_class",
-          [[t("Layout default"), ""], [t("above"), "no_float"], [t("left"), "left"], [t("right"), "right"]],
+          [[_t("Layout default"), ""], [_t("above"), "no_float"], [_t("left"), "left"], [_t("right"), "right"]],
           {},
           {:class => 'alchemy_selectbox'}
         ) %>
@@ -62,7 +62,7 @@
       <td class="select">
         <%= f.select(
           "css_class",
-          options_for_select([[t('None'), '']] + @options[:css_classes].sort, @essence_picture.css_class),
+          options_for_select([[_t('None'), '']] + @options[:css_classes].sort, @essence_picture.css_class),
           {},
           {:class => 'alchemy_selectbox'}
         ) %>
@@ -78,7 +78,7 @@
     <tr>
       <td colspan="2" class="submit">
         <%= hidden_field_tag 'content_id', @content.id %>
-        <%= f.button t("apply"), :class => 'button' %>
+        <%= f.button _t("apply"), :class => 'button' %>
       </td>
     </tr>
   </table>