alchemy_cms 2.5.0.b5 → 2.5.0.b9

data/app/views/alchemy/admin/pages/locked.html.erb

@@ -1,3 +1,3 @@
 <div>
-  <p><%= t("page_locked") %></p>
+  <p><%= _t("page_states.locked.true") %></p>
 </div>

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

@@ -3,8 +3,8 @@
 <%- else -%>
 <div id="overlay_tabs">
   <ul>
-    <li><a href="#create_page_tab"><%= t('New page') %></a></li>
-    <li><a href="#paste_page_tab"><%= t('Paste from clipboard') %></a></li>
+    <li><a href="#create_page_tab"><%= _t('New page') %></a></li>
+    <li><a href="#paste_page_tab"><%= _t('Paste from clipboard') %></a></li>
   </ul>
   <div id="errors"></div>
   <div id="create_page_tab">
@@ -16,7 +16,7 @@
       <table id="paste_page_form">
         <tr>
           <td class="label">
-            <label for="paste_from_clipboard"><%= t("Page") %></label>
+            <label for="paste_from_clipboard"><%= _t("Page") %></label>
           </td>
           <td class="select">
             <%= clipboard_select_tag(@clipboard_items) %>
@@ -33,7 +33,7 @@
         <tr>
           <td class="label">&nbsp;</td>
           <td class="submit">
-            <%= f.button t("paste"), :class => 'button', :name => nil %>
+            <%= f.button _t("paste"), :class => 'button', :name => nil %>
           </td>
         </tr>
       </table>

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

@@ -4,7 +4,7 @@ Alchemy.growl("<%= @notice -%>");
 
 <% if @old_page_layout != @page.page_layout %>
   Alchemy.ElementsWindow.reload();
-  Alchemy.growl('<%= t(:page_layout_changed_notice) %>');
+  Alchemy.growl('<%= _t(:page_layout_changed_notice) %>');
 <% end %>
 
 <% if @while_page_edit %>
@@ -26,7 +26,7 @@ Alchemy.growl("<%= @notice -%>");
   <% if @page.restricted? %>
     $('.page_status:nth-child(3)', $page).addClass('restricted', 'not_restricted').removeClass('not_restricted');
   <% elsif @page.redirects_to_external? %>
-    $('span.redirect_url', $page).html('&raquo; <%= t("Redirects to") %>: <%= h @page.urlname %>');
+    $('span.redirect_url', $page).html('&raquo; <%= _t("Redirects to") %>: <%= h @page.urlname %>');
   <% else %>
     $('.page_status:nth-child(3)', $page).addClass('not_restricted').removeClass('restricted');
   <% end %>

data/app/views/alchemy/admin/partials/_autocomplete_tag_list.html.erb

@@ -1,5 +1,5 @@
 <div class="autocomplete_tag_list">
-  <%= f.label :tag_list, render_icon(:tag_label), :for => "autocomplete_tag_list_#{object.id}", :title => t(:tag_list) %>
+  <%= f.label :tag_list, render_icon(:tag_label), :for => "autocomplete_tag_list_#{object.id}", :title => _t(:tag_list) %>
   <%= f.autocomplete_field(
     :tag_list,
     alchemy.autocomplete_admin_tags_path,

data/app/views/alchemy/admin/partials/_flash_notices.html.erb

@@ -1,5 +1,5 @@
 <div id="flash_notices" style="display: <%= flash.keys.blank? ? "none" : "block" %>">
-<%- flash.keys.each do |flash_type| -%>
-  <%= render :partial => 'alchemy/admin/partials/flash', :locals => {:flash_type => flash_type, :message => flash[flash_type.to_sym]} %>
-<%- end -%>
+<% flash.keys.each do |flash_type| %>
+  <%= render_flash_notice(flash[flash_type.to_sym], flash_type) if flash[flash_type.to_sym].present? %>
+<% end %>
 </div>

data/app/views/alchemy/admin/partials/_flash_upload.html.erb

@@ -2,36 +2,36 @@
   <div id="spanButtonPlaceHolder">
     <p>
       <%= image_tag('alchemy/ajax_loader.gif', :style => 'width: 16px; height: 16px; top: 3px; position: relative') %>
-      <%= t('Please wait. Flash® is loading...') %>
+      <%= _t('Please wait. Flash® is loading...') %>
     </p>
   </div>
   <a href="#" class="button no-spinner" onclick="swfu.cancelQueue(); return false" style="display: none">
-    <%= t("swfupload.cancel_uploads") %>
+    <%= _t("swfupload.cancel_uploads") %>
   </a>
   <p style="margin-top: 8px" id="choose_alternative_uploader">
     <small>
-      <%= raw t('If you have any problems using the Flash uploader you can switch to', :link => t('<a href="#" id="uploadswitcher">%{value}</a>', :value => t('regular method'))) %>
+      <%= raw _t('If you have any problems using the Flash uploader you can switch to', :link => _t('<a href="#" id="uploadswitcher">%{value}</a>', :value => _t('regular method'))) %>
     </small>
   </p>
 </div>
 
-<h2 id="swfUploadFlashError" style="display: none"><%= t('Could not load Adobe Flash® Plugin!') %></h2>
+<h2 id="swfUploadFlashError" style="display: none"><%= _t('Could not load Adobe Flash® Plugin!') %></h2>
 
 <div id="alternativeUpload" style="display: none">
   <h2 id="flash_upload_error_explanation" style="display: none">
-    <%= t('Error with the Flash® Uploader!') %>
+    <%= _t('Error with the Flash® Uploader!') %>
   </h2>
-  <p><%= t('use_alternative_uploader_instead') %></p>
+  <p><%= _t('use_alternative_uploader_instead') %></p>
   <p>
     <%= file_field_tag('Filedata') %>
   </p>
   <p>
-    <%= submit_tag t('upload'), :class => 'button' %>
+    <%= submit_tag _t('upload'), :class => 'button' %>
   </p>
   <p>
     <small>
       <a href="#" id="switch_to_flash_uploader" class="underline">
-        <%= t('Switch to Flash® Uploader') %>
+        <%= _t('Switch to Flash® Uploader') %>
       </a>
     </small>
   </p>

data/app/views/alchemy/admin/partials/_language_tree_select.html.erb

@@ -5,7 +5,7 @@
     :id => 'language_tree_select',
     :class => 'alchemy_selectbox short'
   ) %>
-  <label><%= t("Language tree") %></label>
+  <label><%= _t("Language tree") %></label>
 </div>
 
 <% content_for :javascripts do %>

data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb

@@ -8,7 +8,7 @@
   <%- else -%>
   <span class="module icon"></span>
   <%- end -%>
-  <label><%= truncate t(navigation["name"]), :length => 10 -%></label>
+  <label><%= truncate _t(navigation["name"]), :length => 10 -%></label>
 <% end %>
 
 <%- end -%>

data/app/views/alchemy/admin/partials/_remote_search_form.html.erb

@@ -30,9 +30,9 @@
       :remote => true,
       :class => "search_field_clear",
       :id => "search_field_clear",
-      :title => t("click_to_show_all"),
+      :title => _t("click_to_show_all"),
       :style => (params[:query].nil? ? "display: none" : "display: block")
     ) %>
   </div>
-  <%= submit_tag t('search'), :name => nil, :class => 'button' %>
+  <%= submit_tag _t('search'), :name => nil, :class => 'button' %>
 <% end %>

data/app/views/alchemy/admin/partials/_search_form.html.erb

@@ -14,9 +14,9 @@
         url,
         :class => "search_field_clear",
         :id => "search_field_clear",
-        :title => t("click_to_show_all"),
+        :title => _t("click_to_show_all"),
         :style => (params[:query].nil? ? "display: none" : "display: block")
       ) %>
   </div>
-  <label><%= t('search') %></label>
+  <label><%= _t('search') %></label>
 <% end %>

data/app/views/alchemy/admin/partials/_sub_navigation_tab.html.erb

@@ -2,7 +2,7 @@
   <% entry.stringify_keys! %>
   <% permitted_to?(*navigate_module(entry)) do %>
   <div class="subnavi_tab<%= admin_sub_navigation_entry_active?(entry) ? ' active' : nil %>">
-    <%= link_to t(entry["name"]), url_for_module_sub_navigation(entry) %>
+    <%= link_to _t(entry["name"]), url_for_module_sub_navigation(entry) %>
   </div>
   <% end %>
 <% end %>

data/app/views/alchemy/admin/partials/_upload_form.html.erb

@@ -1,29 +1,29 @@
 <div class="info">
   <%= render_icon('info') %>
-  <p><%= t('explain_upload.intro', :name => item_type) %>:</p>
+  <p><%= _t('explain_upload.intro', :name => item_type) %>:</p>
   <ol>
-    <li><%= t('explain_upload.step1', :name => item_type) %></li>
-    <li><%= t('explain_upload.step2', :name => item_type) %>*</li>
-    <li id="explain_step3"><%= t('explain_upload.step3') %></li>
-    <li id="explain_drag_n_drop"><%= t('explain_upload.dragndrop', :name => item_type) %></li>
+    <li><%= _t('explain_upload.step1', :name => item_type) %></li>
+    <li><%= _t('explain_upload.step2', :name => item_type) %>*</li>
+    <li id="explain_step3"><%= _t('explain_upload.step3') %></li>
+    <li id="explain_drag_n_drop"><%= _t('explain_upload.dragndrop', :name => item_type) %></li>
   </ol>
   <%- unless file_types.first == '*' -%>
-    <p><%= t('You may upload files with following extensions', :file_types_description => file_types_description, :file_types => file_types.to_sentence) %>.</p>
+    <p><%= _t('You may upload files with following extensions', :file_types_description => file_types_description, :file_types => file_types.to_sentence) %>.</p>
   <%- end -%>
-  <small>*<%= t('explain_upload.footnote', :name => item_type) %></small>
+  <small>*<%= _t('explain_upload.footnote', :name => item_type) %></small>
 </div>
 
 <%= render 'alchemy/admin/partials/flash_upload' %>
 
 <div class="browse">
-  <%= label_tag :multiple, t('browse'), :style => 'display:none;' %>
-  <input name="Filedata" id="multiple" type="file" multiple value="<%= t('browse') %>">
+  <%= label_tag :multiple, _t('browse'), :style => 'display:none;' %>
+  <input name="Filedata" id="multiple" type="file" multiple value="<%= _t('browse') %>">
   <a href="#" class="button no-spinner" id="cancelHTML5Queue" style="display: none">
-    <%= t("swfupload.cancel_uploads") %>
+    <%= _t("swfupload.cancel_uploads") %>
   </a>
 </div>
 
-<div id="dropbox"><%= t('Or drag files over here') %></div>
+<div id="dropbox"><%= _t('Or drag files over here') %></div>
 
 <div class="flash notice" style="display: none; margin: 8px 0" id="upload_info_container">
   <%= render_icon('tick') %>

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

@@ -6,24 +6,24 @@
 </div>
 <%= form_tag delete_multiple_admin_pictures_path, :method => :delete do %>
   <div class="selected_item_tools">
-    <h2><%= t("edit_selected_pictures") %></h2>
+    <h2><%= _t("edit_selected_pictures") %></h2>
     <%= link_to(
-      render_icon('edit') + t("Edit"),
+      render_icon('edit') + _t("Edit"),
       edit_multiple_admin_pictures_path,
       :class => 'button with_icon',
-      :title => t('Edit multiple pictures'),
+      :title => _t('Edit multiple pictures'),
       :id => 'edit_multiple_pictures',
       :style => 'float: none'
     ) %>
-    <%= button_tag render_icon('destroy') + t("Delete"), 'data-alchemy-confirm' => {
-      :title => t("please_confirm"),
-      :message => t("confirm_to_delete_images_from_server"),
-      :okLabel => t("Yes"),
-      :cancelLabel => t("No")
+    <%= button_tag render_icon('destroy') + _t("Delete"), 'data-alchemy-confirm' => {
+      :title => _t("please_confirm"),
+      :message => _t("confirm_to_delete_images_from_server"),
+      :okLabel => _t("Yes"),
+      :cancelLabel => _t("No")
     }.to_json, :class => 'button with_icon' %>
-    &nbsp;<%= t('or') %>&nbsp;
+    &nbsp;<%= _t('or') %>&nbsp;
     <%= link_to(
-      render_icon('delete-small') + t("Clear selection"),
+      render_icon('delete-small') + _t("Clear selection"),
       admin_pictures_path(
         :query => params[:query],
         :tagged_with => params[:tagged_with],
@@ -34,17 +34,17 @@
       :style => 'float: none'
     ) %>
   </div>
-  <%= content_tag :h3, t("picture_library.filter.#{params[:filter]}") if params[:filter].present? %>
+  <%= content_tag :h3, _t("picture_library.filter.#{params[:filter]}") if params[:filter].present? %>
   <div id="pictures">
   <% if @pictures.blank? and @recent_pictures.blank? and params[:query].nil? %>
     <div class="info">
       <%= render_icon('info') %>
-      <%= t("no_images_in_archive") %>
+      <%= _t("no_images_in_archive") %>
     </div>
   <% elsif @pictures.blank? and @recent_pictures.blank? %>
     <div class="info">
       <%= render_icon('info') %>
-      <%= t("no_search_results") %>
+      <%= _t("no_search_results") %>
     </div>
   <% else %>
     <%= render :partial => 'picture', :collection => @pictures %>

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

@@ -11,7 +11,7 @@
         :options => @options
       }),
       :remote => true,
-      :title => t("small_thumbnails"),
+      :title => _t("small_thumbnails"),
       :class => "icon_button"
     ) %>
     <%= link_to(
@@ -25,7 +25,7 @@
         :options => @options
       }),
       :remote => true,
-      :title => t("medium_thumbnails"),
+      :title => _t("medium_thumbnails"),
       :class => "icon_button"
     ) %>
     <%= link_to(
@@ -39,10 +39,10 @@
         :options => @options
       }),
       :remote => true,
-      :title => t("big_thumbnails"),
+      :title => _t("big_thumbnails"),
       :class => "icon_button"
     ) %>
-    <label><%= t('Image size') %></label>
+    <label><%= _t('Image size') %></label>
     <%= hidden_field_tag('size', @size, :id => 'overlay_thumbnails_size') %>
   </div>
   <div class="toolbar_spacer"></div>
@@ -59,14 +59,14 @@
       ),
       {
         :size => "540x550",
-        :title => t('upload_image')
+        :title => _t('upload_image')
       },
       {
         :class => 'icon_button',
-        :title => t('upload_image')
+        :title => _t('upload_image')
       }
     ) %>
-    <label><%= t('upload_image') %></label>
+    <label><%= _t('upload_image') %></label>
   </div>
   <%= render :partial => 'alchemy/admin/partials/remote_search_form' %>
 </div>

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

@@ -1,13 +1,13 @@
 <% params_to_keep = [:size, :tagged_with, :query, :element_id, :content_id, :_] %>
 
 <div id="filter_bar">
-  <h2><%= t('Filter') %></h2>
+  <h2><%= _t('Filter') %></h2>
   <%= select_tag(
     'picture_filter',
     options_for_select([
-      [t("all_pictures"), ''],
-      [t("last_upload_only"), 'last_upload'],
-      [t("recently_uploaded_only"), 'recent']
+      [_t("all_pictures"), ''],
+      [_t("last_upload_only"), 'last_upload'],
+      [_t("recently_uploaded_only"), 'recent']
     ], params[:filter]),
     :data => { :remote => !!request.xhr? },
     :class => 'alchemy_selectbox'

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

@@ -1,7 +1,7 @@
 <% if @pictures.empty? %>
   <div class="info">
     <%= render_icon('info') %>
-    <%= t("no_images_in_archive") %>
+    <%= _t("no_images_in_archive") %>
   </div>
 <% else %>
   <%= render :partial => "picture_to_assign", :collection => @pictures, :locals => {:options => @options, :size => @size} %>

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

@@ -6,7 +6,7 @@
   <span class="picture_tool delete">
     <%= link_to_confirmation_window(
       "",
-      t("confirm_to_delete_image_from_server"),
+      _t("confirm_to_delete_image_from_server"),
       alchemy.admin_picture_path(
         :id => picture,
         :query => params[:query],
@@ -16,7 +16,7 @@
         :filter => params[:filter]
       ),
       {
-        :title => t('Delete image')
+        :title => _t('Delete image')
       }
     ) -%>
   </span>
@@ -34,11 +34,11 @@
         :filter => params[:filter]
       ),
       {
-        :title => t('Edit image'),
+        :title => _t('Edit image'),
         :size => "400x180"
       },
       {
-        :title => t('Edit image')
+        :title => _t('Edit image')
       }
     ) -%>
   </span>
@@ -56,11 +56,11 @@
         :filter => params[:filter]
       ),
       {
-        :title => t('Picture infos'),
+        :title => _t('Picture infos'),
         :size => "400x300"
       },
       {
-        :title => t('Show picture infos')
+        :title => _t('Show picture infos')
       }
     ) -%>
   </span>
@@ -72,7 +72,7 @@
     image_tag(
       alchemy.thumbnail_path(:id => picture, :size => @size, :sh => picture.security_token(:size => @size)),
       :alt => picture.name,
-      :title => t('zoom_image'),
+      :title => _t('zoom_image'),
       :onload => "Alchemy.fadeImage(this, '#picture_#{picture.id} .image_spinner');",
       :style => "display: none;"
     ),

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

@@ -24,7 +24,7 @@
     :remote => true,
     :onclick => '$(self).attr("href", "#").off("click")',
     :method => action_method,
-    :title => t("assign_image"),
+    :title => _t("assign_image"),
     :class => 'thumbnail_background'
   ) %>
   <div class="picture_name" title="<%= picture_to_assign.name %>">

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

@@ -1,5 +1,5 @@
 <% p = params.dup %>
-<h2><%= t("Filter by tag") %></h2>
+<h2><%= _t("Filter by tag") %></h2>
 <%#= js_filter_field :onkeyup => "Alchemy.ListFilter('#tag_list li')", :id => 'tag_list_filter' %>
 <ul>
   <% Alchemy::Picture.tag_counts.each do |t| %>
@@ -21,7 +21,7 @@
 </ul>
 <% if p[:tagged_with].present? %>
   <%= link_to(
-    render_icon('delete-small') + t('Remove tag filter'),
+    render_icon('delete-small') + _t('Remove tag filter'),
     url_for(p.delete_if { |k, v| k == "tagged_with" }.merge(:action => :index)),
     :remote => request.xhr?,
     :class => 'button small with_icon please_wait'

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

@@ -14,13 +14,13 @@
       <td class="label"><%= f.label :tag_list %>*</td>
       <td class="input">
         <%= render 'alchemy/admin/partials/autocomplete_tag_list', :f => f, :object => @picture %>
+        <p class="foot_note"><%= _t('Please seperate the tags with commata') %></p>
       </td>
     </tr>
     <tr>
       <td class="submit" colspan="2">
-        <%= f.button t(:save), :name => nil, :class => 'button' %>
+        <%= f.button _t(:save), :name => nil, :class => 'button' %>
       </td>
     </tr>
   </table>
-  <p class="foot_note"><%= t('Please seperate the tags with commata') %></p>
 <% end %>