Deduplicate strings from plugins

I have deduplicated every message in plugin code that was already in the core. Going forward, plugins should use c_() is they want to reuse the message from the core. If they want to force their own translation, they should probably use _('plugin_name|The message') to avoid overriding translations from the core.

Deduplicate strings from plugins
I have deduplicated every message in plugin code that was already in the core. Going forward, plugins should use c_() is they want to reuse the message from the core. If they want to force their own translation, they should probably use _('plugin_name|The message') to avoid overriding translations from the core.
Antonio Terceiro
1 parent 0a086af9
Showing 92 changed files with 200 additions and 200 deletions Show diff stats
plugins/anti_spam/views/anti_spam_plugin_admin/index.html.erb
plugins/breadcrumbs/lib/breadcrumbs_plugin/content_breadcrumbs_block.rb
plugins/bsc/lib/bsc_plugin.rb
plugins/bsc/lib/bsc_plugin/bsc_helper.rb
plugins/bsc/lib/bsc_plugin/contract.rb
plugins/bsc/views/bsc_plugin_admin/new.html.erb
plugins/bsc/views/bsc_plugin_admin/validate_enterprises.html.erb
plugins/bsc/views/bsc_plugin_myprofile/_contract_form.html.erb
plugins/bsc/views/bsc_plugin_myprofile/create_enterprise.html.erb
plugins/bsc/views/bsc_plugin_myprofile/manage_associated_enterprises.html.erb
plugins/bsc/views/bsc_plugin_myprofile/manage_contracts.html.erb
plugins/bsc/views/bsc_plugin_myprofile/transfer_ownership.html.erb
plugins/bsc/views/bsc_plugin_myprofile/view_contract.html.erb
plugins/bsc/views/profile/_profile_tab.html.erb
plugins/bsc/views/shared/_fields.html.erb
plugins/comment_classification/views/comment_classification_plugin_labels/_form.html.erb
plugins/comment_classification/views/comment_classification_plugin_labels/index.html.erb
plugins/comment_classification/views/comment_classification_plugin_myprofile/_status_form.html.erb
plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb
plugins/comment_classification/views/comment_classification_plugin_status/_form.html.erb
@@ -7,7 +7,7 @@
   <%= labelled_form_field _('API key'), f.text_field(:api_key, :size => 40) %>
  
   <% button_bar do %>
-    <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
+    <%= submit_button(:save, c_('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
   <% end %>
  
 <% end %>
@@ -53,7 +53,7 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock &lt; Block
  
   protected
  
-  CMS_ACTIONS = {:edit => _('Edit'), :upload_files => _('Upload Files'), :new => _('New')}
+  CMS_ACTIONS = {:edit => c_('Edit'), :upload_files => _('Upload Files'), :new => c_('New')}
  
   def cms_action(action)
     CMS_ACTIONS[action.to_sym] || action
@@ -101,7 +101,7 @@ class BscPlugin &lt; Noosfero::Plugin
     else
       content = lambda { product.enterprise.name }
     end
-    properties << { :name => _('Supplier'), :content => content }
+    properties << { :name => c_('Supplier'), :content => content }
   end
  
   def profile_tabs
@@ -4,9 +4,9 @@ module BscPlugin::BscHelper
  
   def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
     options[:min_chars] ||= 3
-    options[:hint_text] ||= _("Type in a search term")
-    options[:no_results_text] ||= _("No results")
-    options[:searching_text] ||= _("Searching...")
+    options[:hint_text] ||= c_("Type in a search term")
+    options[:no_results_text] ||= c_("No results")
+    options[:searching_text] ||= c_("Searching...")
     options[:search_delay] ||= 1000
     options[:prevent_duplicates] ||=  true
     options[:backspace_delete_item] ||= false
@@ -43,7 +43,7 @@ class BscPlugin::Contract &lt; Noosfero::Plugin::ActiveRecord
     end
  
     def self.names
-      [_('State'), _('Federal')]
+      [c_('State'), _('Federal')]
     end
   end
  
@@ -5,7 +5,7 @@
   <%= render :partial => 'shared/fields', :locals => {:f => f, :profile => @bsc} %>
  
   <% button_bar do %>
-    <%= submit_button('save', _('Save')) %>
-    <%= button('cancel', _('Cancel'), {:controller => 'admin_panel'}) %>
+    <%= submit_button('save', c_('Save')) %>
+    <%= button('cancel', c_('Cancel'), {:controller => 'admin_panel'}) %>
   <% end %>
 <% end %>
@@ -6,7 +6,7 @@
                                 :focus => true }) %>
  
   <% button_bar do %>
-    <%= submit_button('save', _('Save'))%>
-    <%= button('cancel', _('Cancel'), {:controller => 'admin_panel'})%>
+    <%= submit_button('save', c_('Save'))%>
+    <%= button('cancel', c_('Cancel'), {:controller => 'admin_panel'})%>
   <% end %>
 <% end %>
@@ -10,7 +10,7 @@
   <%= labelled_form_field(_('Status'), f.select(:status, BscPlugin::Contract::Status.types.
         map { |s| [BscPlugin::Contract::Status.names[s], s] })) %>
   <%= f.text_field(:number_of_producers, :size => 8, :id => 'bsc-plugin-contract-spinner') %>
-  <%= _('Enterprises')+':' %>
+  <%= c_('Enterprises')+':' %>
  
   <% search_action = {:action => 'search_contract_enterprises', :profile => profile.identifier} %>
   <%= token_input_field_tag(:enterprises, 'involved-enterprises', search_action, 
@@ -19,7 +19,7 @@
  
   <table id="bsc-plugin-sales-table" class="alternate-colors">
     <tr>
-      <th class="bsc-plugin-sales-products-column"><%= _('Products') %></th>
+      <th class="bsc-plugin-sales-products-column"><%= c_('Products') %></th>
       <th class="bsc-plugin-sales-quantity-column" ><%= _('Quantity') %></th>
       <th class="bsc-plugin-sales-price-column" ><%= _('Unit price') %></th>
     </tr>
@@ -34,13 +34,13 @@
  
   <%= labelled_form_field( _('Supply period'), 
     text_field_tag('contract[supply_start]', (@contract.supply_start ? @contract.supply_start.strftime("%Y-%m-%d") : nil), :id => 'from', :size => 9) + 
-    _(' to ') +
+    c_(' to ') +
     text_field_tag('contract[supply_end]', (@contract.supply_end ? @contract.supply_end.strftime("%Y-%m-%d") : nil), :id => 'to', :size => 9) )
   %>
  
   <%= f.text_area(:annotations, :rows => 5, :cols => 68) %>
   <% button_bar do%>
-    <%= submit_button(:save, _('Save'), :cancel => {:action => 'manage_contracts'})%>
+    <%= submit_button(:save, c_('Save'), :cancel => {:action => 'manage_contracts'})%>
   <% end %>
 <% end %>
  
@@ -55,8 +55,8 @@
   BSCContracts.tokenInputOptions = {
     minChars: 3,
     hintText: <%= _('Type in a search term for product').to_json %>,
-    noResultsText: <%= _("No results").to_json %>,
-    searchingText: <%= _("Searching...").to_json %>,
+    noResultsText: <%= c_("No results").to_json %>,
+    searchingText: <%= c_("Searching...").to_json %>,
     searchDelay: 1000,
     preventDuplicates: true,
     backspaceDeleteItem: false,
@@ -9,12 +9,12 @@
   <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
   <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise } %>
   <p style="border-bottom: 2px solid #babdb6"></p>
-  <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %>
+  <%= required labelled_form_field(c_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %>
   <p style="border-bottom: 2px solid #babdb6"></p>
   <%= render :partial => 'similar_enterprises', :locals => {:bsc => profile}%>
  
   <% button_bar do %>
-    <%= submit_button('save', _('Save'), :cancel => {:controller => 'profile_editor', :profile => profile.identifier}) %>
+    <%= submit_button('save', c_('Save'), :cancel => {:controller => 'profile_editor', :profile => profile.identifier}) %>
   <% end %>
 <% end %>
  
@@ -19,8 +19,8 @@
   <%= button('add', _('Add new enterprise'), {:action => 'create_enterprise'}) %>
  
   <% button_bar do %>
-    <%= submit_button('save', _('Save'))%>
-    <%= button('cancel', _('Cancel'), {:controller => 'profile_editor'})%>
+    <%= submit_button('save', c_('Save'))%>
+    <%= button('cancel', c_('Cancel'), {:controller => 'profile_editor'})%>
   <% end %>
  
 <% end %>
@@ -9,7 +9,7 @@
       <br style="clear:both" />
     <% end %>
     <br style="clear:both" />
-    <%= submit_button(:save, _('Filter')) %>
+    <%= submit_button(:save, c_('Filter')) %>
   </div>
  
   <div id='bsc-plugin-contracts-results'>
@@ -31,8 +31,8 @@
               <%= content_tag('i', show_date(contract.created_at)) %>
             </td>
             <td class="links">
-              <%= link_to(_('Edit'), :action => 'edit_contract', :contract_id => contract.id)%>
-              <%= link_to(_('Remove'), {:action => 'destroy_contract', :contract_id => contract.id}, :confirm => _('Are you sure?'))%>
+              <%= link_to(c_('Edit'), :action => 'edit_contract', :contract_id => contract.id)%>
+              <%= link_to(c_('Remove'), {:action => 'destroy_contract', :contract_id => contract.id}, :confirm => _('Are you sure?'))%>
             </td>
           </tr>
         <% end %>
@@ -41,7 +41,7 @@
     <% end %>
  
     <% button_bar do %>
-      <%= button(:back, _('Go back'), :controller => 'profile_editor') %>
+      <%= button(:back, c_('Go back'), :controller => 'profile_editor') %>
       <%= button(:new, _('Create new contract'), :action => 'new_contract')%>
     <% end %>
   </div>
@@ -26,7 +26,7 @@
   <% end %>
  
   <% button_bar do %>
-    <%= submit_button('save', _('Save'))%>
-    <%= button('cancel', _('Cancel'), {:controller => 'profile_editor'})%>
+    <%= submit_button('save', c_('Save'))%>
+    <%= button('cancel', c_('Cancel'), {:controller => 'profile_editor'})%>
   <% end %>
 <% end %>
@@ -6,8 +6,8 @@
   </tr>
   <%= display_text_field(_('Client type'), BscPlugin::Contract::ClientType.names[@contract.client_type]) %>
   <%= display_text_field(_('Business type'), BscPlugin::Contract::BusinessType.names[@contract.business_type]) %>
-  <%= display_text_field(_('State'), @contract.state) %>
-  <%= display_text_field(_('City'), @contract.city) %>
+  <%= display_text_field(c_('State'), @contract.state) %>
+  <%= display_text_field(c_('City'), @contract.city) %>
   <%= display_text_field(_('Status'), BscPlugin::Contract::Status.names[@contract.status]) %>
   <%= display_text_field(_('Number of producers'), @contract.number_of_producers) %>
   <%= display_text_field(_('Supply period'), show_period(@contract.supply_start, @contract.supply_end, true)) %>
@@ -15,7 +15,7 @@
  
 <table class='bsc-fields-table' style="float: right;">
   <tr>
-    <th colspan='2'><%= _('Enterprises') %></th>
+    <th colspan='2'><%= c_('Enterprises') %></th>
   </tr>
   <%= display_list_field(@contract.enterprises.map {|enterprise| link_to(enterprise.short_name(60), enterprise.url)}) %>
 </table>
@@ -23,7 +23,7 @@
 <% if !@contract.sales.blank?%>
   <table id='bsc-plugin-sales-table' class="bsc-plugin-view-contract alternate-colors">
     <tr>
-      <th><%= _('Product') %></th>
+      <th><%= c_('Product') %></th>
       <th align="center"><%= _('Quantity') %></th>
       <th><%= _('Unit price') %></th>
     </tr>
@@ -51,5 +51,5 @@
 <% end %>
  
 <% button_bar do %>
-  <%= button(:back, _('Go back'), :action => 'manage_contracts') %>
+  <%= button(:back, c_('Go back'), :action => 'manage_contracts') %>
 <% end %>
 <ul>
   <%= content_tag('li', content_tag('b', _('Contact phone: ')) + profile.contact_phone) if !profile.contact_phone.blank? %>
   <%= content_tag('li', content_tag('b', _('Email: ')) + profile.contact_email) if !profile.contact_email.blank? %>
-  <%= content_tag('li', content_tag('b', _('Location: ')) + profile.state) if !profile.state.blank? %>
-  <%= content_tag('li', content_tag('b', _('Address: ')) + profile.address) if !profile.address.blank? %>
+  <%= content_tag('li', content_tag('b', c_('Location: ')) + profile.state) if !profile.state.blank? %>
+  <%= content_tag('li', content_tag('b', c_('Address: ')) + profile.address) if !profile.address.blank? %>
 </ul>
@@ -35,11 +35,11 @@
             text_field(:profile_data, :identifier, :onchange => "warn_value_change()", :size => 25)
           ) +
           content_tag('div',
-            content_tag('strong', _('WARNING!')) + '&nbsp;' +
+            content_tag('strong', c_('WARNING!')) + '&nbsp;' +
               _("You are about to change the address, and this will break external links to this bsc or to posts inside it. Do you really want to change?") +
             content_tag('div',
-              button_to_function(:ok, _("Yes"), "confirm_change()") + ' ' +
-              button_to_function(:cancel, _('No'), 'no_change()')
+              button_to_function(:ok, c_("Yes"), "confirm_change()") + ' ' +
+              button_to_function(:cancel, c_('No'), 'no_change()')
             ),
             :id => 'identifier-change-confirmation',
             :class => 'change-confirmation',
@@ -57,10 +57,10 @@
 </fieldset>
  
 <fieldset>
-  <legend><%= _('Location')%></legend>
+  <legend><%= c_('Location')%></legend>
   <%= f.text_field(:address) %>
   <%= f.text_field(:zip_code) %>
   <%= f.text_field(:city) %>
   <%= f.text_field(:state) %>
-  <%= select_country(_('Country'), :profile_data, 'country', {:class => 'type-select'}) %>
+  <%= select_country(c_('Country'), :profile_data, 'country', {:class => 'type-select'}) %>
 </fieldset>
@@ -8,6 +8,6 @@
   <%= labelled_form_field(f.check_box(:enabled) + _('Enable this label?'),'') %>
  
   <% button_bar do %>
-    <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}  ) %>
+    <%= submit_button('save', c_('Save'), :cancel => {:action => 'index'}  ) %>
   <% end %>
 <% end %>
@@ -17,8 +17,8 @@
           <td><%= label.color %></td>
           <td><%= label.enabled %></td>
           <td>
-            <%= button_without_text :edit, _('Edit'), {:action => 'edit', :id => label} %>
-            <%= button_without_text :delete, _('Remove'), {:action => 'destroy', :id => label}, :confirm => _('Are you sure you want to  remove this label?') %>
+            <%= button_without_text :edit, c_('Edit'), {:action => 'edit', :id => label} %>
+            <%= button_without_text :delete, c_('Remove'), {:action => 'destroy', :id => label}, :confirm => _('Are you sure you want to  remove this label?') %>
           </td>
         </tr>
       <% end %>
@@ -27,6 +27,6 @@
  
   <% button_bar do %>
     <%= button(:add, _('Add a new label'), :action => 'create')%>
-    <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+    <%= button :back, c_('Back to admin panel'), :controller => 'admin_panel' %>
   <% end %>
 </div>
@@ -7,6 +7,6 @@
   <%= labelled_form_field(_('Reason:'), f.text_area(:reason, :rows => 5)) %>
  
   <% button_bar do %>
-    <%= submit_button('save', _('Save') ) %>
+    <%= submit_button('save', c_('Save') ) %>
   <% end %>
 <% end %>
@@ -2,13 +2,13 @@
  
 <div id='comment-classification-status-list'>
   <% unless @comment.title.blank? %>
-    <div class='comment-title'><%= _("Title: %s") % @comment.title %></div>
+    <div class='comment-title'><%= c_("Title: %s") % @comment.title %></div>
   <% end %>
  
-  <b><%= _('Body:') %></b>
+  <b><%= c_('Body:') %></b>
   <p><%= @comment.body %></p>
  
-  <h2> <%= _("History") %> </h2>
+  <h2> <%= c_("History") %> </h2>
  
     <ul>
     <% @comment.comment_classification_plugin_comment_status_users.each do |relation| %>
@@ -8,6 +8,6 @@
   <%#= labelled_form_field(f.check_box(:enable_reason) + _('This status allows reason?'),'') %>
  
   <% button_bar do %>
-    <%= submit_button('save', _('Save'), :cancel => {:action => 'index'}  ) %>
+    <%= submit_button('save', c_('Save'), :cancel => {:action => 'index'}  ) %>
   <% end %>
 <% end %>
@@ -17,8 +17,8 @@
           <td><%= st.enabled %></td>
           <td><%= st.enable_reason %></td>
           <td>
-            <%= button_without_text :edit, _('Edit'), {:action => 'edit', :id => st} %>
-            <%= button_without_text :delete, _('Remove'), {:action => 'destroy', :id => st}, :confirm => _('Are you sure you want to remove this status?') %>
+            <%= button_without_text :edit, c_('Edit'), {:action => 'edit', :id => st} %>
+            <%= button_without_text :delete, c_('Remove'), {:action => 'destroy', :id => st}, :confirm => _('Are you sure you want to remove this status?') %>
           </td>
         </tr>
       <% end %>
@@ -27,6 +27,6 @@
  
   <% button_bar do %>
     <%= button(:add, _('Add a new status'), :action => 'create')%>
-    <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+    <%= button :back, c_('Back to admin panel'), :controller => 'admin_panel' %>
   <% end %>
 </div>
@@ -8,5 +8,5 @@ page.replace_html &quot;comment-count-#{@group_id}&quot;, @comments_count
 if @no_more_pages
   page.replace_html "comments_list_group_#{@group_id}_more", ""
 else
-  page.replace_html "comments_list_group_#{@group_id}_more", link_to_remote(_('More'), :url => { :profile => profile.identifier, :controller => 'comment_group_plugin_profile', :action => 'view_comments', :group_id => @group_id, :article_id => @article_id, :group_comment_page => @group_comment_page + 1}, :method => :get)
+  page.replace_html "comments_list_group_#{@group_id}_more", link_to_remote(c_('More'), :url => { :profile => profile.identifier, :controller => 'comment_group_plugin_profile', :action => 'view_comments', :group_id => @group_id, :article_id => @article_id, :group_comment_page => @group_comment_page + 1}, :method => :get)
 end
@@ -11,13 +11,13 @@
         if logged_in?
  
           if profile.enable_contact?
-            links.push(_('Send an e-mail') => {:href => url_for({:controller => 'contact', :action => 'new', :profile => profile.identifier})})
+            links.push(c_('Send an e-mail') => {:href => url_for({:controller => 'contact', :action => 'new', :profile => profile.identifier})})
           end
  
-          links.push(_('Report abuse') => {:href => url_for({:controller => 'profile', :action => 'report_abuse', :profile => profile.identifier})})
+          links.push(c_('Report abuse') => {:href => url_for({:controller => 'profile', :action => 'report_abuse', :profile => profile.identifier})})
  
           if !user.nil? && user.has_permission?('edit_profile', profile)
-            links.push(_('Control panel') => {:href => url_for({:controller => 'profile_editor', :profile => profile.identifier})})
+            links.push(c_('Control panel') => {:href => url_for({:controller => 'profile_editor', :profile => profile.identifier})})
           end %>
  
       <%= link_to(
@@ -18,7 +18,7 @@
   <div class="track_stats">
     <div class="comments">
       <span class="counter"><%= "#{track_card.comments_count}" %></span>
-      <span class="label"><%= _('comments') %></span>
+      <span class="label"><%= c_('comments') %></span>
     </div>
     <div class="hits">
       <span class="counter"><%= "#{track_card.hits}" %></span>
@@ -6,7 +6,7 @@
     </div>
   <% else %>
     <div class="more">
-      <%= link_to_remote(_('More'), :url => {:id => block.id, :controller => 'community_track_plugin_public', :action => 'view_tracks', :page => page, :per_page => per_page, :force_same_page => force_same_page}, :loaded => visual_effect(:highlight, "track_card_list_#{block.id}")) %>
+      <%= link_to_remote(c_('More'), :url => {:id => block.id, :controller => 'community_track_plugin_public', :action => 'view_tracks', :page => page, :per_page => per_page, :force_same_page => force_same_page}, :loaded => visual_effect(:highlight, "track_card_list_#{block.id}")) %>
     </div>
   <% end %>
 </div>
 <div id='edit-track-list-block'>
-  <%= labelled_form_field _('Limit of items'), text_field(:block, :limit, :size => 3) %>
+  <%= labelled_form_field c_('Limit of items'), text_field(:block, :limit, :size => 3) %>
   <%= labelled_form_field check_box(:block, :more_another_page) + _('Show more at another page'), '' %>
   <%= select_categories(:block, _('Select Categories')) %>
 <br/>
@@ -4,7 +4,7 @@
   <%= render :file => 'shared/tiny_mce' %>
  
   <div>
-    <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
+    <%= required labelled_form_field(c_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
   </div>
  
   <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :body_label => 'Description:'} %>
@@ -13,7 +13,7 @@
 <% end %>
  
 <% button_bar do %>
-  <%= button(:add, _('Create a new community'), :controller => 'memberships', :action => 'new_community', :profile => user.identifier, :back_to => @back_to) %>
+  <%= button(:add, c_('Create a new community'), :controller => 'memberships', :action => 'new_community', :profile => user.identifier, :back_to => @back_to) %>
 <% end %>
  
 <%= form_tag({:controller => 'community_track_plugin_public', :action => 'select_community', :profile => user.identifier}) do %>
@@ -35,7 +35,7 @@
       <%= expirable_button step_item, :edit, content, url %>
     <% end %>
     <% if step_item.accept_uploads? && step_item.allow_create?(user) %>
-      <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => step_item)) unless remove_content_button(:upload)%>
+      <%= button('upload-file', c_('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => step_item)) unless remove_content_button(:upload)%>
     <% end %>
   </div>
 </li>
@@ -2,7 +2,7 @@
   <div class="event-info">
     <ul class="event-data">
       <li class="event-dates">
-        <span><%= _('When:') %></span><%= show_period(step.start_date, step.end_date) %>
+        <span><%= c_('When:') %></span><%= show_period(step.start_date, step.end_date) %>
       </li>
     </ul>
   </div>
@@ -11,7 +11,7 @@
   <% if track.allow_create?(user) %>
     <div class="track actions">
         <%= content_tag('a', :href => url_for({:controller => 'cms', :action => 'new', :type => "CommunityTrackPlugin::Step", :parent_id => track.id}), :class => 'button with-text icon-add') do %>
-          <strong><%= _("New %s") % CommunityTrackPlugin::Step.short_description %></strong>
+          <strong><%= c_("New %s") % CommunityTrackPlugin::Step.short_description %></strong>
         <% end %>
         <a href="#" class="reorder_button button with-text icon-up" onclick="enableReorder();"><%= _('Reorder Steps') %></a>
         <%= submit_button :save, _('Save Order'), :class => "save_button" %>
@@ -10,7 +10,7 @@ class ContainerBlockPlugin::ContainerBlock &lt; Block
   validate :no_cyclical_reference, :if => 'container_box_id.present?'
  
   def no_cyclical_reference
-    errors.add(:box_id, _('cyclical reference is not allowed.')) if box_id == container_box_id
+    errors.add(:box_id, c_('cyclical reference is not allowed.')) if box_id == container_box_id
   end
  
   before_save do |b|
@@ -30,7 +30,7 @@
   <div class="container-block-button-bar button-bar">
     <%= link_to_remote '', :url => { :controller => controller.boxes_holder.kind_of?(Environment) ? 'container_block_plugin_admin' : 'container_block_plugin_myprofile', :action => 'saveWidths', :id => block.id }, 
                            :with => "containerChildrenWidth(#{block.id}, #{block.container_box.id})", 
-    :html => {:class => "button icon-save container_block_save", :id => "container_block_save_#{block.id}", :title => _('Save') },
+    :html => {:class => "button icon-save container_block_save", :id => "container_block_save_#{block.id}", :title => c_('Save') },
                            :loading => "open_loading(DEFAULT_LOADING_MESSAGE);",
                            :loaded => "close_loading();",
                            :complete => "display_notice(request.responseText);"%>
 <div id='edit-context-content-block'>
-  <%= labelled_form_field _('Limit of items'), text_field(:block, :limit, :size => 3) %>
+  <%= labelled_form_field c_('Limit of items'), text_field(:block, :limit, :size => 3) %>
   <%= labelled_form_field check_box(:block, :show_name) + _('Show content name'), '' %>
   <%= labelled_form_field check_box(:block, :show_image) + _('Show content image'), '' %>
   <%= labelled_form_field check_box(:block, :show_parent_content) + _('Show parent content when children is empty'), '' %>
@@ -10,11 +10,11 @@ module CustomFormsPlugin::Helper
   end
  
   def access_text(form)
-    return _('Public') if form.access.nil?
+    return c_('Public') if form.access.nil?
     return _('Logged users') if form.access == 'logged'
     if form.access == 'associated'
-      return _('Members') if form.profile.organization?
-      return _('Friends') if form.profile.person?
+      return c_('Members') if form.profile.organization?
+      return c_('Friends') if form.profile.person?
     end
     return _('Custom')
   end
@@ -41,9 +41,9 @@ module CustomFormsPlugin::Helper
   # TODO add the custom option that should offer the user the hability to
   # choose the profiles one by one, using something like tokeninput
   def access_options(profile)
-    associated = profile.organization? ? _('Members') : _('Friends')
+    associated = profile.organization? ? c_('Members') : c_('Friends')
     [
-      [_('Public'), nil         ],
+      [c_('Public'), nil         ],
       [_('Logged users'), 'logged'    ],
       [ associated, 'associated'],
     ]
@@ -51,7 +51,7 @@ module CustomFormsPlugin::Helper
  
   def type_options
     [
-      [_('Text'),   'text_field'  ],
+      [c_('Text'),   'text_field'  ],
       [_('Select'), 'select_field']
     ]
   end
 <div class='edit-information edit-select'>
-  <h2><%= _('Options') %></h2>
+  <h2><%= c_('Options') %></h2>
   <table class='action-table' style='width: 420px'>
     <tr>
       <th style='width: 40%'><%= _('Name') %></th>
       <th style='width: 40%'><%= _('Value') %></th>
-      <th style='width: 20%'><%= _('Delete') %></th>
+      <th style='width: 20%'><%= c_('Delete') %></th>
     </tr>
     <% option_counter = 1 %>
     <% (field.choices || {}).each do |name, value| %>
@@ -19,14 +19,14 @@
     </tr>
   </table>
  
-  <h3><%= _('Type') %></h3>
+  <h3><%= c_('Type') %></h3>
   <%= labelled_radio_button 'Radio', "fields[#{counter}][kind]", 'radio', !field.multiple && !field.list %><br />
   <%= labelled_radio_button 'Checkbox', "fields[#{counter}][kind]", 'check_box', field.multiple && !field.list %><br />
   <%= labelled_radio_button 'Select', "fields[#{counter}][kind]", 'select', !field.multiple && field.list %><br />
   <%= labelled_radio_button 'Multiple Select', "fields[#{counter}][kind]", 'multiple_select', field.multiple && field.list %><br />
  
   <% button_bar do %>
-    <%= button :ok, _('Ok'), '#', :class => 'colorbox-ok-button', :div_id => elem_id %>
+    <%= button :ok, c_('Ok'), '#', :class => 'colorbox-ok-button', :div_id => elem_id %>
   <% end %>
 </div>
  
@@ -4,7 +4,7 @@
   <td><%= check_box "fields[#{counter}]", :mandatory %></td>
   <%= hidden_field "fields[#{counter}]", :form_id, :value => @form.id %>
   <td class='actions'>
-    <%= button_without_text :edit, _('Edit'), '', :field_id => counter %>
-    <%= button_without_text :remove, _('Remove'), '#', :class => 'remove-field', :field_id => counter,  :confirm => _('Are you sure you want to remove this field?') %>
+    <%= button_without_text :edit, c_('Edit'), '', :field_id => counter %>
+    <%= button_without_text :remove, c_('Remove'), '#', :class => 'remove-field', :field_id => counter,  :confirm => _('Are you sure you want to remove this field?') %>
   </td>
 </tr>
@@ -2,7 +2,7 @@
   <td><%= text_field_tag("fields[#{counter}][choices][#{option_counter}][name]") %></td>
   <td><%= text_field_tag("fields[#{counter}][choices][#{option_counter}][value]") %></td>
   <td class='actions'>
-    <%= button_without_text :remove, _('Remove'), '#', :class => 'remove-option', :field_id => counter, :option_id => option_counter,  :confirm => _('Are you sure you want to remove this option?') %>
+    <%= button_without_text :remove, c_('Remove'), '#', :class => 'remove-option', :field_id => counter, :option_id => option_counter,  :confirm => _('Are you sure you want to remove this option?') %>
   </td>
 </tr>
  
 <fieldset class="field-box" <%='style="display:none"' if f.object._destroy %> >
   <legend><%= type_to_label(f.object.type) %></legend>
   <div>
-  <%= required f.label :name, _('Name:') %>
+  <%= required f.label :name, c_('Name:') %>
   <%= f.text_field :name, :style => 'width: 14em' %>
  
   <%= f.hidden_field :type %>
@@ -18,9 +18,9 @@
   <%= labelled_check_box _('Triggered after membership'), 'form[on_membership]', '1', @form.on_membership %>
   </p>
 <% end %>
-<%= labelled_form_field _('Description'), f.text_area(:description, :style => 'width: 100%', :class => 'mceEditor') %>
+<%= labelled_form_field c_('Description'), f.text_area(:description, :style => 'width: 100%', :class => 'mceEditor') %>
  
-<h2><%= _('Fields') %></h2>
+<h2><%= c_('Fields') %></h2>
  
 <ul class='field-list'>
   <%= f.fields_for :fields do |builder| %>
@@ -36,7 +36,7 @@
 </div>
  
 <% button_bar do %>
-  <%= submit_button :save, _('Save'), :cancel => {:action => 'index'}%>
+  <%= submit_button :save, c_('Save'), :cancel => {:action => 'index'}%>
 <% end %>
  
 <%= javascript_include_tag '../plugins/custom_forms/field' %>
@@ -16,7 +16,7 @@
     <tr <%='style="display:none"' if f.object.alternatives.empty? %>>
       <th><%= _('Alternative') %></th>
       <th><%= _('Preselected') %></th>
-      <th><%= _('Remove') %></th>
+      <th><%= c_('Remove') %></th>
     </tr>
     </thead>
     <tfoot>
@@ -16,9 +16,9 @@
       <td><%= form.submissions.count > 0 ? link_to(form.submissions.count, {:action => 'submissions', :id => form.id}) : 0 %></td>
       <td><%= access_text(form) %></td>
       <td class="actions">
-        <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => form.id %>
+        <%= button_without_text :edit, c_('Edit'), :action => 'edit', :id => form.id %>
         <%= button_without_text :search, _('Pending'), :action => 'pending', :id => form.id if form.for_admission %>
-        <%= button_without_text :remove, _('Remove'), {:action => 'remove', :id => form.id}, :confirm => _('Are you sure you want to remove this form?') %>
+        <%= button_without_text :remove, c_('Remove'), {:action => 'remove', :id => form.id}, :confirm => _('Are you sure you want to remove this form?') %>
       </td>
     </tr>
   <% end %>
@@ -10,11 +10,11 @@
     <%= link_to '[CSV]', :format => 'csv' %>
   </p>
   <p>
-    <%= labelled_select(_('Sort by')+': ', :sort_by, :first, :last, @sort_by, [['created_at', _('Time')], ['author_name', _('Author')]], :class => 'filter') %>
+    <%= labelled_select(_('Sort by')+': ', :sort_by, :first, :last, @sort_by, [['created_at', _('Time')], ['author_name', c_('Author')]], :class => 'filter') %>
   </p>
   <table class="action-table">
     <tr>
-      <th style='width: 50%'><%= _('Author') %></th>
+      <th style='width: 50%'><%= c_('Author') %></th>
       <th style='width: 50%'><%= _('Time') %></th>
     </tr>
     <% @submissions.each do |submission| %>
@@ -22,9 +22,9 @@
  
     <% button_bar do %>
       <% if @form.expired? %>
-        <%= submit_button :save, _('Save'), :disabled => '', :class => 'disabled', :cancel => {:controller => :profile, :profile => profile.identifier} %>
+        <%= submit_button :save, c_('Save'), :disabled => '', :class => 'disabled', :cancel => {:controller => :profile, :profile => profile.identifier} %>
       <% else %>
-        <%= submit_button :save, _('Save'), :cancel => {:controller => :profile, :profile => profile.identifier} %>
+        <%= submit_button :save, c_('Save'), :cancel => {:controller => :profile, :profile => profile.identifier} %>
       <% end %>
     <% end %>
  
 class DisplayContentBlock < Block
  
   MONTHS = [
-    N_('January'),
-    N_('February'),
-    N_('March'),
-    N_('April'),
-    N_('May'),
-    N_('June'),
-    N_('July'),
-    N_('August'),
-    N_('September'),
-    N_('October'),
-    N_('November'),
-    N_('December')
+    cN_('January'),
+    cN_('February'),
+    cN_('March'),
+    cN_('April'),
+    cN_('May'),
+    cN_('June'),
+    cN_('July'),
+    cN_('August'),
+    cN_('September'),
+    cN_('October'),
+    cN_('November'),
+    cN_('December')
   ]
  
   AVAILABLE_SECTIONS = ['publish_date', 'title', 'abstract', 'body', 'image' ,'tags']
@@ -39,11 +39,11 @@ class DisplayContentBlock &lt; Block
   def section_name(section)
     {
       'publish_date' => _('Publish date'),
-      'title' => _('Title'),
+      'title' => c_('Title'),
       'abstract' => _('Abstract'),
-      'body' => _('Body'),
-      'image' => _('Image'),
-      'tags' => _('Tags')
+      'body' => c_('Body'),
+      'image' => c_('Image'),
+      'tags' => c_('Tags')
     }[section] || section
   end
  
 <% extend ApplicationHelper %>
  
-<h2><%= _('Statistics') %></h2>
+<h2><%= c_('Statistics') %></h2>
 <%= labelled_form_field(_('Google Analytics Profile ID'), text_field(:profile_data, :google_analytics_profile_id, :value => profile_id)) %>
 <%= link_to(_('See how to configure statistics for your profile'), '/doc/plugins/google_analytics', :target => '_blank') %>
@@ -4,7 +4,7 @@
  
 <table>
   <tr>
-    <th><%= _('Configuration') %></th>
+    <th><%= c_('Configuration') %></th>
     <th><%= _('Value') %></th>
   </tr>
   <tr>
@@ -46,7 +46,7 @@
     <th colspan='2'> <%= _('Attributes') %> </th>
   </tr>
   <tr>
-    <td><%= _('Login') %></td>
+    <td><%= c_('Login') %></td>
     <td><%= text_field :environment, :ldap_plugin_attr_login %></td>
   </tr>
   <tr>
@@ -61,7 +61,7 @@
  
 <div>
   <% button_bar do %>
-    <%= submit_button('save', _('Save changes')) %>
+    <%= submit_button('save', c_('Save changes')) %>
     <%= button :back, _('Back to plugins administration panel'), :controller => 'plugins' %>
   <% end %>
 </div>
 class FriendsBlock < PeopleBlockBase
  
   def self.description
-    _('Friends')
+    c_('Friends')
   end
  
   def help
@@ -4,7 +4,7 @@ class MembersBlock &lt; PeopleBlockBase
   attr_accessible :show_join_leave_button, :visible_role
  
   def self.description
-    _('Members')
+    c_('Members')
   end
  
   def help
 class PeopleBlock < PeopleBlockBase
  
   def self.description
-    _('People')
+    c_('People')
   end
  
   def help
@@ -10,7 +10,7 @@ class PeopleBlockBase &lt; Block
   end
  
   def help
-    _('Clicking on the people or groups will take you to their home page.')
+    c_('Clicking on the people or groups will take you to their home page.')
   end
  
   def default_title
@@ -58,7 +58,7 @@ class PeopleBlockBase &lt; Block
                send(:profile_image_link, item, :minor )
              }.join("\n")
       if list.empty?
-        list = content_tag 'div', _('None'), :class => 'common-profile-list-block-none'
+        list = content_tag 'div', c_('None'), :class => 'common-profile-list-block-none'
       else
         if !name.blank? && !expanded_address.blank?
           list << content_tag(
-<%= link_to _('View all'), {:profile => profile.identifier, :controller => 'people_block_plugin_profile', :action => 'members', :role_key => role_key}, :class => 'view-all' %>
+<%= link_to c_('View all'), {:profile => profile.identifier, :controller => 'people_block_plugin_profile', :action => 'members', :role_key => role_key}, :class => 'view-all' %>
  
 <% if show_join_leave_button %>
   <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
-<%= link_to _('View all'), {:controller => 'search', :action => 'people'}, :class => 'view-all' %>
+<%= link_to c_('View all'), {:controller => 'search', :action => 'people'}, :class => 'view-all' %>
-<%= labelled_form_field _('Name:'), text_field(:block, :name) %>
+<%= labelled_form_field c_('Name:'), text_field(:block, :name) %>
  
-<%= labelled_form_field _('Address:'), text_field(:block, :address) %>
+<%= labelled_form_field c_('Address:'), text_field(:block, :address) %>
  
 <% if @block.kind_of?(MembersBlock) %>
   <%= labelled_form_field _('Filter by role:'), '' %>
@@ -7,7 +7,7 @@
   <%= labelled_form_field _('Piwik site id'), f.text_field(:piwik_site_id) %>
  
   <% button_bar do %>
-    <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
+    <%= submit_button(:save, c_('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
   <% end %>
  
 <% end %>
@@ -10,7 +10,7 @@ class RecentContentBlock &lt; Block
   VALID_CONTENT = ['RawHTMLArticle', 'TextArticle', 'TextileArticle', 'TinyMceArticle']
  
   def self.description
-    _('Recent content')
+    c_('Recent content')
   end
  
   def help
@@ -2,7 +2,7 @@
   <div id="recent-content-block">
     <% children = block.articles_of_folder(root, block.total_items)%>
     <div class="recent-content">
-      <%= block_title(block.title.blank? ? _("Recent content") : block.title ) %>
+      <%= block_title(block.title.blank? ? c_("Recent content") : block.title ) %>
       <% if block.show_blog_picture and !root.image.nil? %>
         <div class="recent-content-cover">
           <%= image_tag(root.image.public_filename(:big)) %>
 class SendEmailPlugin::Mail
   include ActiveModel::Validations
  
-  N_('Subject'); N_('Message'); N_('To'); N_('From')
+  cN_('Subject'); cN_('Message'); N_('To'); cN_('From')
  
   attr_accessor :environment, :from, :to, :subject, :message, :params
  
 <%= error_messages_for 'mail', :header_message => _('The message could not be sent') %>
  
-<%= button :back, _('Back'), :back %>
+<%= button :back, c_('Back'), :back %>
 <h2><%= _('Message sent') %></h2>
  
 <table class='sendemail-plugin-message-sent'>
-  <tr><td class='label'><strong><%= _('Subject') %>:</strong></td><td class='value'><em><%=h @mail.subject %></em></td></tr>
-  <tr><td class='label'><strong><%= _('Message') %>:</strong></td><td class='value'><pre><%=h render :file => 'send_email_plugin/sender/message' %></pre></td></tr>
+  <tr><td class='label'><strong><%= c_('Subject') %>:</strong></td><td class='value'><em><%=h @mail.subject %></em></td></tr>
+  <tr><td class='label'><strong><%= c_('Message') %>:</strong></td><td class='value'><pre><%=h render :file => 'send_email_plugin/sender/message' %></pre></td></tr>
 </table>
  
-<p><%= button :back, _('Back'), :back %></p>
+<p><%= button :back, c_('Back'), :back %></p>
@@ -4,6 +4,6 @@
   <%= labelled_form_field(_("E-Mail addresses you want to allow to send"), f.text_area(:send_email_plugin_allow_to, :rows => 8)) %>
   <small><%= _('(list of email addresses separated by comma)') %></small>
   <% button_bar do %>
-    <%= submit_button 'save', _('Save'), :cancel => {:controller => 'plugins'} %>
+    <%= submit_button 'save', c_('Save'), :cancel => {:controller => 'plugins'} %>
   <% end %>
 <% end %>
@@ -52,7 +52,7 @@ module ShoppingCartPlugin::CartHelper
     content_tag('tr',
       content_tag('th', _('Item name')) +
       content_tag('th', by_mail ? '&nbsp;#&nbsp;' : '#') +
-      content_tag('th', _('Price'))
+      content_tag('th', c_('Price'))
     ) +
     items.map do |id, quantity|
       product = Product.find(id)
@@ -3,19 +3,19 @@
               :html => {:onsubmit => "return Cart.send_request(this)", :id => 'cart-request-form'}) do |f| %>
     <div id="cart-form-main">
       <%= labelled_form_field('* ' + _("Name"), f.text_field(:name, :class => 'required') ) %>
-      <%= labelled_form_field('* ' +  _("Email"), f.text_field(:email, :class => 'required email') ) %>
-      <%= labelled_form_field('* ' +  _("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %>
+      <%= labelled_form_field('* ' +  c_("Email"), f.text_field(:email, :class => 'required email') ) %>
+      <%= labelled_form_field('* ' +  c_("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %>
       <%= labelled_form_field(_('Delivery option'), select_tag(:delivery_option, options_for_select(select_delivery_options(@settings.delivery_options, environment)), 'data-profile-identifier' => @profile.identifier)) unless !@settings.delivery || (@settings.free_delivery_price && get_total(@cart[:items]) >= @settings.free_delivery_price) %>
       <%= labelled_form_field(_('Payment'), select_tag('customer[payment]', options_for_select([[_("Money"), :money],[_('shopping_cart|Check'), :check]]))) %>
       <%= labelled_form_field(s_('shopping_cart|Change'), text_field_tag('customer[change]')) %>
     </div>
     <% if @settings.delivery %>
       <fieldset><legend><%=_('Delivery Address')%></legend>
-        <%= labelled_form_field(_('Address (street and number)'), f.text_field(:address)) %>
-        <%= labelled_form_field(_('Address reference'), f.text_field(:address_reference)) %>
-        <%= labelled_form_field(_('District'), f.text_field(:district)) %>
-        <%= labelled_form_field( _("City"), f.text_field(:city)) %>
-        <%= labelled_form_field(_('ZIP code'), f.text_field(:zip_code)) %>
+        <%= labelled_form_field(c_('Address (street and number)'), f.text_field(:address)) %>
+        <%= labelled_form_field(c_('Address reference'), f.text_field(:address_reference)) %>
+        <%= labelled_form_field(c_('District'), f.text_field(:district)) %>
+        <%= labelled_form_field( c_("City"), f.text_field(:city)) %>
+        <%= labelled_form_field(c_('ZIP code'), f.text_field(:zip_code)) %>
       </fieldset>
     <% end %>
     <div id="cart-form-actions">
@@ -14,15 +14,15 @@
     </p>
  
     <ul>
-      <li><b><%= _('Full name') %>: </b><%= @customer[:name] %></li>
-      <li><b><%= _('Email') %>: </b><%= @customer[:email] %></li>
+      <li><b><%= c_('Full name') %>: </b><%= @customer[:name] %></li>
+      <li><b><%= c_('Email') %>: </b><%= @customer[:email] %></li>
       <li><b><%= _('Phone number') %>: </b><%= @customer[:contact_phone] %></li>
       <li><b><%= _('Payment') %>: </b><%= @customer[:payment] == 'money' ? _('Money') : _('shopping_cart|Check') %></li>
       <% if @customer[:payment] == 'money' %>
         <li><b><%= _('shopping_cart|Change') %>: </b><%= @customer[:change] %></li>
       <% end %>
       <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
-        <li><b><%= _('Address') %>:</b>
+        <li><b><%= c_('Address') %>:</b>
       <% end %>
       <% if !@customer[:address].blank? %>
         <%= @customer[:address] %><br \>
@@ -12,15 +12,15 @@
     </p>
  
     <ul>
-      <li><b><%= _('Full name') %>: </b><%= @customer[:name] %></li>
-      <li><b><%= _('Email') %>: </b><%= @customer[:email] %></li>
+      <li><b><%= c_('Full name') %>: </b><%= @customer[:name] %></li>
+      <li><b><%= c_('Email') %>: </b><%= @customer[:email] %></li>
       <li><b><%= _('Phone number') %>: </b><%= @customer[:contact_phone] %></li>
       <li><b><%= _('Payment') %>: </b><%= @customer[:payment] == 'money' ? _('Money') : _('shopping_cart|Check') %></li>
       <% if @customer[:payment] == 'money' %>
         <li><b><%= _('shopping_cart|Change') %>: </b><%= @customer[:change] %></li>
       <% end %>
       <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
-        <li><b><%= _('Address') %>:</b>
+        <li><b><%= c_('Address') %>:</b>
       <% end %>
       <% if !@customer[:address].blank? %>
         <%= @customer[:address] %><br \>
@@ -26,13 +26,13 @@
             %>
           <% end %>
         </td>
-        <td><button class="view-order-details" data-order="<%=order.id%>"><%=_('View details')%></button></td>
+        <td><button class="view-order-details" data-order="<%=order.id%>"><%=c_('View details')%></button></td>
       </tr>
       <tr id="order-details-<%=order.id%>" style="display:none">
         <td class="order-info" colspan="5">
           <div style="display:none">
             <ul class="customer-details">
-              <% [['name', _('Name')], ['email', _('E-mail')], ['contact_phone', _('Contact phone')], ['address', _('Address')], ['district', _('District')], ['city', _('City')], ['zip_code', _('Zip code')], ['delivery_option', _('Delivery option')], ['payment', _('Payment')], ['change', _('shopping_cart|Change')]].each do |field| %>
+              <% [['name', _('Name')], ['email', _('E-mail')], ['contact_phone', c_('Contact phone')], ['address', c_('Address')], ['district', c_('District')], ['city', c_('City')], ['zip_code', c_('Zip code')], ['delivery_option', _('Delivery option')], ['payment', _('Payment')], ['change', _('shopping_cart|Change')]].each do |field| %>
                 <% attribute = field.first %>
                 <% name = field.last %>
                 <%= content_tag('li', content_tag('strong', name+': ') + order.send('customer_'+attribute)) if !order.send('customer_'+attribute).blank? %>
@@ -3,7 +3,7 @@
 <% else %>
   <table>
     <tr>
-      <th><%= _('Product') %></th>
+      <th><%= c_('Product') %></th>
       <th><%= _('Quantity') %></th>
     </tr>
     <% @products.each do |id, item|%>
@@ -8,7 +8,7 @@
     <table>
       <tr>
         <th><%= _('Option') %></th>
-        <th><%= _('Price') %></th>
+        <th><%= c_('Price') %></th>
         <th>&nbsp;</th>
       </tr>
       <% @settings.delivery_options.each do |option, price| %>
@@ -39,8 +39,8 @@
   <br style='clear: both'/>
   <br style='clear: both'/>
   <div>
-    <%= submit_button(:save, _('Save')) %>
-    <%= button :back, _('Back to control panel'), :controller => 'profile_editor' %>
+    <%= submit_button(:save, c_('Save')) %>
+    <%= button :back, c_('Back to control panel'), :controller => 'profile_editor' %>
   </div>
 <% end%>
  
@@ -4,15 +4,15 @@
 <% extend ShoppingCartPlugin::CartHelper %>
  
 <% status = ShoppingCartPlugin::PurchaseOrder::Status.name; pos=-1 %>
-<% status_collection = [[nil, _('All')]] %>
+<% status_collection = [[nil, c_('All')]] %>
 <% status_collection += status.map{|s| [pos+=1, s] } %>
  
 <% form_tag({}, {:id => 'cart-order-filter'}) do %>
-  <%= labelled_text_field(_('From')+' ', :from, @from.strftime("%Y-%m-%d"), :id => 'from', :size => 9) %>
+  <%= labelled_text_field(c_('From')+' ', :from, @from.strftime("%Y-%m-%d"), :id => 'from', :size => 9) %>
   <%= labelled_text_field(_('to')+' ', :to, @to.strftime("%Y-%m-%d"), :id => 'to', :size => 9) %>
   <span style="white-space:nowrap"><%= labelled_select(_('Status')+' ', :filter_status, :first, :last, @status,  status_collection)%></span>
   &nbsp;
-  <%= submit_button('save',  _('Filter')) %>
+  <%= submit_button('save',  c_('Filter')) %>
 <% end %>
  
 <% tabs = [] %>
@@ -4,13 +4,13 @@
               :html => {:onsubmit => "return Cart.send_request(this)", :id => 'cart-request-form' }) do |f| %>
     <div id="cart-form-main">
       <%= labelled_form_field('* ' + _("Name"), f.text_field(:name, :class => 'required') ) %>
-      <%= labelled_form_field('* ' +  _("Email"), f.text_field(:email, :class => 'required email') ) %>
-      <%= labelled_form_field('* ' +  _("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %>
+      <%= labelled_form_field('* ' +  c_("Email"), f.text_field(:email, :class => 'required email') ) %>
+      <%= labelled_form_field('* ' +  c_("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %>
     </div>
     <fieldset><legend><%=_('Delivery Address')%></legend>
-      <%= labelled_form_field(_('Address (street and number)'), f.text_field(:address)) %>
-      <%= labelled_form_field( _("City"), f.text_field(:city)) %>
-      <%= labelled_form_field(_('ZIP code'), f.text_field(:zip_code)) %>
+      <%= labelled_form_field(c_('Address (street and number)'), f.text_field(:address)) %>
+      <%= labelled_form_field( c_("City"), f.text_field(:city)) %>
+      <%= labelled_form_field(c_('ZIP code'), f.text_field(:zip_code)) %>
     </fieldset>
     <div id="cart-form-actions">
       <%= submit_button(:send, _('Send buy request')) %>
@@ -7,11 +7,11 @@ module ActsAsFaceted
     # Example:
     #
     #acts_as_faceted :fields => {
-    #  :f_type => {:label => _('Type'), :proc => proc{|klass| f_type_proc(klass)}},
+    #  :f_type => {:label => c_('Type'), :proc => proc{|klass| f_type_proc(klass)}},
     #  :f_published_at => {:type => :date, :label => _('Published date'), :queries => {'[* TO NOW-1YEARS/DAY]' => _("Older than one year"),
     #    '[NOW-1YEARS TO NOW/DAY]' => _("Last year"), '[NOW-1MONTHS TO NOW/DAY]' => _("Last month"), '[NOW-7DAYS TO NOW/DAY]' => _("Last week"), '[NOW-1DAYS TO NOW/DAY]' => _("Last day")}},
-    #  :f_profile_type => {:label => _('Author'), :proc => proc{|klass| f_profile_type_proc(klass)}},
-    #  :f_category => {:label => _('Categories')}},
+    #  :f_profile_type => {:label => c_('Author'), :proc => proc{|klass| f_profile_type_proc(klass)}},
+    #  :f_category => {:label => c_('Categories')}},
     #  :order => [:f_type, :f_published_at, :f_profile_type, :f_category]
     #
     #acts_as_searchable :additional_fields => [ {:name => {:type => :string, :as => :name_sort, :boost => 5.0}} ] + facets_fields_for_solr,
@@ -5,16 +5,16 @@ class Article
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
   def self.type_name
-    _('Content')
+    c_('Content')
   end
  
   acts_as_faceted :fields => {
-      :solr_plugin_f_type => {:label => _('Type'), :proc => proc{|klass| solr_plugin_f_type_proc(klass)}},
+      :solr_plugin_f_type => {:label => c_('Type'), :proc => proc{|klass| solr_plugin_f_type_proc(klass)}},
       :solr_plugin_f_published_at => {:type => :date, :label => _('Published date'), :queries => {'[* TO NOW-1YEARS/DAY]' => _("Older than one year"),
         '[NOW-1YEARS TO NOW/DAY]' => _("In the last year"), '[NOW-1MONTHS TO NOW/DAY]' => _("In the last month"), '[NOW-7DAYS TO NOW/DAY]' => _("In the last week"), '[NOW-1DAYS TO NOW/DAY]' => _("In the last day")},
         :queries_order => ['[NOW-1DAYS TO NOW/DAY]', '[NOW-7DAYS TO NOW/DAY]', '[NOW-1MONTHS TO NOW/DAY]', '[NOW-1YEARS TO NOW/DAY]', '[* TO NOW-1YEARS/DAY]']},
-      :solr_plugin_f_profile_type => {:label => _('Profile'), :proc => proc{|klass| solr_plugin_f_profile_type_proc(klass)}},
-      :solr_plugin_f_category => {:label => _('Categories')},
+      :solr_plugin_f_profile_type => {:label => c_('Profile'), :proc => proc{|klass| solr_plugin_f_profile_type_proc(klass)}},
+      :solr_plugin_f_category => {:label => c_('Categories')},
     }, :category_query => proc { |c| "solr_plugin_category_filter:\"#{c.id}\"" },
     :order => [:solr_plugin_f_type, :solr_plugin_f_published_at, :solr_plugin_f_profile_type, :solr_plugin_f_category]
  
@@ -5,8 +5,8 @@ class Product
  
   acts_as_faceted :fields => {
       :solr_plugin_f_category => {:label => _('Related products')},
-      :solr_plugin_f_region => {:label => _('City'), :proc => proc { |id| solr_plugin_f_region_proc(id) }},
-      :solr_plugin_f_qualifier => {:label => _('Qualifiers'), :proc => proc { |id| solr_plugin_f_qualifier_proc(id) }},
+      :solr_plugin_f_region => {:label => c_('City'), :proc => proc { |id| solr_plugin_f_region_proc(id) }},
+      :solr_plugin_f_qualifier => {:label => c_('Qualifiers'), :proc => proc { |id| solr_plugin_f_qualifier_proc(id) }},
     }, :category_query => proc { |c| "solr_plugin_category_filter:#{c.id}" },
     :order => [:solr_plugin_f_category, :solr_plugin_f_region, :solr_plugin_f_qualifier]
  
@@ -5,7 +5,7 @@ class Profile
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
   def self.type_name
-    _('Profile')
+    c_('Profile')
   end
  
   after_save_reindex [:articles], :with => :delayed_job
@@ -13,8 +13,8 @@ class Profile
   acts_as_faceted :fields => {
       :solr_plugin_f_enabled => {:label => _('Situation'), :type_if => proc { |klass| klass.kind_of?(Enterprise) },
         :proc => proc { |id| solr_plugin_f_enabled_proc(id) }},
-      :solr_plugin_f_region => {:label => _('City'), :proc => proc { |id| solr_plugin_f_region_proc(id) }},
-      :solr_plugin_f_profile_type => {:label => _('Type'), :proc => proc{|klass| solr_plugin_f_profile_type_proc(klass)}},
+      :solr_plugin_f_region => {:label => c_('City'), :proc => proc { |id| solr_plugin_f_region_proc(id) }},
+      :solr_plugin_f_profile_type => {:label => c_('Type'), :proc => proc{|klass| solr_plugin_f_profile_type_proc(klass)}},
       :solr_plugin_f_categories => {:multi => true, :proc => proc {|facet, id| solr_plugin_f_categories_proc(facet, id)},
         :label => proc { |env| solr_plugin_f_categories_label_proc(env) }, :label_abbrev => proc{ |env| solr_plugin_f_categories_label_abbrev_proc(env) }},
     }, :category_query => proc { |c| "solr_plugin_category_filter:#{c.id}" },
@@ -10,7 +10,7 @@ module SolrPlugin::SearchHelper
  
   SortOptions = {
     :products => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
-      :more_recent, {:label => _('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
+      :more_recent, {:label => c_('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
       :name, {:label => _('Name'), :solr_opts => {:sort => 'solr_plugin_name_sortable asc'}},
       :closest, {:label => _('Closest to me'), :if => proc{ logged_in? && (profile=current_user.person).lat && profile.lng },
         :solr_opts => {:sort => "geodist() asc",
@@ -21,7 +21,7 @@ module SolrPlugin::SearchHelper
     ],
     :articles => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
       :name, {:label => _('Name'), :solr_opts => {:sort => 'solr_plugin_name_sortable asc'}},
-      :more_recent, {:label => _('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
+      :more_recent, {:label => c_('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
     ],
     :enterprises => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
       :name, {:label => _('Name'), :solr_opts => {:sort => 'solr_plugin_name_sortable asc'}},
@@ -22,7 +22,7 @@
         </div> <br />
  
         <% if facet_count > less_options_limit %>
-          <%= link_to_function _("Options"),
+          <%= link_to_function c_("Options"),
             "facet_options_toggle('#{facet[:id].to_s}', '#{url_for(params.merge(:action => 'facets_browse', :facet_id => facet[:id], :asset_key => @asset, :escape => false))}'); " +
             "jQuery(this).toggleClass('facet-less-options')", :class => "facet-options-toggle" %>
           <br />
-<%= render :partial => 'search_form', :locals => { :hint => _("Type words about the %s you're looking for") % @asset.to_s.singularize } %>
+<%= render :partial => 'search_form', :locals => { :hint => c_("Type words about the %s you're looking for") % @asset.to_s.singularize } %>
 <%= render :partial => 'results_header' %>
  
 <%= display_results(@searches, @asset) %>
@@ -31,7 +31,7 @@
     <% end %>
  
     <% button_bar do %>
-      <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
+      <%= submit_button(:save, c_('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
     <% end %>
   </div>
  
@@ -30,5 +30,5 @@
 <br style='clear: both'/>
  
 <% button_bar do %>
-  <%= button(:back, _('Back'), :action => 'index') %>
+  <%= button(:back, c_('Back'), :action => 'index') %>
 <% end %>
@@ -16,7 +16,7 @@ class StatisticsBlock &lt; Block
   ENTERPRISE_COUNTERS = [:user_counter, :tag_counter, :comment_counter, :hit_counter]
  
   def self.description
-    _('Statistics')
+    c_('Statistics')
   end
  
   def default_title
@@ -16,10 +16,10 @@
       <li class="categories"><span class="amount"><%= block.categories%> </span><span class="label"><%= _('categories')%></span></li>
     <% end %>
     <% if block.is_visible?('tag_counter') %>
-      <li class="tags"><span class="amount"><%= block.tags%> </span><span class="label"><%= _('tags')%></span></li>
+      <li class="tags"><span class="amount"><%= block.tags%> </span><span class="label"><%= c_('tags')%></span></li>
     <% end %>
     <% if block.is_visible?('comment_counter') %>
-      <li class="comments"><span class="amount"><%= block.comments%> </span><span class="label"><%= _('comments')%></span></li>
+      <li class="comments"><span class="amount"><%= block.comments%> </span><span class="label"><%= c_('comments')%></span></li>
     <% end %>
     <% if block.is_visible?('hit_counter') %>
       <li class="hits"><span class="amount"><%= block.hits%> </span><span class="label"><%= _('hits')%></span></li>
@@ -34,7 +34,7 @@ class StoaPlugin &lt; Noosfero::Plugin
       lambda {
         content_tag('div', labelled_form_field(_('USP number'), text_field_tag('profile_data[usp_id]', usp_id, :id => 'usp_id_field', :disabled => usp_id.present?)) +
         content_tag(:small, _('The usp id grants you special powers in the network. Don\'t forget to fill it if you have one.')) +
-        content_tag('div', labelled_check_box(_('Public'), '', '', false, :disabled => true, :title => _('This field must be private'), :class => 'disabled'), :class => 'field-privacy-selector'), :class => 'field-with-privacy-selector') +
+        content_tag('div', labelled_check_box(c_('Public'), '', '', false, :disabled => true, :title => _('This field must be private'), :class => 'disabled'), :class => 'field-privacy-selector'), :class => 'field-with-privacy-selector') +
         content_tag('div', required(labelled_form_field(_('Birth date (yyyy-mm-dd)'), text_field_tag('birth_date', ''))), :id => 'signup-birth-date', :style => 'display: none') +
         content_tag('div', required(labelled_form_field(_('CPF'), text_field_tag('cpf', ''))), :id => 'signup-cpf', :style => 'display:none') +
         javascript_include_tag('../plugins/stoa/javascripts/jquery.observe_field', '../plugins/stoa/javascripts/signup_complement')
@@ -45,7 +45,7 @@ class StoaPlugin &lt; Noosfero::Plugin
   def login_extra_contents
     proc {
       content_tag('div', labelled_form_field(_('USP number / Username'), text_field_tag('usp_id_login', '', :id => 'stoa_field_login')) +
-      labelled_form_field(_('Password'), password_field_tag('password', '', :id => 'stoa_field_password')), :id => 'stoa-login-fields')
+      labelled_form_field(c_('Password'), password_field_tag('password', '', :id => 'stoa_field_password')), :id => 'stoa-login-fields')
     }
   end
  
@@ -107,7 +107,7 @@ class StoaPlugin &lt; Noosfero::Plugin
   end
  
   def control_panel_buttons
-    { :title => _('Invite friends'),
+    { :title => c_('Invite friends'),
       :icon => 'invite-friends',
       :url => {:controller => 'invite',
                :action => 'select_address_book'} } if context.send(:user) && context.send(:user).usp_id.present?
@@ -45,7 +45,7 @@ class RelatedOrganizationsBlock &lt; ProfileListBlock
     params = {:profile => profile.identifier, :controller => 'sub_organizations_plugin_profile', :action => display_type[:action]}
     params[:type] = type if type == 'enterprise' || type == 'community'
     proc do
-      link_to _('View all'), params.merge(params)
+      link_to c_('View all'), params.merge(params)
     end
   end
  
@@ -10,12 +10,12 @@ class SubOrganizationsPlugin::Relation &lt; Noosfero::Plugin::ActiveRecord
   attr_accessible :parent, :child
  
   def no_self_reference
-    errors.add(:child, _('self-reference is not allowed.')) if parent == child
+    errors.add(:child, c_('self-reference is not allowed.')) if parent == child
   end
  
   def no_cyclical_reference
     if Organization.children(child).include?(parent)
-      errors.add(:child, _('cyclical reference is not allowed.'))
+      errors.add(:child, c_('cyclical reference is not allowed.'))
     end
   end
  
@@ -6,10 +6,10 @@ module SubOrganizationsPlugin::SearchHelper
  
   def display_selectors(display, float = 'right')
     display = 'compact' if display.blank?
-    compact_link = display == 'compact' ? _('Compact') : link_to(_('Compact'), params.merge(:display => 'compact'))
-    full_link = display == 'full' ? _('Full') : link_to(_('Full'), params.merge(:display => 'full'))
+    compact_link = display == 'compact' ? c_('Compact') : link_to(c_('Compact'), params.merge(:display => 'compact'))
+    full_link = display == 'full' ? c_('Full') : link_to(c_('Full'), params.merge(:display => 'full'))
     content_tag('div',
-      content_tag('strong', _('Display')) + ': ' + [compact_link,full_link].compact.join(' | ').html_safe,
+      content_tag('strong', c_('Display')) + ': ' + [compact_link,full_link].compact.join(' | ').html_safe,
       :class => 'search-customize-options'
     )
   end
 <div id='edit-related-organizations-block'>
   <label for="block_organization_type"><%= _('Type of organizations to be displayed') %></label><br/>
-  <%= select_tag('block[organization_type]', options_for_select([[_('Both'), 'both'], [_('Community'), 'community'], [_('Enterprise'), 'enterprise']], @block.organization_type)) %>
-  <%= labelled_form_field _('Limit of items'), text_field(:block, :limit, :size => 3) %>
+  <%= select_tag('block[organization_type]', options_for_select([[_('Both'), 'both'], [c_('Community'), 'community'], [c_('Enterprise'), 'enterprise']], @block.organization_type)) %>
+  <%= labelled_form_field c_('Limit of items'), text_field(:block, :limit, :size => 3) %>
   <%= check_box(:block, :prioritize_profiles_with_image) %>
-  <label for="block_prioritize_profiles_with_image"><%= _('Prioritize profiles with image') %></label>
+  <label for="block_prioritize_profiles_with_image"><%= c_('Prioritize profiles with image') %></label>
 </div>
@@ -22,8 +22,8 @@
       :pre_populate => @tokenized_children}) %>
  
   <% button_bar do %>
-    <%= submit_button('save', _('Save'))%>
-    <%= button('cancel', _('Cancel'), {:controller => 'profile_editor'})%>
+    <%= submit_button('save', c_('Save'))%>
+    <%= button('cancel', c_('Cancel'), {:controller => 'profile_editor'})%>
   <% end %>
 <% end %>
  
@@ -20,7 +20,7 @@
             <%= excerpt(body_stripped, body_stripped.first(3), 200) if body_stripped %>
           </div>
           <div class="related-organizations-region">
-            <span class="related-organizations-region-label"><%= _("City") %></span>
+            <span class="related-organizations-region-label"><%= c_("City") %></span>
             <% if organization.region %>
               <span class="related-organizations-region-name"><%= city_with_state(organization.region) %></span>
             <% elsif organization.city and organization.state %>
@@ -52,11 +52,11 @@
   </div>
  
   <% button_bar(:class => "related-organizations-button-bar") do %>
-    <%= button :back, _('Go back'), { :controller => 'profile' } %>
+    <%= button :back, c_('Go back'), { :controller => 'profile' } %>
     <%= button :add, _("Add a new #{organization_type}"), :controller => 'sub_organizations_plugin_myprofile', :action => 'index' if logged_in? && user.has_permission?(:edit_profile, profile) && !environment.enabled?("disable_asset_#{organization_type.pluralize}") %>
  
     <% if !@full %>
-      <%= button :more, _('View all'), { :controller => 'sub_organizations_plugin_profile', :action => params[:action], :type => organization_type } %>
+      <%= button :more, c_('View all'), { :controller => 'sub_organizations_plugin_profile', :action => params[:action], :type => organization_type } %>
     <% end %>
  <% end %>
  
@@ -10,11 +10,11 @@
     <li><%= _("There are no sub-#{organization_type.pluralize} yet. " )  %></li>
   <% end %>
   <% button_bar(:class => "related-organizations-button-bar") do %>
-    <%= button :back, _('Go back'), { :controller => 'profile' } %>
+    <%= button :back, c_('Go back'), { :controller => 'profile' } %>
     <%= button :add, _("Add a new #{organization_type}"), :controller => 'sub_organizations_plugin_myprofile', :action => 'index' if logged_in? && user.has_permission?(:edit_profile, profile) && !environment.enabled?("disable_asset_#{organization_type.pluralize}") %>
  
     <% if !@full %>
-      <%= button :more, _('View all'), { :controller => 'sub_organizations_plugin_profile', :action => params[:action], :type => organization_type } %>
+      <%= button :more, c_('View all'), { :controller => 'sub_organizations_plugin_profile', :action => params[:action], :type => organization_type } %>
     <% end %>
   <% end %>
 </div>
@@ -18,7 +18,7 @@
   <%= content_tag( 'small', _('Empty means unlimited and zero means right away.') ) %>
  
   <% button_bar do %>
-    <%= submit_button('save', _('Save'))%>
-    <%= button('back', _('Back'), {:controller => 'profile_editor'})%>
+    <%= submit_button('save', c_('Save'))%>
+    <%= button('back', c_('Back'), {:controller => 'profile_editor'})%>
   <% end %>
 <% end %>
@@ -14,7 +14,7 @@
   </strong>
  
   <% button_bar do %>
-    <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
+    <%= submit_button(:save, c_('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
   <% end %>
  
 <% end %>
@@ -3,7 +3,7 @@ module WorkAssignmentPlugin::Helper
     return if work_assignment.submissions.empty?
     content_tag('table',
       content_tag('tr',
-        content_tag('th', _('Author'), :style => 'width: 50%') +
+        content_tag('th', c_('Author'), :style => 'width: 50%') +
         content_tag('th', _('Submission date')) +
         content_tag('th', _('Versions'), :style => 'text-align: center') +
         content_tag('th', '')
...	...	@@ -7,7 +7,7 @@
7	7	<%= labelled_form_field _('API key'), f.text_field(:api_key, :size => 40) %>
8	8
9	9	<% button_bar do %>
10		- <%= submit_button(:save, _('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
	10	+ <%= submit_button(:save, c_('Save'), :cancel => {:controller => 'plugins', :action => 'index'}) %>
11	11	<% end %>
12	12
13	13	<% end %>
...	...
...	...	@@ -53,7 +53,7 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock < Block
53	53
54	54	protected
55	55
56		- CMS_ACTIONS = {:edit => _('Edit'), :upload_files => _('Upload Files'), :new => _('New')}
	56	+ CMS_ACTIONS = {:edit => c_('Edit'), :upload_files => _('Upload Files'), :new => c_('New')}
57	57
58	58	def cms_action(action)
59	59	CMS_ACTIONS[action.to_sym] \|\| action
...	...
...	...	@@ -101,7 +101,7 @@ class BscPlugin < Noosfero::Plugin
101	101	else
102	102	content = lambda { product.enterprise.name }
103	103	end
104		- properties << { :name => _('Supplier'), :content => content }
	104	+ properties << { :name => c_('Supplier'), :content => content }
105	105	end
106	106
107	107	def profile_tabs
...	...
...	...	@@ -4,9 +4,9 @@ module BscPlugin::BscHelper
4	4
5	5	def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
6	6	options[:min_chars] \|\|= 3
7		- options[:hint_text] \|\|= _("Type in a search term")
8		- options[:no_results_text] \|\|= _("No results")
9		- options[:searching_text] \|\|= _("Searching...")
	7	+ options[:hint_text] \|\|= c_("Type in a search term")
	8	+ options[:no_results_text] \|\|= c_("No results")
	9	+ options[:searching_text] \|\|= c_("Searching...")
10	10	options[:search_delay] \|\|= 1000
11	11	options[:prevent_duplicates] \|\|= true
12	12	options[:backspace_delete_item] \|\|= false
...	...
...	...	@@ -43,7 +43,7 @@ class BscPlugin::Contract < Noosfero::Plugin::ActiveRecord
43	43	end
44	44
45	45	def self.names
46		- [_('State'), _('Federal')]
	46	+ [c_('State'), _('Federal')]
47	47	end
48	48	end
49	49
...	...
...	...	@@ -5,7 +5,7 @@
5	5	<%= render :partial => 'shared/fields', :locals => {:f => f, :profile => @bsc} %>
6	6
7	7	<% button_bar do %>
8		- <%= submit_button('save', _('Save')) %>
9		- <%= button('cancel', _('Cancel'), {:controller => 'admin_panel'}) %>
	8	+ <%= submit_button('save', c_('Save')) %>
	9	+ <%= button('cancel', c_('Cancel'), {:controller => 'admin_panel'}) %>
10	10	<% end %>
11	11	<% end %>
...	...
...	...	@@ -6,7 +6,7 @@
6	6	:focus => true }) %>
7	7
8	8	<% button_bar do %>
9		- <%= submit_button('save', _('Save'))%>
10		- <%= button('cancel', _('Cancel'), {:controller => 'admin_panel'})%>
	9	+ <%= submit_button('save', c_('Save'))%>
	10	+ <%= button('cancel', c_('Cancel'), {:controller => 'admin_panel'})%>
11	11	<% end %>
12	12	<% end %>
...	...
...	...	@@ -10,7 +10,7 @@
10	10	<%= labelled_form_field(_('Status'), f.select(:status, BscPlugin::Contract::Status.types.
11	11	map { \|s\| [BscPlugin::Contract::Status.names[s], s] })) %>
12	12	<%= f.text_field(:number_of_producers, :size => 8, :id => 'bsc-plugin-contract-spinner') %>
13		- <%= _('Enterprises')+':' %>
	13	+ <%= c_('Enterprises')+':' %>
14	14
15	15	<% search_action = {:action => 'search_contract_enterprises', :profile => profile.identifier} %>
16	16	<%= token_input_field_tag(:enterprises, 'involved-enterprises', search_action,
...	...	@@ -19,7 +19,7 @@
19	19
20	20	<table id="bsc-plugin-sales-table" class="alternate-colors">
21	21	<tr>
22		- <th class="bsc-plugin-sales-products-column"><%= _('Products') %></th>
	22	+ <th class="bsc-plugin-sales-products-column"><%= c_('Products') %></th>
23	23	<th class="bsc-plugin-sales-quantity-column" ><%= _('Quantity') %></th>
24	24	<th class="bsc-plugin-sales-price-column" ><%= _('Unit price') %></th>
25	25	</tr>
...	...	@@ -34,13 +34,13 @@
34	34
35	35	<%= labelled_form_field( _('Supply period'),
36	36	text_field_tag('contract[supply_start]', (@contract.supply_start ? @contract.supply_start.strftime("%Y-%m-%d") : nil), :id => 'from', :size => 9) +
37		- _(' to ') +
	37	+ c_(' to ') +
38	38	text_field_tag('contract[supply_end]', (@contract.supply_end ? @contract.supply_end.strftime("%Y-%m-%d") : nil), :id => 'to', :size => 9) )
39	39	%>
40	40
41	41	<%= f.text_area(:annotations, :rows => 5, :cols => 68) %>
42	42	<% button_bar do%>
43		- <%= submit_button(:save, _('Save'), :cancel => {:action => 'manage_contracts'})%>
	43	+ <%= submit_button(:save, c_('Save'), :cancel => {:action => 'manage_contracts'})%>
44	44	<% end %>
45	45	<% end %>
46	46
...	...	@@ -55,8 +55,8 @@
55	55	BSCContracts.tokenInputOptions = {
56	56	minChars: 3,
57	57	hintText: <%= _('Type in a search term for product').to_json %>,
58		- noResultsText: <%= _("No results").to_json %>,
59		- searchingText: <%= _("Searching...").to_json %>,
	58	+ noResultsText: <%= c_("No results").to_json %>,
	59	+ searchingText: <%= c_("Searching...").to_json %>,
60	60	searchDelay: 1000,
61	61	preventDuplicates: true,
62	62	backspaceDeleteItem: false,
...	...
...	...	@@ -9,12 +9,12 @@
9	9	<%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
10	10	<%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise } %>
11	11	<p style="border-bottom: 2px solid #babdb6"></p>
12		- <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %>
	12	+ <%= required labelled_form_field(c_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %>
13	13	<p style="border-bottom: 2px solid #babdb6"></p>
14	14	<%= render :partial => 'similar_enterprises', :locals => {:bsc => profile}%>
15	15
16	16	<% button_bar do %>
17		- <%= submit_button('save', _('Save'), :cancel => {:controller => 'profile_editor', :profile => profile.identifier}) %>
	17	+ <%= submit_button('save', c_('Save'), :cancel => {:controller => 'profile_editor', :profile => profile.identifier}) %>
18	18	<% end %>
19	19	<% end %>
20	20
...	...
...	...	@@ -19,8 +19,8 @@
19	19	<%= button('add', _('Add new enterprise'), {:action => 'create_enterprise'}) %>
20	20
21	21	<% button_bar do %>
22		- <%= submit_button('save', _('Save'))%>
23		- <%= button('cancel', _('Cancel'), {:controller => 'profile_editor'})%>
	22	+ <%= submit_button('save', c_('Save'))%>
	23	+ <%= button('cancel', c_('Cancel'), {:controller => 'profile_editor'})%>
24	24	<% end %>
25	25
26	26	<% end %>
...	...