From e208d179bb4dd2cbf5f62d6adefe0ed589cdfad8 Mon Sep 17 00:00:00 2001
From: AntonioTerceiro <AntonioTerceiro@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Sun, 2 Dec 2007 05:33:31 +0000
Subject: [PATCH] ActionItem93: removing extra space

---
 app/helpers/application_helper.rb                    |  2 +-
 app/views/catalog/show.rhtml                         |  4 +++-
 app/views/category/_product_category.rhtml           |  4 ++--
 app/views/category/view.rhtml                        |  6 ++++--
 app/views/consumed_products/new.rhtml                |  4 ++--
 app/views/enterprise_editor/index.rhtml              | 18 +++++++++---------
 app/views/environment_role_manager/change_role.rhtml |  2 +-
 app/views/environment_role_manager/make_admin.rhtml  |  2 +-
 app/views/manage_products/index.rhtml                |  2 +-
 app/views/manage_products/show.rhtml                 |  6 +++---
 app/views/profile_members/change_role.rhtml          |  2 +-
 app/views/role/_form.rhtml                           |  2 +-
 12 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b971ae1..f360f60 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -265,7 +265,7 @@ module ApplicationHelper
 
   def link_to_category(category)
     return _('Uncategorized product') unless category
-    link_to category.name, :controller => 'category', :action => 'view', :path => category.path.split('/')
+    link_to category.full_name, :controller => 'category', :action => 'view', :path => category.path.split('/')
   end
 
   def link_to_product(product)
diff --git a/app/views/catalog/show.rhtml b/app/views/catalog/show.rhtml
index 557904a..fcfc583 100644
--- a/app/views/catalog/show.rhtml
+++ b/app/views/catalog/show.rhtml
@@ -3,4 +3,6 @@
 <%= image_tag @product.image.public_filename if @product.image %> <br/>
 <%= @product.price %> <br/>
 <%= @product.description %> <br/>
-<%= link_to_category(@product.product_category) %> <br/>
+
+
+<%= _('Category: %s ') % link_to_category(@product.product_category) %> <br/>
diff --git a/app/views/category/_product_category.rhtml b/app/views/category/_product_category.rhtml
index 68e46d2..861465a 100644
--- a/app/views/category/_product_category.rhtml
+++ b/app/views/category/_product_category.rhtml
@@ -1,6 +1,6 @@
 <ul>
-  <li><%= _("%d products in this category") % @products.size.to_s %></li>
-  <li><%= _("%d enterprises sells products in this category") % @enterprises.size.to_s %></li>
+  <li><%= n_("One product in this category.", "%{num} products in this category.", @products.size) % { :num => @products.size } %></li>
+  <li><%= n_("One enterprise sells products in this category.", "%{num} enterprises sells products in this category.", @enterprises.size) % { :num => @enterprises.size} %></li>
 </ul>
 
 <ul>
diff --git a/app/views/category/view.rhtml b/app/views/category/view.rhtml
index 540aae8..d9cbd43 100644
--- a/app/views/category/view.rhtml
+++ b/app/views/category/view.rhtml
@@ -4,8 +4,10 @@
 
 <%= render :partial => @category.class.name.underscore %>
 
-<h4> <%= _('Children categories: ')  %> </h4>
-<% unless @category.children.empty? %>
+<% if @category.children.empty? %>
+  <strong><%= _('No children categories') %></strong>
+<% else %>
+<h4> <%= _('Children categories:')  %> </h4>
   <ul>
     <% @category.children.each do |c| %>
       <li> <%= link_to_category(c) %> </li>
diff --git a/app/views/consumed_products/new.rhtml b/app/views/consumed_products/new.rhtml
index eafa164..b42c207 100644
--- a/app/views/consumed_products/new.rhtml
+++ b/app/views/consumed_products/new.rhtml
@@ -3,8 +3,8 @@
 <%= error_messages_for :consumption  %>
 
 <% form_for :consumption, @consumption do |f|  %>
-  <p> <%= _('Product: ') %> <%= f.select "product_category_id", ProductCategory.find(:all).map{|pc| [pc.name, pc.id]} %></p>
-  <p> <%= _('Aditional specifications: ') %><br> <%= f.text_area "aditional_specifications" %> </p>
+  <p> <%= _('Product:') %> <%= f.select "product_category_id", ProductCategory.find(:all).map{|pc| [pc.name, pc.id]} %></p>
+  <p> <%= _('Aditional specifications:') %><br> <%= f.text_area "aditional_specifications" %> </p>
   <%= submit_tag _('Add product')  %>
   <%= link_to _('Cancel'), :action => 'index' %>
 <% end %>
diff --git a/app/views/enterprise_editor/index.rhtml b/app/views/enterprise_editor/index.rhtml
index 004c6e8..233fde9 100644
--- a/app/views/enterprise_editor/index.rhtml
+++ b/app/views/enterprise_editor/index.rhtml
@@ -2,15 +2,15 @@
 
 <%= error_messages_for 'profile' %>
 
-<p> <%= _('Identifier: ') %> <%= @enterprise.identifier %> </p>
-<p> <%= _('Address: ') %> <%= @enterprise.address %> </p>
-<p> <%= _('Contact phone: ') %> <%= @enterprise.contact_phone %> </p>
-<p> <%= _('Contact person: ') %> <%= @enterprise.organization_info.contact_person %> </p>
-<p> <%= _('Acronym: ') %> <%= @enterprise.organization_info.acronym %> </p>
-<p> <%= _('Foundation year: ') %> <%= @enterprise.organization_info.foundation_year %> </p>
-<p> <%= _('Legal Form: ') %> <%= @enterprise.organization_info.legal_form %> </p>
-<p> <%= _('Economic activity: ') %> <%= @enterprise.organization_info.economic_activity %> </p>
-<p> <%= _('Management infomation: ') %> <%= @enterprise.organization_info.management_information %> </p>
+<p> <%= _('Identifier:') %> <%= @enterprise.identifier %> </p>
+<p> <%= _('Address:') %> <%= @enterprise.address %> </p>
+<p> <%= _('Contact phone:') %> <%= @enterprise.contact_phone %> </p>
+<p> <%= _('Contact person:') %> <%= @enterprise.organization_info.contact_person %> </p>
+<p> <%= _('Acronym:') %> <%= @enterprise.organization_info.acronym %> </p>
+<p> <%= _('Foundation year:') %> <%= @enterprise.organization_info.foundation_year %> </p>
+<p> <%= _('Legal Form:') %> <%= @enterprise.organization_info.legal_form %> </p>
+<p> <%= _('Economic activity:') %> <%= @enterprise.organization_info.economic_activity %> </p>
+<p> <%= _('Management infomation:') %> <%= @enterprise.organization_info.management_information %> </p>
 
 <%= link_to _('Edit enterprise'), :action => 'edit', :id => @enterprise %>
 <%= help _('Change the information about the enterprise') %>
diff --git a/app/views/environment_role_manager/change_role.rhtml b/app/views/environment_role_manager/change_role.rhtml
index 6b93c29..4056de7 100644
--- a/app/views/environment_role_manager/change_role.rhtml
+++ b/app/views/environment_role_manager/change_role.rhtml
@@ -2,7 +2,7 @@
 
 <% labelled_form_for :member, @admin, :url => {:action => 'update_roles'} do |f| %>
   
-  <%= _('Roles: ') %> <br>
+  <%= _('Roles:') %> <br>
   <% @roles.each do |r| %>
     <%= labelled_form_field(r.name, (check_box_tag "roles[]", r.id, @admin.role_assignments.map{|ra|ra.role}.include?(r))) %>
   <% end %>
diff --git a/app/views/environment_role_manager/make_admin.rhtml b/app/views/environment_role_manager/make_admin.rhtml
index 507de09..14c1de7 100644
--- a/app/views/environment_role_manager/make_admin.rhtml
+++ b/app/views/environment_role_manager/make_admin.rhtml
@@ -5,7 +5,7 @@
   <% @people.each do |p| %>
     <%= labelled_form_field(p.name, (radio_button_tag "person", p.id)) %>
   <% end %>
-    <%= _('Roles: ') %> <br>
+    <%= _('Roles:') %> <br>
   <% @roles.each do |r| %>
     <%= labelled_form_field(r.name, (check_box_tag "roles[]", r.id)) %>
   <% end %>
diff --git a/app/views/manage_products/index.rhtml b/app/views/manage_products/index.rhtml
index 81cb1a2..c398766 100644
--- a/app/views/manage_products/index.rhtml
+++ b/app/views/manage_products/index.rhtml
@@ -4,7 +4,7 @@
 
 <% @products.each do |product| %>
   <p> <b> <%= link_to product.name, :action => 'show', :id => product %> </b>  
-      <%= _('Price: ') %> <%= product.price %> 
+      <%= _('Price:') %> <%= product.price %> 
       <%= link_to _('edit'), :action => 'edit', :id => product %> 
       <%= link_to _('destroy'), :action => 'destroy', :id => product %> </p>
 <% end %>
diff --git a/app/views/manage_products/show.rhtml b/app/views/manage_products/show.rhtml
index 6d375a3..be1fd61 100644
--- a/app/views/manage_products/show.rhtml
+++ b/app/views/manage_products/show.rhtml
@@ -1,9 +1,9 @@
 <h3> <%= @product.name %> </h3>
 
 <p> <%= image_tag @product.image.public_filename if @product.image %> </p>
-<p> <%= _('Price: ') %> <%= @product.price %> </p>
-<p> <%= _('Description: ') %> <%= @product.description %> </p>
-<p> <%= _('Category: ') %> <%= link_to_category(@product.product_category) %> </p>
+<p> <%= _('Price:') %> <%= @product.price %> </p>
+<p> <%= _('Description:') %> <%= @product.description %> </p>
+<p> <%= _('Category:') %> <%= link_to_category(@product.product_category) %> </p>
 
 <%= link_to _('edit'), :action => 'edit', :id => @product %>
 <%= link_to _('destroy'), :action => 'destroy', :id => @product %>
diff --git a/app/views/profile_members/change_role.rhtml b/app/views/profile_members/change_role.rhtml
index 4212c77..07b65a6 100644
--- a/app/views/profile_members/change_role.rhtml
+++ b/app/views/profile_members/change_role.rhtml
@@ -2,7 +2,7 @@
 
 <% labelled_form_for :member, @member, :url => {:action => 'update_roles'} do |f| %>
   
-  <%= _('Roles: ') %> <br>
+  <%= _('Roles:') %> <br>
   <% @roles.each do |r| %>
     <%= check_box_tag "roles[]", r.id, @associations.map(&:role).include?(r) %>
       <%= r.name.capitalize %><br/>
diff --git a/app/views/role/_form.rhtml b/app/views/role/_form.rhtml
index 87a603b..58809cd 100644
--- a/app/views/role/_form.rhtml
+++ b/app/views/role/_form.rhtml
@@ -4,7 +4,7 @@
 
   <%= f.text_field :name %>
 
-  <%= _('Permissions: ') %> <br>
+  <%= _('Permissions:') %> <br>
   <% permissions.keys.each do |p| %>
     <%= labelled_form_field(permission_name(p), (check_box_tag "role[permissions][]", p, @role.has_permission?(p))) %>
   <% end %>
--
libgit2 0.21.2