alchemy_cms 2.5.0.b5 → 2.5.0.b9

data/app/views/alchemy/admin/pictures/edit_multiple.html.erb

@@ -11,21 +11,21 @@
 
   <div class="info">
     <%= render_icon :info %>
-    <p><%= t("You are about to edit %{length} pictures at once") % {:length => @pictures.length} %></p>
+    <p><%= _t("You are about to edit %{length} pictures at once") % {:length => @pictures.length} %></p>
   </div>
 
   <table>
     <tr>
-      <td class="label"><%= label_tag :pictures_name, t('Name') %></td>
+      <td class="label"><%= label_tag :pictures_name, _t('Name') %></td>
       <td class="input">
         <%= text_field_tag :pictures_name, nil, :class => "thin_border long" %>
       </td>
     </tr>
     <tr>
-      <td class="label"><%= label_tag :pictures_tag_list, t('Tags') + '*' %></td>
+      <td class="label"><%= label_tag :pictures_tag_list, _t('Tags') + '*' %></td>
       <td class="input">
         <div class="autocomplete_tag_list">
-          <%= label_tag :tag_list, render_icon(:tag_label), :for => "autocomplete_tag_list", :title => t(:tag_list) %>
+          <%= label_tag :tag_list, render_icon(:tag_label), :for => "autocomplete_tag_list", :title => _t(:tag_list) %>
           <%= autocomplete_field_tag(
             :pictures_tag_list,
             @pictures.collect(&:tag_list).flatten.uniq.join(', '),
@@ -38,11 +38,11 @@
     </tr>
     <tr>
       <td class="submit" colspan="2">
-        <%= button_tag t(:save), :name => nil, :class => 'button' %>
+        <%= button_tag _t(:save), :name => nil, :class => 'button' %>
       </td>
     </tr>
   </table>
 
-  <p class="foot_note"><%= t('Please seperate the tags with commata') %></p>
+  <p class="foot_note"><%= _t('Please seperate the tags with commata') %></p>
 
 <% end %>

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

@@ -2,14 +2,14 @@
   <div id="toolbar_buttons">
     <%= toolbar_button(
       :icon => 'upload',
-      :label => t('upload_image'),
+      :label => _t('upload_image'),
       :url => alchemy.new_admin_picture_path(:size => @size),
       :overlay_options => {
-        :title => t('upload_image'),
+        :title => _t('upload_image'),
         :size => '540x590'
       },
       :class => 'icon_button',
-      :title => t('upload_image'),
+      :title => _t('upload_image'),
       :if_permitted_to => [:new, :alchemy_admin_pictures]
     ) %>
     <div class="toolbar_spacer"></div>
@@ -20,7 +20,7 @@
           :size => "small",
           :query => params[:query]
         }),
-        :title => t("small_thumbnails"),
+        :title => _t("small_thumbnails"),
         :class => "icon_button please_wait"
       ) %>
       <%= link_to(
@@ -29,7 +29,7 @@
           :size => "medium",
           :query => params[:query]
         }),
-        :title => t("medium_thumbnails"),
+        :title => _t("medium_thumbnails"),
         :class => "icon_button please_wait"
       ) %>
       <%= link_to(
@@ -38,10 +38,10 @@
           :size => "large",
           :query => params[:query]
         }),
-        :title => t("big_thumbnails"),
+        :title => _t("big_thumbnails"),
         :class => "icon_button please_wait"
       ) %>
-      <label><%= t('Image size') %></label>
+      <label><%= _t('Image size') %></label>
       <%= hidden_field_tag('size', @size, :id => 'overlay_thumbnails_size') %>
     </div>
 
@@ -55,16 +55,16 @@
           :remote => true,
           :method => :post
         },
-        :label => t('Flush picture cache'),
+        :label => _t('Flush picture cache'),
         :class => 'icon_button please_wait',
-        :title => t('Flush picture cache'),
+        :title => _t('Flush picture cache'),
         :skip_permission_check => true
       ) %>
     <% end %>
     <div class="toolbar_spacer"></div>
     <div class="button_with_label">
       <%= link_to render_icon('select_all'), '', :id => 'select_all_pictures', :class => 'icon_button' %>
-      <label><%= t("Select all") %></label>
+      <label><%= _t("Select all") %></label>
     </div>
   </div>
 

data/app/views/alchemy/admin/pictures/info.html.erb

@@ -20,9 +20,9 @@
 </div>
 <div id="pictures_page_list">
 <% if @picture.deletable? %>
-  <h2><%= t :this_picture_is_not_used_on_any_page %></h2>
+  <h2><%= _t(:this_picture_is_not_used_on_any_page) %></h2>
 <% else %>
-  <h2><%= t :this_picture_is_used_on_these_pages %>:</h2>
+  <h2><%= _t(:this_picture_is_used_on_these_pages) %>:</h2>
   <ul class="list">
   <% @picture.essence_pictures.group_by(&:page).each do |page, essence_pictures| %>
     <li>

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

@@ -3,9 +3,9 @@
     :partial => "alchemy/admin/partials/upload_form",
     :locals => {
       :file_types => configuration(:uploader)['allowed_filetypes']['pictures'],
-      :file_types_description => t('images'),
+      :file_types_description => _t('images'),
       :model_name => 'picture',
-      :item_type => t('images')
+      :item_type => _t('images')
     }
   ) %>
   <%= f.submit :upload, :style => 'display: none' %>

data/app/views/alchemy/admin/resources/_boolean.html.erb

@@ -0,0 +1,5 @@
+<td></td>
+<td class="checkbox">
+  <%= f.send :check_box, attribute[:name] -%>
+  <%= f.send :label, attribute[:name] %>
+</td>

data/app/views/alchemy/admin/resources/_datetime.html.erb

@@ -0,0 +1,2 @@
+<td class="label"><%= f.send :label, attribute[:name] %></td>
+<td class="input"><%= f.send :text_field, attribute[:name], :type => :date -%></td>

data/app/views/alchemy/admin/resources/_form.html.erb

@@ -7,40 +7,29 @@
     </ul>
   </div>
   <table>
-    <%- resource_handler.attributes.each do |attribute| -%>
+  <% resource_handler.attributes.each do |attribute| %>
     <tr>
-      <%- if attribute[:type] == :boolean -%>
-      <td></td>
-      <td class="checkbox">
-        <%= f.send :check_box, attribute[:name] -%>
-        <%= f.send :label, attribute[:name] %>
-      </td>
-      <%- elsif attribute[:type] == :text -%>
-      <td class="label"><%= f.send :label, attribute[:name] %></td>
-      <td class="input"><%= f.send :text_area, attribute[:name], :rows => 4 -%></td>
-      <%- elsif attribute[:type] == :datetime -%>
-      <td class="label"><%= f.send :label, attribute[:name] %></td>
-      <td class="input"><%= f.send :text_field, attribute[:name], :type => :date -%></td>
-      <%- else -%>
-      <td class="label"><%= f.send :label, attribute[:name] %></td>
-
-      <% attr_array = attribute[:name].split('.') %>
-      <% if attr_array.length > 1 %>
-        <td class="select">
-        <%= f.send :select, "#{attr_array[0]}_id", attr_array[0].classify.constantize.all.collect {|r| [r.send(attr_array[1]), r.id] }, {:prompt => t("Please choose")}, {:class => "alchemy_selectbox"} %>
-      </td>
-      <% else %>
-        <td class="input">
-        <%= f.send :text_field, attribute[:name], :class => 'thin_border' -%>
+    <% attr_array = attribute[:name].split('.') %>
+    <% if attr_array.length > 1 %>
+      <td class="select">
+        <%= f.send(:select,
+          "#{attr_array[0]}_id",
+          attr_array[0].classify.constantize.all.collect {|r| [r.send(attr_array[1]), r.id] },
+          { :prompt => _t("Please choose") }, { :class => "alchemy_selectbox" }
+        ) %>
       </td>
+    <% else %>
+      <% begin %>
+      <%= render attribute[:type].to_s, attribute: attribute, f: f %>
+      <% rescue ActionView::MissingTemplate %>
+      <%= render 'string', attribute: attribute, f: f %>
       <% end %>
-
-      <%- end -%>
+    <% end %>
     </tr>
-    <%- end -%>
+  <% end %>
     <tr>
       <td class="submit" colspan="2">
-        <%= f.button t('save'), :class => 'button' %>
+        <%= f.button _t('save'), :class => 'button' %>
       </td>
     </tr>
   </table>

data/app/views/alchemy/admin/resources/_resource.html.erb

@@ -18,9 +18,9 @@
     <%- permitted_to?(:destroy, resource_permission_scope) do -%>
     <%= link_to_confirmation_window(
       '',
-      t("Are you sure?"),
+      _t("Are you sure?"),
       resource_path(resource),
-      :title => t("Delete"),
+      :title => _t("Delete"),
       :class => "icon destroy",
       :id => "delete_#{resource_handler.model_name}_#{resource.id}"
     ) -%>
@@ -30,12 +30,12 @@
       '',
       edit_resource_path(resource),
       {
-        :title => t("Edit"),
+        :title => _t("Edit"),
         :size => resource_window_size
       },
       {
         :class => "icon edit",
-        :title => t("Edit")
+        :title => _t("Edit")
       }
     ) -%>
     <%- end -%>

data/app/views/alchemy/admin/resources/_string.html.erb

@@ -0,0 +1,5 @@
+<td class="label"><%= f.send :label, attribute[:name] %></td>
+<td class="input">
+  <%= f.send :text_field, attribute[:name], :class => 'thin_border' %>
+  <%= resource_help_text attribute %>
+</td>

data/app/views/alchemy/admin/resources/_table.html.erb

@@ -17,7 +17,7 @@
   <%= render_resources %>
 </table>
 <%- elsif params[:query] -%>
-<p><%= t('Nothing found') %></p>
+<p><%= _t('Nothing found') %></p>
 <%- end -%>
 
 <%= render 'alchemy/admin/partials/pagination_links', :items => resources_instance_variable, :scope => resource_url_proxy %>

data/app/views/alchemy/admin/resources/_text.html.erb

@@ -0,0 +1,5 @@
+<td class="label"><%= f.send :label, attribute[:name] %></td>
+<td class="input">
+  <%= f.send :text_area, attribute[:name], :rows => 4 %>
+  <%= resource_help_text attribute %>
+</td>

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

@@ -1,4 +1,4 @@
-<%- label_title = t("Create #{resource_model_name}", :default => t('Create')) -%>
+<%- label_title = _t("Create #{resource_model_name}", :default => _t('Create')) -%>
 
 <%- toolbar(
   :buttons => [

data/app/views/alchemy/admin/tags/_tag.html.erb

@@ -10,19 +10,19 @@
       "",
       edit_admin_tag_path(tag),
       {
-        :title => t(:edit_tag),
+        :title => _t(:edit_tag),
         :size => '360x385'
       },
       {
-        :title => t(:edit_tag),
+        :title => _t(:edit_tag),
         :class => 'icon tag_edit'
       }
     ) %>
     <%= link_to_confirmation_window(
       '',
-      t(:do_you_really_want_to_delete_this_tag?),
+      _t(:do_you_really_want_to_delete_this_tag?),
       admin_tag_path(tag),
-      :title => t(:delete_tag),
+      :title => _t(:delete_tag),
       :class => "icon tag_delete"
     ) %>
   </td>

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

@@ -1,4 +1,4 @@
-<h2 class="with_padding"><%= t(:you_can_rename_this_tag) %></h2>
+<h2 class="with_padding"><%= _t(:you_can_rename_this_tag) %></h2>
 <%= form_for @tag, :as => :tag, :url => {:controller => :tags, :action => "update", :id => @tag.id}, :html => {:method => :put}, :remote => true do |f| %>
   <table border="0" cellspacing="4" cellpadding="4" style="width: 100%">
     <tr>
@@ -11,13 +11,13 @@
     </tr>
     <tr>
       <td colspan="2" class="submit">
-        <%= f.button t(:rename), :class => "button" %>
+        <%= f.button _t(:rename), :class => "button" %>
       </td>
     </tr>
   </table>
 <% end %>
 <% if @tags.any? -%>
-  <h2 class="with_padding"><%= t(:or_replace_it_with_an_existing_tag) %>:</h2>
+  <h2 class="with_padding"><%= _t(:or_replace_it_with_an_existing_tag) %>:</h2>
   <%= form_for @tag, :as => :tag, :url => {:controller => :tags, :action => "update", :id => @tag.id, :replace => true}, :html => {:method => :put, :style => "clear: both"}, :remote => true do |f| %>
     <table border="0" cellspacing="4" cellpadding="4" style="width: 100%">
       <tr>
@@ -33,7 +33,7 @@
       </tr>
       <tr>
         <td colspan="2" class="submit">
-          <%= f.button t(:replace), :class => "button", :id => "tag_replace_button" %>
+          <%= f.button _t(:replace), :class => "button", :id => "tag_replace_button" %>
         </td>
       </tr>
     </table>

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

@@ -5,13 +5,13 @@
         content_tag('span', '', :class => 'icon tag_add'),
         new_admin_tag_path,
         {
-          :title => t('New Tag'),
+          :title => _t('New Tag'),
           :size => '310x210'
         },
-        :title => t('New Tag'),
+        :title => _t('New Tag'),
         :class => 'icon_button'
       ) %><br />
-      <label><%= t('New Tag') %></label>
+      <label><%= _t('New Tag') %></label>
     </div>
   </div>
   <%= render :partial => 'alchemy/admin/partials/search_form' %>
@@ -36,9 +36,9 @@
   <% else %>
 
   <%= render_message do %>
-    <h2><%= t('No Tags found') %></h2>
+    <h2><%= _t('No Tags found') %></h2>
     <% if params[:query].blank? %>
-      <p><%= t(:tags_get_created_if_used_the_first_time) %></p>
+      <p><%= _t(:tags_get_created_if_used_the_first_time) %></p>
     <% end %>
   <% end %>
 

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

@@ -1,7 +1,7 @@
 <%= form_for [:admin, @tag], :as => :tag, :url => admin_tags_path, :html => {:id => 'new_tag'}, :remote => true do |form| %>
   <div class="info">
     <%= render_icon('info') %>
-    <%= t(:tags_get_created_if_used_the_first_time) %>
+    <%= _t(:tags_get_created_if_used_the_first_time) %>
   </div>
   <div id="errors" style="display: none"></div>
   <table>
@@ -10,7 +10,7 @@
       <td class="input"><%= form.text_field :name, :class => 'input_field' %></td>
     </tr>
     <tr>
-      <td colspan="2" class="submit"><%= form.button t('save'), :name => nil, :class => 'button' %></td>
+      <td colspan="2" class="submit"><%= form.button _t('save'), :name => nil, :class => 'button' %></td>
     </tr>
   </table>
 <% end %>

data/app/views/alchemy/admin/trash/clear.js.coffee

@@ -1,4 +1,4 @@
-Alchemy.growl '<%= t("Cleared trash") %>'
+Alchemy.growl '<%= _t("Cleared trash") %>'
 Alchemy.refreshTrashWindow <%= @page.id %>
 jQuery('#element_trash_button .icon').removeClass 'full'
 Alchemy.pleaseWaitOverlay false

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

@@ -2,12 +2,12 @@
   <%- if @elements.blank? -%>
   <div id="trash_empty_notice" <%= @elements.blank? ? '' : 'style="display: none"' %> class="info">
     <%= render_icon('info') %>
-    <%= t('Your trash is empty') %>
+    <%= _t('Your trash is empty') %>
   </div>
   <%- else -%>
   <div class="info">
     <%= render_icon('info') %>
-    <%= t('Drag an element over to the element window to restore it') %>
+    <%= _t('Drag an element over to the element window to restore it') %>
   </div>
   <div id="trash_items">
     <%- @elements.each do |element| -%>
@@ -15,7 +15,7 @@
     <%- end -%>
   </div>
   <p>
-    <%= link_to_confirmation_window(t('clear trash'), t('Do you really want to clear the trash?'), alchemy.clear_admin_trash_path(:page_id => @page.id), :class => 'button') %>
+    <%= link_to_confirmation_window(_t('clear trash'), _t('Do you really want to clear the trash?'), alchemy.clear_admin_trash_path(:page_id => @page.id), :class => 'button') %>
   </p>
   <%- end -%>
 </div>

data/app/views/alchemy/admin/users/_table.html.erb

@@ -1,7 +1,7 @@
 <table>
   <tr>
     <td class="label"><%= f.label 'gender' %></td>
-    <td class="select"><%= f.select 'gender', options_for_select(@user_genders, @user.gender), {:prompt => t('Please choose')}, :class => 'alchemy_selectbox long', :autofocus => true -%></td>
+    <td class="select"><%= f.select 'gender', options_for_select(@user_genders, @user.gender), {:prompt => _t('Please choose')}, :class => 'alchemy_selectbox long', :autofocus => true -%></td>
   </tr>
   <tr>
     <td class="label"><%= f.label 'firstname' %></td>
@@ -51,12 +51,12 @@
     <td>&nbsp;</td>
     <td class="checkbox long">
       <%= check_box_tag('send_credentials', true, @user.new_record?) %>
-      <%= label_tag('send_credentials', t('Send email with credentials')) %>
+      <%= label_tag('send_credentials', _t('Send email with credentials')) %>
     </td>
   </tr>
   <tr>
     <td class="submit" colspan="2">
-      <%= f.button t('save'), :class => 'button' %>
+      <%= f.button _t('save'), :class => 'button' %>
     </td>
   </tr>
 </table>

data/app/views/alchemy/admin/users/_user.html.erb

@@ -7,16 +7,16 @@
   <td class="name"><%= user.firstname -%></td>
   <td><%= user.lastname -%></td>
   <td class="email"><%= user.email %></td>
-  <td><%= t(user.language, :scope => 'translations') %></td>
-  <td><%= user.last_login_at.present? ? l(user.last_login_at, :format => :default) : t(:unknown) %></td>
+  <td><%= _t(user.language, :scope => 'translations') %></td>
+  <td><%= user.last_login_at.present? ? l(user.last_login_at, :format => :default) : _t(:unknown) %></td>
   <td class="role"><%= user.human_role_name %></td>
   <td class="tools">
     <%- permitted_to?(:destroy, :alchemy_admin_users) do -%>
     <%= link_to_confirmation_window(
       '',
-      t("confirm_to_delete_user"),
+      _t("confirm_to_delete_user"),
       alchemy.admin_user_path(user),
-      :title => t('delete_user'),
+      :title => _t('delete_user'),
       :class => "icon user_delete#{user.gender == 'female' ? ' female' : ' male'}"
     ) -%>
     <%- end -%>
@@ -25,13 +25,13 @@
       '',
       alchemy.edit_admin_user_path(user),
       {
-        :title => t('edit_user'),
+        :title => _t('edit_user'),
         :overflow => true,
         :size => '420x560'
       },
       {
         :class => "icon user_edit#{user.gender == 'female' ? ' female' : ' male'}",
-        :title => t('edit_user')
+        :title => _t('edit_user')
       }
     ) -%>
     <%- end -%>