From 17f08ab5cb47e7d4d90385f1150e2373ed1abfa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?U=C4=A3is=20Ozols?= Date: Thu, 28 Jul 2011 13:39:05 +0300 Subject: Update translation scopes and routes. --- app/views/refinery/admin/blog/categories/_category.html.erb | 8 +++++--- app/views/refinery/admin/blog/categories/_form.html.erb | 8 ++++---- .../refinery/admin/blog/categories/_sortable_list.html.erb | 2 +- app/views/refinery/admin/blog/categories/index.html.erb | 9 +++++---- app/views/refinery/admin/blog/posts/_form.html.erb | 10 +++++----- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/app/views/refinery/admin/blog/categories/_category.html.erb b/app/views/refinery/admin/blog/categories/_category.html.erb index 191f649..80cc2e3 100644 --- a/app/views/refinery/admin/blog/categories/_category.html.erb +++ b/app/views/refinery/admin/blog/categories/_category.html.erb @@ -5,12 +5,14 @@ <%= link_to refinery_icon_tag("application_edit.png"), - edit_admin_blog_category_path(category, :dialog => true, :height => 325), + main_app.edit_refinery_admin_blog_category_path(category, + :dialog => true, + :height => 325), :title => t('.edit') %> - <%= link_to refinery_icon_tag("delete.png"), admin_blog_category_path(category), + <%= link_to refinery_icon_tag("delete.png"), main_app.refinery_admin_blog_category_path(category), :class => "cancel confirm-delete", :title => t('.delete'), :method => :delete, - :confirm => t('message', :scope => 'shared.admin.delete', :title => category.title) %> + :confirm => t('message', :scope => 'refinery.admin.delete', :title => category.title) %> diff --git a/app/views/refinery/admin/blog/categories/_form.html.erb b/app/views/refinery/admin/blog/categories/_form.html.erb index bfcbc7b..a5d3de3 100644 --- a/app/views/refinery/admin/blog/categories/_form.html.erb +++ b/app/views/refinery/admin/blog/categories/_form.html.erb @@ -1,5 +1,5 @@ -<%= form_for [:admin, @blog_category] do |f| -%> - <%= render :partial => "/shared/admin/error_messages", +<%= form_for [main_app, :refinery_admin, @blog_category] do |f| -%> + <%= render :partial => "/refinery/admin/error_messages", :locals => { :object => f.object, :include_object_name => true @@ -10,10 +10,10 @@ <%= f.text_field :title, :class => 'larger widest' -%> - <%= render :partial => "/shared/admin/form_actions", + <%= render :partial => "/refinery/admin/form_actions", :locals => { :f => f, :continue_editing => false, - :delete_title => t('delete', :scope => 'admin.blog.categories.category') + :delete_title => t('delete', :scope => 'refinery.admin.blog.categories.category') } %> <% end %> diff --git a/app/views/refinery/admin/blog/categories/_sortable_list.html.erb b/app/views/refinery/admin/blog/categories/_sortable_list.html.erb index df6a39b..f4e8641 100644 --- a/app/views/refinery/admin/blog/categories/_sortable_list.html.erb +++ b/app/views/refinery/admin/blog/categories/_sortable_list.html.erb @@ -1,7 +1,7 @@ -<%= render :partial => "/shared/admin/sortable_list", +<%= render :partial => "/refinery/admin/sortable_list", :locals => { :continue_reordering => (defined?(continue_reordering) ? continue_reordering : true) } %> diff --git a/app/views/refinery/admin/blog/categories/index.html.erb b/app/views/refinery/admin/blog/categories/index.html.erb index 938f235..75acb77 100644 --- a/app/views/refinery/admin/blog/categories/index.html.erb +++ b/app/views/refinery/admin/blog/categories/index.html.erb @@ -1,12 +1,13 @@ -<%= render :partial => '/admin/blog/submenu' %> +<%= render :partial => '/refinery/admin/blog/submenu' %>
<% if searching? %> -

<%= t('results_for', :scope => 'shared.admin.search', :query => params[:search]) %>

+

<%= t('results_for', :scope => 'refinery.admin.search', + :query => params[:search]) %>

<% if @blog_categories.any? %> <%= render :partial => "blog_categories", :collection => @blog_categories %> <% else %> -

<%= t('search_no_results', :scope => 'admin') %>

+

<%= t('no_results', :scope => 'refinery.admin.search') %>

<% end %> <% else %> <% if @blog_categories.any? %> @@ -18,7 +19,7 @@ <% else %>

- <%= t('.no_items_yet', :create => t('new', :scope => 'admin.blog.submenu.categories')) %> + <%= t('.no_items_yet', :create => t('new', :scope => 'refinery.admin.blog.submenu.categories')) %>

<% end %> diff --git a/app/views/refinery/admin/blog/posts/_form.html.erb b/app/views/refinery/admin/blog/posts/_form.html.erb index 1fc0050..a452c13 100644 --- a/app/views/refinery/admin/blog/posts/_form.html.erb +++ b/app/views/refinery/admin/blog/posts/_form.html.erb @@ -14,10 +14,10 @@
  • - <%= link_to t('body', :scope => 'activerecord.attributes.blog_post'), "#page_part_body" %> + <%= link_to t('body', :scope => 'activerecord.attributes.refinery.blog_post'), "#page_part_body" %>
  • - <%= link_to t('teaser', :scope => 'activerecord.attributes.blog_post'), "#page_part_teaser" %> + <%= link_to t('teaser', :scope => 'activerecord.attributes.refinery.blog_post'), "#page_part_teaser" %>
  • <% Refinery::Blog.tabs.each_with_index do |tab, tab_index| %>
  • @@ -49,7 +49,7 @@
- <%= f.label :tag_list, t('blog.shared.tags.title') -%> + <%= f.label :tag_list, t('refinery.blog.shared.tags.title') -%> <%= f.text_field :tag_list, :class => 'larger' -%>
@@ -66,7 +66,7 @@