Finish removal of the deprecated terminology thing

Antonio Terceiro
1 parent d7af47e3
Showing 65 changed files with 133 additions and 144 deletions Show diff stats
app/controllers/admin/admin_panel_controller.rb
app/controllers/admin/features_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/assets_helper.rb
app/helpers/profile_editor_helper.rb
app/models/communities_block.rb
app/models/community.rb
app/models/create_enterprise.rb
app/models/disabled_enterprise_message_block.rb
app/models/enterprise.rb
app/models/enterprise_homepage.rb
app/models/enterprises_block.rb
app/models/environment.rb
app/models/environment_statistics_block.rb
app/models/fans_block.rb
app/models/favorite_enterprises_block.rb
app/models/friends_block.rb
app/models/sellers_search_block.rb
app/views/account/accept_terms.html.erb
app/views/account/activate_enterprise.html.erb
@@ -42,7 +42,7 @@ class AdminPanelController &lt; AdminController
         end
         redirect_to :action => 'set_portal_folders'
       else
-        session[:notice] = __('Community not found. You must insert the identifier of a community from this environment')
+        session[:notice] = _('Community not found. You must insert the identifier of a community from this environment')
       end
     end
   end
@@ -34,9 +34,9 @@ class FeaturesController &lt; AdminController
   def manage_enterprise_fields
     environment.custom_enterprise_fields = params[:enterprise_fields]
     if environment.save!
-      session[:notice] = __('Enterprise fields updated successfully.')
+      session[:notice] = _('Enterprise fields updated successfully.')
     else
-      flash[:error] = __('Enterprise fields not updated successfully.')
+      flash[:error] = _('Enterprise fields not updated successfully.')
     end
     redirect_to :action => 'manage_fields'
   end
@@ -167,7 +167,7 @@ class ProfileController &lt; PublicController
       session[:notice] = _("You have unblocked %s successfully. ") % profile.name
       redirect_to :controller => 'profile', :action => 'index'
     else
-      message = __('You are not allowed to unblock enterprises in this environment.')
+      message = _('You are not allowed to unblock enterprises in this environment.')
       render_access_denied(message)
     end
   end
@@ -7,9 +7,9 @@ module AssetsHelper
       [ options.merge(:asset => 'articles'), "icon-menu-articles",   _('Articles') ],
       [ options.merge(:asset => 'people'), "icon-menu-people",     _('People') ],
       [ options.merge(:asset => 'products'), "icon-menu-product",    _('Products') ],
-      [ options.merge(:asset => 'enterprises'), "icon-menu-enterprise", __('Enterprises') ],
-      [ options.merge(:asset => 'communities'), "icon-menu-community",  __('Communities') ],
-      [ options.merge(:asset => 'events'), "icon-event",   __('Events') ],
+      [ options.merge(:asset => 'enterprises'), "icon-menu-enterprise", _('Enterprises') ],
+      [ options.merge(:asset => 'communities'), "icon-menu-community",  _('Communities') ],
+      [ options.merge(:asset => 'events'), "icon-event",   _('Events') ],
     ].select do |target, css_class, name|
       !environment.enabled?('disable_asset_' + target[:asset])
@@ -129,7 +129,7 @@ module ProfileEditorHelper
     else
       domains = environment.domains
     end
-    labelled_form_field(__('Preferred domain name:'), select(object, :preferred_domain_id, domains.map {|item| [item.name, item.id]}, :prompt => '&lt;' + _('Select domain') + '&gt;'))
+    labelled_form_field(_('Preferred domain name:'), select(object, :preferred_domain_id, domains.map {|item| [item.name, item.id]}, :prompt => '&lt;' + _('Select domain') + '&gt;'))
   end
   def control_panel(&block)
 class CommunitiesBlock < ProfileListBlock
   def self.description
-    __('Communities')
+    _('Communities')
   end
   def default_title
-    n__('{#} community', '{#} communities', profile_count)
+    n_('{#} community', '{#} communities', profile_count)
   end
   def help
-    __('This block displays the communities in which the user is a member.')
+    _('This block displays the communities in which the user is a member.')
   end
   def footer
@@ -84,7 +84,7 @@ class Community &lt; Organization
   end
   def control_panel_settings_button
-    {:title => __('Community Info and settings'), :icon => 'edit-profile-group'}
+    {:title => _('Community Info and settings'), :icon => 'edit-profile-group'}
   end
   def activities
@@ -165,18 +165,18 @@ class CreateEnterprise &lt; Task
   end
   def task_finished_message
-    __('Your request for registering the enterprise "%{enterprise}" was approved. You can access %{environment} now and provide start providing all relevant information your new enterprise.') % { :enterprise => self.name, :environment => self.environment }
+    _('Your request for registering the enterprise "%{enterprise}" was approved. You can access %{environment} now and provide start providing all relevant information your new enterprise.') % { :enterprise => self.name, :environment => self.environment }
   end
   def task_cancelled_message
-    __("Your request for registering the enterprise %{enterprise} at %{environment} was NOT approved by the validator organization. The following explanation was given: \n\n%{explanation}") % { :enterprise => self.name, :environment => self.environment, :explanation => self.reject_explanation }
+    _("Your request for registering the enterprise %{enterprise} at %{environment} was NOT approved by the validator organization. The following explanation was given: \n\n%{explanation}") % { :enterprise => self.name, :environment => self.environment, :explanation => self.reject_explanation }
   end
   def target_notification_message
     msg = ""
-    msg << __("Enterprise \"%{enterprise}\" just requested to enter %{environment}. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :enterprise => self.name, :environment => self.environment }
+    msg << _("Enterprise \"%{enterprise}\" just requested to enter %{environment}. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :enterprise => self.name, :environment => self.environment }
     msg << "\n"
-    msg << __("The data provided by the enterprise was the following:\n") << "\n"
+    msg << _("The data provided by the enterprise was the following:\n") << "\n"
     msg << (_("Name: %s") % self.name) << "\n"
@@ -186,12 +186,12 @@ class CreateEnterprise &lt; Task
     msg << (_("Foundation Year: %d") % self.foundation_year) << "\n" unless self.foundation_year.blank?
     msg << (_("Economic activity: %s") % self.economic_activity) << "\n"
-    msg << __("Information about enterprise's management:\n") << self.management_information.to_s << "\n"
+    msg << _("Information about enterprise's management:\n") << self.management_information.to_s << "\n"
     msg << (_("Contact phone: %s") % self.contact_phone) << "\n"
     msg << (_("Contact person: %s") % self.contact_person) << "\n"
-    msg << __('CreateEnterprise|Identifier')
+    msg << _('CreateEnterprise|Identifier')
     msg
   end
 class DisabledEnterpriseMessageBlock < Block
   def self.description
-    __('"Disabled enterprise" message')
+    _('"Disabled enterprise" message')
   end
   def help
-    __('Shows a message for disabled enterprises.')
+    _('Shows a message for disabled enterprises.')
   end
   def default_title
@@ -163,7 +163,7 @@ class Enterprise &lt; Organization
   alias_method_chain :template, :inactive_enterprise
   def control_panel_settings_button
-    {:title => __('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}
+    {:title => _('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}
   end
   settings_items :enable_contact_us, :type => :boolean, :default => true
@@ -173,7 +173,7 @@ class Enterprise &lt; Organization
   end
   def control_panel_settings_button
-    {:title => __('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}
+    {:title => _('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}
   end
   def create_product?
@@ -5,7 +5,7 @@ class EnterpriseHomepage &lt; Article
   end
   def self.short_description
-    __('Enterprise homepage')
+    _('Enterprise homepage')
   end
   def self.description
 class EnterprisesBlock < ProfileListBlock
   def default_title
-    n__('{#} enterprise', '{#} enterprises', profile_count)
+    n_('{#} enterprise', '{#} enterprises', profile_count)
   end
   def help
-    __('This block displays the enterprises where this user works.')
+    _('This block displays the enterprises where this user works.')
   end
   def self.description
-    __('Enterprises')
+    _('Enterprises')
   end
   def footer
@@ -91,12 +91,12 @@ class Environment &lt; ActiveRecord::Base
   def self.available_features
     {
       'disable_asset_articles' => _('Disable search for articles '),
-      'disable_asset_enterprises' => __('Disable search for enterprises'),
+      'disable_asset_enterprises' => _('Disable search for enterprises'),
       'disable_asset_people' => _('Disable search for people'),
-      'disable_asset_communities' => __('Disable search for communities'),
+      'disable_asset_communities' => _('Disable search for communities'),
       'disable_asset_products' => _('Disable search for products'),
       'disable_asset_events' => _('Disable search for events'),
-      'disable_products_for_enterprises' => __('Disable products for enterprises'),
+      'disable_products_for_enterprises' => _('Disable products for enterprises'),
       'disable_categories' => _('Disable categories'),
       'disable_header_and_footer' => _('Disable header/footer editing by users'),
       'disable_gender_icon' => _('Disable gender icon'),
@@ -104,9 +104,9 @@ class Environment &lt; ActiveRecord::Base
       'disable_select_city_for_contact' => _('Disable state/city select for contact form'),
       'disable_contact_person' => _('Disable contact for people'),
       'disable_contact_community' => _('Disable contact for groups/communities'),
-      'enterprise_registration' => __('Enterprise registration'),
+      'enterprise_registration' => _('Enterprise registration'),
-      'enterprise_activation' => __('Enable activation of enterprises'),
+      'enterprise_activation' => _('Enable activation of enterprises'),
       'media_panel' => _('Media panel in WYSIWYG editor'),
       'select_preferred_domain' => _('Select preferred domains per profile'),
       'use_portal_community' => _('Use the portal as news source for front page'),
@@ -119,8 +119,8 @@ class Environment &lt; ActiveRecord::Base
       'organizations_are_moderated_by_default' => _("Organizations have moderated publication by default"),
       'enable_organization_url_change' => _("Allow organizations to change their URL"),
       'admin_must_approve_new_communities' => _("Admin must approve creation of communities"),
-      'enterprises_are_disabled_when_created' => __('Enterprises are disabled when created'),
-      'enterprises_are_validated_when_created' => __('Enterprises are validated when created'),
+      'enterprises_are_disabled_when_created' => _('Enterprises are disabled when created'),
+      'enterprises_are_validated_when_created' => _('Enterprises are validated when created'),
       'show_balloon_with_profile_links_when_clicked' => _('Show a balloon with profile links when a profile image is clicked'),
       'xmpp_chat' => _('XMPP/Jabber based chat'),
       'show_zoom_button_on_article_images' => _('Show a zoom link on all article images'),
@@ -20,9 +20,9 @@ class EnvironmentStatisticsBlock &lt; Block
     info = []
     info << (n_('One user', '%{num} users', users) % { :num => users })
     unless owner.enabled?('disable_asset_enterprises')
-      info << (n__('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises })
+      info << (n_('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises })
     end
-    info << (n__('One community', '%{num} communities', communities) % { :num => communities })
+    info << (n_('One community', '%{num} communities', communities) % { :num => communities })
     block_title(title) + content_tag('ul', info.map {|item| content_tag('li', item) }.join("\n"))
   end
@@ -5,7 +5,7 @@ class FansBlock &lt; ProfileListBlock
   end
   def default_title
-    n__('{#} fan', '{#} fans', profile_count)
+    n_('{#} fan', '{#} fans', profile_count)
   end
   def help
 class FavoriteEnterprisesBlock < ProfileListBlock
   def default_title
-    __('Favorite Enterprises')
+    _('Favorite Enterprises')
   end
   def help
-    __('This block lists your favorite enterprises.')
+    _('This block lists your favorite enterprises.')
   end
   def self.description
-    __('Favorite Enterprises')
+    _('Favorite Enterprises')
   end
   def footer
     owner = self.owner
     return '' unless owner.kind_of?(Person)
     lambda do
-      link_to __('View all'), :profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'
+      link_to _('View all'), :profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'
     end
   end
 class FriendsBlock < ProfileListBlock
   def self.description
-    __('Friends')
+    _('Friends')
   end
   def default_title
-    n__('{#} friend', '{#} friends', profile_count)
+    n_('{#} friend', '{#} friends', profile_count)
   end
   def help
 class SellersSearchBlock < Block
   def self.description
-    __('Search for enterprises and products')
+    _('Search for enterprises and products')
   end
   def self.short_description
-    __('Products/Enterprises search')
+    _('Products/Enterprises search')
   end
   def default_title
@@ -11,7 +11,7 @@
   }
 </script>
 <div class=activation-box>
-  <h2><%= __('Enterprise activation') + ' - ' + (logged_in? ? _('part 2 of 2') : _(' part 2 of 3')) %></h2>
+  <h2><%= _('Enterprise activation') + ' - ' + (logged_in? ? _('part 2 of 2') : _(' part 2 of 3')) %></h2>
   <div id='terms-of-enterprise-use' class='height: 200px; overflow: auto;'><%= @terms_of_enterprise_use %></div>
 <div class='activation-box'>
-<h2><%= __('Enterprise activation - part 3 of 3') %></h2>
+<h2><%= _('Enterprise activation - part 3 of 3') %></h2>
 <%= error_messages_for :user %>
-<p><%= __('Now for you manage your enterprise you have to associate an individual account to the enterprise.') %></p>
+<p><%= _('Now for you manage your enterprise you have to associate an individual account to the enterprise.') %></p>
 <p><%= _('Do you have a personal user account in the system?') %></p>
 <div id="enterprise-activation-create-user-or-login-button">
@@ -14,7 +14,7 @@
 <div id="enterprise-activation-create-user-form" style="display: none">
   <h3><%= _('Personal signup form') %></h3>
   <%= render :partial => 'signup_form', :locals => { :hidden_atention => true } %>
-  <p><%= message = __('<b>Warning</b>: this form is for your personal information, not of your enterprise. So you will have a personal account that can manage your enterprise.') %></p>
+  <p><%= message = _('<b>Warning</b>: this form is for your personal information, not of your enterprise. So you will have a personal account that can manage your enterprise.') %></p>
 </div>
 <div id="enterprise-activation-login-form" style="display: none">
@@ -23,14 +23,14 @@
 </script>
 <div class='activation-box'>
-  <h2><%= __('Enterprise activation') + ' - ' + (logged_in? ? _('part 1 of 2') : _('part 1 of 3')) %></h2>
+  <h2><%= _('Enterprise activation') + ' - ' + (logged_in? ? _('part 1 of 2') : _('part 1 of 3')) %></h2>
   <% form_tag( {:action => 'accept_terms'}, {:method => 'get', :onsubmit => (@question == :foundation_year ? 'return check_valid_year(this)' : 'return check_valid_cnpj(this)')}) do %> 
   <p>  <strong><%= _('Pay atention! You have only one chance!') %></strong> </p>
-  <p><%= __("This is a question to know if you really are part of this enterprise. Pay atention because you have only one chance to answer right and activate your enterprise. If you answer wrong you will not be able to activate the enterprise automaticaly and must get in touch with the admins of %s by email or phone.") % environment.name %> </p>
+  <p><%= _("This is a question to know if you really are part of this enterprise. Pay atention because you have only one chance to answer right and activate your enterprise. If you answer wrong you will not be able to activate the enterprise automaticaly and must get in touch with the admins of %s by email or phone.") % environment.name %> </p>
-  <%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? (__("What year your enterprise was founded? It must have 4 digits, eg 1990. %s") % environment.tip_message_enterprise_activation_question) : __('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer')) %>
+  <%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? (_("What year your enterprise was founded? It must have 4 digits, eg 1990. %s") % environment.tip_message_enterprise_activation_question) : _('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer')) %>
     <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
-<%= __('This enterprise is already active') %>
+<%= _('This enterprise is already active') %>
 <div class='blocked-warning' >
-<center><h1><%= __('This enterprise can\'t be activated by the system') %></h1></center>
-<p><%= __('Unfortunately this enterprise can\'t be activated via the system.') %></p>
+<center><h1><%= _('This enterprise can\'t be activated by the system') %></h1></center>
+<p><%= _('Unfortunately this enterprise can\'t be activated via the system.') %></p>
 <p>
 <% if @enterprise.blocked? %>
   <%= _('There was a failed atempt of activation and the automated activation was disabled for your security.') %>
 <% else %>
-  <%= __('We dont have enough information about your enterprise to identify you.') %>
+  <%= _('We dont have enough information about your enterprise to identify you.') %>
 <% end %>
 </p>
 <% if @environment.activation_blocked_text.blank? %>
-  <%= __('Your enterprise has been blocked') %>
+  <%= _('Your enterprise has been blocked') %>
 <% else %>
   <%= @environment.activation_blocked_text %>
 <% end %>
-<h1><%= __("Invalid enterprise code") %></h1>
+<h1><%= _("Invalid enterprise code") %></h1>
 <p>
-<%= __('The code you are using for validate your enterprise is not valid. Please check if you are typing it correctly.') %>
+<%= _('The code you are using for validate your enterprise is not valid. Please check if you are typing it correctly.') %>
 </p>
 <% if @enterprise && logged_in? %>
   <h1><%= _('Welcome to %s') % environment.name %></h1>
-  <%= __('%s was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise') % @enterprise.name %>
+  <%= _('%s was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise') % @enterprise.name %>
   <% button_bar do %>
     <%= button 'forward', _('Go to my control panel'), :action => 'index', :controller => 'profile_editor', :profile => current_user.person.identifier %> 
-    <%= button 'forward', __('Go to my enterprise control panel') % @enterprise.name, :action => 'index', :controller => 'profile_editor', :profile => @enterprise.identifier %>
+    <%= button 'forward', _('Go to my enterprise control panel') % @enterprise.name, :action => 'index', :controller => 'profile_editor', :profile => @enterprise.identifier %>
   <% end %>
 <% end %>
@@ -36,7 +36,7 @@
 <h2><%= _('Enterprise-related settings') %></h2>
 <table>
-  <tr><td><%= link_to __('Message for disabled enterprises'), :action => 'message_for_disabled_enterprise' %></td></tr>
+  <tr><td><%= link_to _('Message for disabled enterprises'), :action => 'message_for_disabled_enterprise' %></td></tr>
   <tr><td><%= link_to _('Validators by region'), :controller => 'region_validators' %></td></tr>
   <tr><td><%= link_to _('Categories'), :controller => 'categories'%></td></tr>
 </table>
@@ -3,7 +3,7 @@
 <%= render :file => 'blocks/my_network/' + owner.class.name.underscore, :locals => { :owner => owner } %>
 <ul>
-  <li><%= link_to(__('Homepage'), owner.url, :class => 'url') %></li>
+  <li><%= link_to(_('Homepage'), owner.url, :class => 'url') %></li>
   <li><%= link_to(_('View profile'), owner.public_profile_url) %></li>
   <% if !user.nil? and owner.organization? and user.has_permission?('edit_profile', profile) %>
     <li><%= link_to _('Control panel'), :controller => 'profile_editor', :profile => profile.identifier %></li>
 <ul>
   <li><%= link_to(n_( 'One article published', '%s articles published', owner.articles.count) %
   content_tag('b', owner.articles.count), owner.public_profile_url.merge(:action => 'sitemap') ) %></li>
-  <li><%= link_to(n__('One friend', '%s friends', owner.friends.count) %
+  <li><%= link_to(n_('One friend', '%s friends', owner.friends.count) %
   content_tag('b', owner.friends.count), owner.public_profile_url.merge(:action => 'friends')) %></li>
-  <li><%= link_to(n__('One community', '%{num} communities', owner.communities.visible.size) %
+  <li><%= link_to(n_('One community', '%{num} communities', owner.communities.visible.size) %
   {:num => content_tag('b', owner.communities.visible.size)}, owner.public_profile_url.merge(:action => 'communities')) %></li>
   <li><%= link_to(n_('One tag', '%s tags', owner.article_tags.size) %
   content_tag('b', owner.article_tags.size), owner.public_profile_url.merge(:action => 'tags')) %></li>
@@ -15,7 +15,7 @@
 </div>
 <ul class="profile-info-data" id="profile-info-data-<%= block.id %>">
-  <li><%= link_to __('Homepage'), block.owner.url, :class => 'url' %></li>
+  <li><%= link_to _('Homepage'), block.owner.url, :class => 'url' %></li>
   <li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
   <% if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %>
     <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
@@ -2,11 +2,11 @@
   <% if logged_in? %>
     <% if profile.members.include?(user) %>
       <li>
-        <%= button(:delete, content_tag('span', __('Leave community')), profile.leave_url,
+        <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
           :class => 'leave-community',
           :title => _("Leave community"),
           :style => 'position: relative;') %>
-        <%= button(:add, content_tag('span', __('Join')), profile.join_url,
+        <%= button(:add, content_tag('span', _('Join')), profile.join_url,
           :class => 'join-community',
           :title => _("Join community"),
           :style => 'position: relative; display: none;') %>
@@ -14,11 +14,11 @@
     <% else %>
       <% unless profile.already_request_membership?(user) %>
         <li>
-        <%= button(:delete, content_tag('span', __('Leave community')), profile.leave_url,
+        <%= button(:delete, content_tag('span', _('Leave community')), profile.leave_url,
           :class => 'leave-community',
           :title => _("Leave community"),
           :style => 'position: relative; display: none;') %>
-        <%= button(:add, content_tag('span', __('Join')), profile.join_url,
+        <%= button(:add, content_tag('span', _('Join')), profile.join_url,
           :class => 'join-community',
           :title => _("Join community"),
           :style => 'position: relative;') %>
 <ul>
   <%if logged_in? %>
     <%if !user.favorite_enterprises.include?(profile) %>
-      <li><%= link_to content_tag('span', _('Add as favorite')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add', :title => __('Add enterprise as favorite') %></li>
+      <li><%= link_to content_tag('span', _('Add as favorite')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add', :title => _('Add enterprise as favorite') %></li>
     <% end %>
   <% end %>
   <% if profile.enable_contact? %>
@@ -3,7 +3,7 @@
     <% if !user.already_request_friendship?(profile) and !user.is_a_friend?(profile) %>
       <li>
-      <%= button(:add, content_tag('span', __('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
+      <%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
       </li>
     <% end %>
 <%= error_messages_for 'create_enterprise' %>
-<h1><%= __('Enterprise registration') %></h1>
+<h1><%= _('Enterprise registration') %></h1>
 <% if @validation == :region && @regions.empty? %>
   <div class='atention'>
-    <%= __('There are no validators to validate the registration of this new enterprise. Contact your administrator for instructions.') %>
+    <%= _('There are no validators to validate the registration of this new enterprise. Contact your administrator for instructions.') %>
   </div>
   <% button_bar do %>
@@ -13,7 +13,7 @@
   <% end %>
 <% else %>
   <div class='atention'>
-    <%= __('To register a new enterprise, fill in the form and hit the Register button. Then the enterprise will be submitted for evaluation at the validation entitiy of your choice (within your state) and when the enterprise is aproved you will be able to activate its profile.')  %>
+    <%= _('To register a new enterprise, fill in the form and hit the Register button. Then the enterprise will be submitted for evaluation at the validation entitiy of your choice (within your state) and when the enterprise is aproved you will be able to activate its profile.')  %>
   </div>
   <%= required_fields_message %>
-<h1><%= __('Enterprise registration completed') %></h1>
+<h1><%= _('Enterprise registration completed') %></h1>
 <p>
-<%= __("Your enterprise registration request was successfully registered. The validator organization you choose (%s) should get in touch with to start the validation process. As soon as the validators approve (or reject) your request, you will be notified by e-mail.") % @create_enterprise.target.name %>
+<%= _("Your enterprise registration request was successfully registered. The validator organization you choose (%s) should get in touch with to start the validation process. As soon as the validators approve (or reject) your request, you will be notified by e-mail.") % @create_enterprise.target.name %>
 </p>
 <p>
-<h1><%= __('Enterprise registration completed') %></h1>
+<h1><%= _('Enterprise registration completed') %></h1>
 <p>
-<%= __("Your enterprise (%s) was successfully registered.") % @enterprise.name %>
+<%= _("Your enterprise (%s) was successfully registered.") % @enterprise.name %>
 </p>
 <p>
-<%= link_to __('You can manage your enterprise now.'), @enterprise.admin_url %>
+<%= link_to _('You can manage your enterprise now.'), @enterprise.admin_url %>
 </p>
-<h1><%= __('Enterprise registration: validator organization') %></h1>
+<h1><%= _('Enterprise registration: validator organization') %></h1>
 <p>
-<%= __('Select one organization to validate your enterprise registration request. Check the provided information about their validation methodoly and criteria.') %>
+<%= _('Select one organization to validate your enterprise registration request. Check the provided information about their validation methodoly and criteria.') %>
 </p>
 <% form_tag do %>
@@ -12,7 +12,7 @@
 <h4><%= _('Approve') %></h4>
-<p><%= __('If this enterprise passes the criteria to be considered an solidarity enconomy enterprise, you can approve it by click the button below.') %></p>
+<p><%= _('If this enterprise passes the criteria to be considered an solidarity enconomy enterprise, you can approve it by click the button below.') %></p>
 <% form_tag :action => 'approve', :id => @pending.code do %>
   <% button_bar do %>
@@ -22,7 +22,7 @@
 <h4><%= _('Reject') %></h4>
-<p><%= __('If this enterprise does not pass the criteria do be considered, use this form.') %></p>
+<p><%= _('If this enterprise does not pass the criteria do be considered, use this form.') %></p>
 <% form_tag :action => 'reject', :id => @pending.code do %>
   <%= labelled_form_field(_('Please provide an explanation for the rejection. This explanation will be sent to the requestor (required).'), text_area_tag('reject_explanation'))%>
-<h1><%= __('Enterprise validations') %></h1>
+<h1><%= _('Enterprise validations') %></h1>
 <% button_bar do %>
   <%= button(:edit, _('Edit validation info'), { :action => 'edit_validation_info' }) %>
   <%= button(:back, _('Go Back'), { :controller => 'profile_editor' }) %>
 <% end %>
-<h2><%= __("Pending enterprise validations") %></h2>
+<h2><%= _("Pending enterprise validations") %></h2>
 <% for pending in @pending_validations %>
   <h3><%= pending.name %></h3>
@@ -27,7 +27,7 @@
   <%= link_to _("See details/approve/reject"), :action => 'details', :id => pending.code %>
 <% end %>
-<h2><%= __('Processed enterprise validations') %></h2>
+<h2><%= _('Processed enterprise validations') %></h2>
-<p><%= link_to __("See the list of processed enterprise validations"), :action => 'list_processed' %></p>
+<p><%= link_to _("See the list of processed enterprise validations"), :action => 'list_processed' %></p>
-<h2><%= __("Processed enterprise validations") %></h2>
+<h2><%= _("Processed enterprise validations") %></h2>
 <%= link_to _("Back"), :action => 'index' %>
-<h1><%= __('Adding %s as a favorite enterprise') % @favorite_enterprise.name %></h1>
+<h1><%= _('Adding %s as a favorite enterprise') % @favorite_enterprise.name %></h1>
 <p>
-<%= __('Are you sure you want to add %s as your favorite enterprise?') % @favorite_enterprise.name %>
+<%= _('Are you sure you want to add %s as your favorite enterprise?') % @favorite_enterprise.name %>
 </p>
 <% form_tag do %>
   <%= hidden_field_tag(:confirmation, 1) %>
-  <%= submit_button(:ok, __("Yes, I am sure"), :title => _("I want to add %s as a favorite enterprise") % @favorite_enterprise.name) %>
+  <%= submit_button(:ok, _("Yes, I am sure"), :title => _("I want to add %s as a favorite enterprise") % @favorite_enterprise.name) %>
   <%= button(:cancel, _("No, I don't want"), :action => 'index') %>
 <% end %>
 <div id="manage_favorite_enterprises">
-<h1><%= __("%s's favorite enterprises") % profile.name %></h1>
+<h1><%= _("%s's favorite enterprises") % profile.name %></h1>
 <ul class="profile-list">
 <% @favorite_enterprises.each do |enterprise| %>
@@ -21,7 +21,7 @@
 <% if @favorite_enterprises.empty? %>
 <p>
 <em>
-  <%= __('You have no favorite enterprises yet.') %>
+  <%= _('You have no favorite enterprises yet.') %>
 </em>
 </p>
 <% end %>
 <div id="remove_favorite_enterprise">
-<h1><%= __('Removing favorite enterprise: %s') % @favorite_enterprise.name %></h1>
+<h1><%= _('Removing favorite enterprise: %s') % @favorite_enterprise.name %></h1>
 <%= profile_image @favorite_enterprise, :thumb, :class => 'favorite_enterprise_picture' %>
 <p>
-<%= __('Are you sure you want to remove %s from your favorite enterprise list?') % @favorite_enterprise.name %>
+<%= _('Are you sure you want to remove %s from your favorite enterprise list?') % @favorite_enterprise.name %>
 </p>
 <% form_tag do %>
   <%= hidden_field_tag(:confirmation, 1) %>
-  <%= submit_button(:ok, __("Yes, I want to remove %s from my favorite enterprise list") % @favorite_enterprise.name) %>
+  <%= submit_button(:ok, _("Yes, I want to remove %s from my favorite enterprise list") % @favorite_enterprise.name) %>
   <%= button(:cancel, _("No, I don't want"), :action => 'index') %>
 <% end %>
-<h2><%= __('Manage community fields') %></h2>
+<h2><%= _('Manage community fields') %></h2>
 <% labelled_form_for(:environment, @environment, :url => {:action => 'manage_community_fields'}) do |f| %>
-<h2><%= __('Manage enterprise fields') %></h2>
+<h2><%= _('Manage enterprise fields') %></h2>
 <% labelled_form_for(:environment, @environment, :url => {:action => 'manage_enterprise_fields'}) do |f| %>
 <div id="manage_friends">
-<h1><%= __("%s's friends") % profile.name %></h1>
+<h1><%= _("%s's friends") % profile.name %></h1>
 <% cache_timeout(profile.manage_friends_cache_key(params), 4.hours) do %>
   <% if @friends.empty? %>
     <p>
       <em>
-        <%= __('You have no friends yet.') %>
+        <%= _('You have no friends yet.') %>
         <%= link_to _('Do you want to see other people in this environment?'), :controller => 'search', :action => 'assets', :asset => 'people' %>
       </em>
     </p>
 <div id="remove_friend">
-<h1><%= __('Removing friend: %s') % @friend.name %></h1>
+<h1><%= _('Removing friend: %s') % @friend.name %></h1>
 <%= profile_image @friend, :thumb, :class => 'friend_picture' %>
 <p>
-<%= __('Are you sure you want to remove %s from your friends list?') % @friend.name %>
+<%= _('Are you sure you want to remove %s from your friends list?') % @friend.name %>
 </p>
 <p>
 <em>
-<%= __('Note that %s will still have you as a friend, unless he/she also wants to remove you from his/her friend list.') % @friend.name %>
+<%= _('Note that %s will still have you as a friend, unless he/she also wants to remove you from his/her friend list.') % @friend.name %>
 </em>
 </p>
 <% form_tag do %>
   <%= hidden_field_tag(:confirmation, 1) %>
-  <%= submit_button(:ok, __("Yes") % @friend.name) %>
+  <%= submit_button(:ok, _("Yes") % @friend.name) %>
   <%= button(:cancel, _("No"), :action => 'index') %>
 <% end %>
-<%= javascript_include_tag :defaults, 'jquery-latest.js',
+<%= javascript_include_tag 'prototype.js', 'effects.js', 'dragdrop.js', 'controls.js', 'jquery-latest.js',
 'jquery.noconflict.js', 'jquery.cycle.all.min.js', 'thickbox.js', 'lightbox', 'colorbox',
 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
 'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput',
@@ -8,7 +8,7 @@
     <meta name="description" content="<%= @environment.name %>" />
     <link rel="shortcut icon" href="<%= image_path(theme_favicon) %>" type="image/x-icon" />
     <%= noosfero_javascript %>
-    <%= stylesheet_link_tag noosfero_stylesheets, :cache => 'cache' %>
+    <%= stylesheet_link_tag *noosfero_stylesheets, :cache => 'cache' %>
     <%= stylesheet_link_tag template_stylesheet_path %>
     <%= stylesheet_link_tag icon_theme_stylesheet_path %>
     <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
@@ -3,8 +3,8 @@
 <h1><%= _('Manage my groups') %></h1>
 <% button_bar do %>
-  <%= button(:add, __('Create a new community'), :controller => 'memberships', :action => 'new_community') %>
-  <%= button :add, __('Register a new enterprise'), :controller => 'enterprise_registration' if environment.enabled?('enterprise_registration') %>
+  <%= button(:add, _('Create a new community'), :controller => 'memberships', :action => 'new_community') %>
+  <%= button :add, _('Register a new enterprise'), :controller => 'enterprise_registration' if environment.enabled?('enterprise_registration') %>
   <%= button :back, _('Go back'), :controller => 'profile_editor' %>
 <% end %>
-<h1><%= __('Creating new community') %></h1>
+<h1><%= _('Creating new community') %></h1>
 <% if environment.enabled?('admin_must_approve_new_communities') %>
   <div class='explanation'>
@@ -20,7 +20,7 @@
     <% if !environment.enabled?('disable_asset_enterprises') && !profile.enterprises.empty? %>
       <tr>
-        <th colspan='2'><%= __('Enterprises') %></th>
+        <th colspan='2'><%= _('Enterprises') %></th>
       </tr>
       <% profile.enterprises.includes(:environment,:domains, :preferred_domain).each do |item| %>
         <tr>
@@ -34,11 +34,11 @@
       <th colspan='2'><%= _('Network')%></th>
     </tr>
     <tr>
-      <td><%= __('Friends') + ':' %></td>
+      <td><%= _('Friends') + ':' %></td>
       <td><%= link_to  profile.friends.count, { :controller => 'profile', :action => 'friends' } %></td>
     </tr>
     <tr>
-      <td><%= __('Communities') + ':' %></td>
+      <td><%= _('Communities') + ':' %></td>
       <td><%= link_to profile.communities.count, :controller => "profile", :action => 'communities' %></td>
     </tr>
@@ -7,10 +7,10 @@
 <% button_bar do %>
   <% if @action == :join && logged_in? %>
-    <%= button(:add, content_tag('span', __('Join')), profile.join_url, :class => 'join-community', :title => _("Join community"), :style => 'position: relative;') %>
+    <%= button(:add, content_tag('span', _('Join')), profile.join_url, :class => 'join-community', :title => _("Join community"), :style => 'position: relative;') %>
   <% end %>
   <% if @action == :add_friend && logged_in? && !user.already_request_friendship?(profile) %>
-    <%= button(:add, content_tag('span', __('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
+    <%= button(:add, content_tag('span', _('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
   <% end %>
   <%= button :back, _('Go back'), :back %>
   <%= button :home, _("Go to %s home page") % environment.name, :controller => 'home' %>
 <div class="common-profile-list-block">
-<h1><%= __("%s's enterprises") % profile.name %></h1>
+<h1><%= _("%s's enterprises") % profile.name %></h1>
 <ul class='profile-list'>
 <% @enterprises.each do |enterprise| %>
@@ -10,7 +10,7 @@
 <% button_bar do %>
   <%= button :back, _('Go back'), { :controller => 'profile' } %>
-  <%= button :add, __('Register a new enterprise'), :controller => 'enterprise_registration' if logged_in? && environment.enabled?('enterprise_registration') %>
+  <%= button :add, _('Register a new enterprise'), :controller => 'enterprise_registration' if logged_in? && environment.enabled?('enterprise_registration') %>
 <% end %>
 </div><!-- fim class="common-profile-list-block" -->
 <div class="common-profile-list-block">
-<h1><%= __("%s's fans") % profile.name %></h1>
+<h1><%= _("%s's fans") % profile.name %></h1>
 <ul class='profile-list'>
 <% @fans.each do |person| %>
 <div class="common-profile-list-block">
-<h1><%= __("%s's favorite enterprises") % profile.name %></h1>
+<h1><%= _("%s's favorite enterprises") % profile.name %></h1>
 <ul class='profile-list'>
 <% @favorite_enterprises.each do |enterprise| %>
 <div class="common-profile-list-block">
-<h1><%= __("%s's friends") % profile.name %></h1>
+<h1><%= _("%s's friends") % profile.name %></h1>
 <% cache_timeout(profile.friends_cache_key(params), 4.hours) do %>
 <ul class='profile-list'>
-<h1><%= __("Disabling '%s' enterprise") % @to_disable.name %></h1>
+<h1><%= _("Disabling '%s' enterprise") % @to_disable.name %></h1>
 <p>
 <%= _('Are you sure you want to disable %s?') % @to_disable.name %>
-<h1><%= __("Enabling '%s' enterprise") % @to_enable.name %></h1>
+<h1><%= _("Enabling '%s' enterprise") % @to_enable.name %></h1>
 <p>
 <%= _('Are you sure you want to enable %s?') % @to_enable.name %>
@@ -41,7 +41,7 @@
   <%= control_panel_button(_('Change Password'), 'change-password', :controller => 'account', :action => 'change_password') if profile.person? %>
-  <%= control_panel_button(__('Manage friends'), 'friends', :controller => 'friends', :action => 'index') if profile.person? %>
+  <%= control_panel_button(_('Manage friends'), 'friends', :controller => 'friends', :action => 'index') if profile.person? %>
   <%= control_panel_button(_('Manage Members'), 'members', :controller => 'profile_members') if profile.organization? && user.has_permission?(:manage_memberships, profile) %>
@@ -49,18 +49,18 @@
   <% if !environment.enabled?('disable_asset_enterprises') %>
     <% if profile.is_validation_entity? %>
-      <%= control_panel_button(__('Enterprise Validation'), 'validation', :controller => 'enterprise_validation') %>
+      <%= control_panel_button(_('Enterprise Validation'), 'validation', :controller => 'enterprise_validation') %>
     <% end %>
     <% if profile.person? %>
-      <%= control_panel_button(__('Favorite Enterprises'), 'favorites', :controller => 'favorite_enterprises') %>
+      <%= control_panel_button(_('Favorite Enterprises'), 'favorites', :controller => 'favorite_enterprises') %>
     <% end %>
   <% end %>
   <% if profile.enterprise? %>
     <% if profile.enabled? %>
-      <%= control_panel_button(__('Disable'), 'disable', :action => 'disable') %>
+      <%= control_panel_button(_('Disable'), 'disable', :action => 'disable') %>
     <% else %>
-      <%= control_panel_button(__('Enable'), 'enable', :action => 'enable') %>
+      <%= control_panel_button(_('Enable'), 'enable', :action => 'enable') %>
     <% end %>
   <% end %>
@@ -78,10 +78,10 @@
       <div id='activation_enterprise'>
       <% form_tag({:controller => 'account', :action => 'activation_question'}, {:method => 'get'}) do %>
-        <p><strong><%= __('Activate your enterprise') %></strong></p>
-	<p><%= __("If you received a letter with information about your enterprise activation, add here the activation code that was sent.") %></p>
+        <p><strong><%= _('Activate your enterprise') %></strong></p>
+	<p><%= _("If you received a letter with information about your enterprise activation, add here the activation code that was sent.") %></p>
 	<p><%= environment.help_message_to_add_enterprise %> </p>
-        <%= labelled_form_field(__('Enterprise activation code') + ': ', text_field_tag('enterprise_code')) %>
+        <%= labelled_form_field(_('Enterprise activation code') + ': ', text_field_tag('enterprise_code')) %>
         <%= submit_button(:ok, _('Activate')) %>
       <% end %>
     </div>
@@ -4,7 +4,7 @@
   <div class="search-in-opt"><%= _('Search in:') %>
     <dir>
-      <%= labelled_radio_button __('Enterprises'), 'asset', 'enterprises', true %><br />
+      <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', true %><br />
       <%= labelled_radio_button _('Products'), 'asset', 'products', false %>
     </dir>
   </div>
@@ -4,7 +4,7 @@
   <% if logged_in? %>
     <% button_bar do %>
       <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
-      <%= button(:add, __('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :profile => user.identifier)) %>
+      <%= button(:add, _('New community'), user.url.merge(:controller => 'memberships', :action => 'new_community', :profile => user.identifier)) %>
     <% end %>
   <% end %>
@@ -3,7 +3,7 @@
 <div id="search-column-left">
   <% if logged_in? && environment.enabled?('enterprise_registration') %>
     <% button_bar do %>
-      <%= button(:add, __('New enterprise'), {:controller => 'enterprise_registration'}) %>
+      <%= button(:add, _('New enterprise'), {:controller => 'enterprise_registration'}) %>
     <% end %>
   <% end %>
@@ -12,7 +12,7 @@
       <ul>
         <li>
-          <%= link_to( '<span class="icon-menu-home"></span>' + __('My Home Page'), '/{login}')%>
+          <%= link_to( '<span class="icon-menu-home"></span>' + _('My Home Page'), '/{login}')%>
         </li>
         <li>
 require 'noosfero/core_ext/string'
 require 'noosfero/core_ext/integer'
-require 'noosfero/core_ext/object'
 require 'noosfero/core_ext/active_record'
@@ -1,10 +0,0 @@
-class Object
-  def __(*args)
-    gettext(Noosfero.term(*args))
-  end
-  alias :getterm :__
-
-  def n__(for_one, for_many, num)
-    ngettext(getterm(for_one), getterm(for_many), num)
-  end
-end
	@@ -42,7 +42,7 @@ class AdminPanelController < AdminController		@@ -42,7 +42,7 @@ class AdminPanelController < AdminController
42	end	42	end
43	redirect_to :action => 'set_portal_folders'	43	redirect_to :action => 'set_portal_folders'
44	else	44	else
45	- session[:notice] = __('Community not found. You must insert the identifier of a community from this environment')	45	+ session[:notice] = _('Community not found. You must insert the identifier of a community from this environment')
46	end	46	end
47	end	47	end
48	end	48	end
	@@ -34,9 +34,9 @@ class FeaturesController < AdminController		@@ -34,9 +34,9 @@ class FeaturesController < AdminController
34	def manage_enterprise_fields	34	def manage_enterprise_fields
35	environment.custom_enterprise_fields = params[:enterprise_fields]	35	environment.custom_enterprise_fields = params[:enterprise_fields]
36	if environment.save!	36	if environment.save!
37	- session[:notice] = __('Enterprise fields updated successfully.')	37	+ session[:notice] = _('Enterprise fields updated successfully.')
38	else	38	else
39	- flash[:error] = __('Enterprise fields not updated successfully.')	39	+ flash[:error] = _('Enterprise fields not updated successfully.')
40	end	40	end
41	redirect_to :action => 'manage_fields'	41	redirect_to :action => 'manage_fields'
42	end	42	end
	@@ -167,7 +167,7 @@ class ProfileController < PublicController		@@ -167,7 +167,7 @@ class ProfileController < PublicController
167	session[:notice] = _("You have unblocked %s successfully. ") % profile.name	167	session[:notice] = _("You have unblocked %s successfully. ") % profile.name
168	redirect_to :controller => 'profile', :action => 'index'	168	redirect_to :controller => 'profile', :action => 'index'
169	else	169	else
170	- message = __('You are not allowed to unblock enterprises in this environment.')	170	+ message = _('You are not allowed to unblock enterprises in this environment.')
171	render_access_denied(message)	171	render_access_denied(message)
172	end	172	end
173	end	173	end
	@@ -129,7 +129,7 @@ module ProfileEditorHelper		@@ -129,7 +129,7 @@ module ProfileEditorHelper
129	else	129	else
130	domains = environment.domains	130	domains = environment.domains
131	end	131	end
132	- labelled_form_field(__('Preferred domain name:'), select(object, :preferred_domain_id, domains.map {\|item\| [item.name, item.id]}, :prompt => '<' + _('Select domain') + '>'))	132	+ labelled_form_field(_('Preferred domain name:'), select(object, :preferred_domain_id, domains.map {\|item\| [item.name, item.id]}, :prompt => '<' + _('Select domain') + '>'))
133	end	133	end
134		134
135	def control_panel(&block)	135	def control_panel(&block)
1	class CommunitiesBlock < ProfileListBlock	1	class CommunitiesBlock < ProfileListBlock
2		2
3	def self.description	3	def self.description
4	- __('Communities')	4	+ _('Communities')
5	end	5	end
6		6
7	def default_title	7	def default_title
8	- n__('{#} community', '{#} communities', profile_count)	8	+ n_('{#} community', '{#} communities', profile_count)
9	end	9	end
10		10
11	def help	11	def help
12	- __('This block displays the communities in which the user is a member.')	12	+ _('This block displays the communities in which the user is a member.')
13	end	13	end
14		14
15	def footer	15	def footer
	@@ -84,7 +84,7 @@ class Community < Organization		@@ -84,7 +84,7 @@ class Community < Organization
84	end	84	end
85		85
86	def control_panel_settings_button	86	def control_panel_settings_button
87	- {:title => __('Community Info and settings'), :icon => 'edit-profile-group'}	87	+ {:title => _('Community Info and settings'), :icon => 'edit-profile-group'}
88	end	88	end
89		89
90	def activities	90	def activities
	@@ -165,18 +165,18 @@ class CreateEnterprise < Task		@@ -165,18 +165,18 @@ class CreateEnterprise < Task
165	end	165	end
166		166
167	def task_finished_message	167	def task_finished_message
168	- __('Your request for registering the enterprise "%{enterprise}" was approved. You can access %{environment} now and provide start providing all relevant information your new enterprise.') % { :enterprise => self.name, :environment => self.environment }	168	+ _('Your request for registering the enterprise "%{enterprise}" was approved. You can access %{environment} now and provide start providing all relevant information your new enterprise.') % { :enterprise => self.name, :environment => self.environment }
169	end	169	end
170		170
171	def task_cancelled_message	171	def task_cancelled_message
172	- __("Your request for registering the enterprise %{enterprise} at %{environment} was NOT approved by the validator organization. The following explanation was given: \n\n%{explanation}") % { :enterprise => self.name, :environment => self.environment, :explanation => self.reject_explanation }	172	+ _("Your request for registering the enterprise %{enterprise} at %{environment} was NOT approved by the validator organization. The following explanation was given: \n\n%{explanation}") % { :enterprise => self.name, :environment => self.environment, :explanation => self.reject_explanation }
173	end	173	end
174		174
175	def target_notification_message	175	def target_notification_message
176	msg = ""	176	msg = ""
177	- msg << __("Enterprise \"%{enterprise}\" just requested to enter %{environment}. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :enterprise => self.name, :environment => self.environment }	177	+ msg << _("Enterprise \"%{enterprise}\" just requested to enter %{environment}. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :enterprise => self.name, :environment => self.environment }
178	msg << "\n"	178	msg << "\n"
179	- msg << __("The data provided by the enterprise was the following:\n") << "\n"	179	+ msg << _("The data provided by the enterprise was the following:\n") << "\n"
180		180
181		181
182	msg << (_("Name: %s") % self.name) << "\n"	182	msg << (_("Name: %s") % self.name) << "\n"
	@@ -186,12 +186,12 @@ class CreateEnterprise < Task		@@ -186,12 +186,12 @@ class CreateEnterprise < Task
186	msg << (_("Foundation Year: %d") % self.foundation_year) << "\n" unless self.foundation_year.blank?	186	msg << (_("Foundation Year: %d") % self.foundation_year) << "\n" unless self.foundation_year.blank?
187	msg << (_("Economic activity: %s") % self.economic_activity) << "\n"	187	msg << (_("Economic activity: %s") % self.economic_activity) << "\n"
188		188
189	- msg << __("Information about enterprise's management:\n") << self.management_information.to_s << "\n"	189	+ msg << _("Information about enterprise's management:\n") << self.management_information.to_s << "\n"
190		190
191	msg << (_("Contact phone: %s") % self.contact_phone) << "\n"	191	msg << (_("Contact phone: %s") % self.contact_phone) << "\n"
192	msg << (_("Contact person: %s") % self.contact_person) << "\n"	192	msg << (_("Contact person: %s") % self.contact_person) << "\n"
193		193
194	- msg << __('CreateEnterprise\|Identifier')	194	+ msg << _('CreateEnterprise\|Identifier')
195		195
196	msg	196	msg
197	end	197	end
1	class DisabledEnterpriseMessageBlock < Block	1	class DisabledEnterpriseMessageBlock < Block
2		2
3	def self.description	3	def self.description
4	- __('"Disabled enterprise" message')	4	+ _('"Disabled enterprise" message')
5	end	5	end
6		6
7	def help	7	def help
8	- __('Shows a message for disabled enterprises.')	8	+ _('Shows a message for disabled enterprises.')
9	end	9	end
10		10
11	def default_title	11	def default_title
	@@ -163,7 +163,7 @@ class Enterprise < Organization		@@ -163,7 +163,7 @@ class Enterprise < Organization
163	alias_method_chain :template, :inactive_enterprise	163	alias_method_chain :template, :inactive_enterprise
164		164
165	def control_panel_settings_button	165	def control_panel_settings_button
166	- {:title => __('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}	166	+ {:title => _('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}
167	end	167	end
168		168
169	settings_items :enable_contact_us, :type => :boolean, :default => true	169	settings_items :enable_contact_us, :type => :boolean, :default => true
	@@ -173,7 +173,7 @@ class Enterprise < Organization		@@ -173,7 +173,7 @@ class Enterprise < Organization
173	end	173	end
174		174
175	def control_panel_settings_button	175	def control_panel_settings_button
176	- {:title => __('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}	176	+ {:title => _('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}
177	end	177	end
178		178
179	def create_product?	179	def create_product?
	@@ -5,7 +5,7 @@ class EnterpriseHomepage < Article		@@ -5,7 +5,7 @@ class EnterpriseHomepage < Article
5	end	5	end
6		6
7	def self.short_description	7	def self.short_description
8	- __('Enterprise homepage')	8	+ _('Enterprise homepage')
9	end	9	end
10		10
11	def self.description	11	def self.description