Marking all "enterprise" mentions for terminology

Rodrigo Souto · Antonio Terceiro
1 parent 6979130d
Showing 29 changed files with 61 additions and 61 deletions Show diff stats
app/controllers/admin/features_controller.rb
app/controllers/public/profile_controller.rb
app/models/create_enterprise.rb
app/models/disabled_enterprise_message_block.rb
app/models/enterprise_homepage.rb
app/models/environment.rb
app/models/favorite_enterprises_block.rb
app/models/sellers_search_block.rb
app/views/account/accept_terms.rhtml
app/views/account/activate_enterprise.rhtml
app/views/account/activation_question.rhtml
app/views/account/already_activated.rhtml
app/views/account/blocked.rhtml
app/views/account/invalid_enterprise_code.rhtml
app/views/account/welcome.rhtml
app/views/admin_panel/edit_templates.rhtml
app/views/enterprise_registration/basic_information.rhtml
app/views/enterprise_registration/confirmation.rhtml
app/views/enterprise_registration/creation.rhtml
app/views/enterprise_registration/select_validator.rhtml
@@ -34,9 +34,9 @@ class FeaturesController &lt; AdminController
   def manage_enterprise_fields
     environment.custom_enterprise_fields = params[:enterprise_fields]
     if environment.save!
-      flash[:notice] = _('Enterprise fields updated successfully.')
+      flash[: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
@@ -132,7 +132,7 @@ class ProfileController &lt; PublicController
       flash[: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
@@ -154,7 +154,7 @@ class CreateEnterprise &lt; Task
   end
   def description
-    _('Enterprise registration: "%s"') % self.name
+    __('Enterprise registration: "%s"') % self.name
   end
   def task_created_message
@@ -164,18 +164,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"
@@ -185,12 +185,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
 class EnterpriseHomepage < Article
   def self.short_description
-    _('Enterprise homepage.')
+    __('Enterprise homepage.')
   end
   def self.description
@@ -80,7 +80,7 @@ class Environment &lt; ActiveRecord::Base
       '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_cms' => _('Disable CMS'),
       'disable_header_and_footer' => _('Disable header/footer editing by users'),
@@ -89,10 +89,10 @@ 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'),
       'join_community_popup' => _('Ask users to join a group/community with a popup'),
-      'enterprise_activation' => _('Enable activation of enterprises'),
+      'enterprise_activation' => __('Enable activation of enterprises'),
       'wysiwyg_editor_for_environment_home' => _('Use WYSIWYG editor to edit environment home page'),
       'media_panel' => _('Media panel in WYSIWYG editor'),
       'select_preferred_domain' => _('Select preferred domains per profile'),
@@ -107,7 +107,7 @@ 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_disabled_when_created' => __('Enterprises are disabled when created'),
     }
   end
@@ -9,7 +9,7 @@ class FavoriteEnterprisesBlock &lt; ProfileListBlock
   end
   def self.description
-    __('Favorite enterprises')
+    __('Favorite Enterprises')
   end
   def footer
@@ -5,7 +5,7 @@ class SellersSearchBlock &lt; Block
   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 %>
@@ -3,5 +3,5 @@
 <ul>
 <li><%= link_to _('Edit Person Template'), :controller => 'profile_editor', :profile => environment.person_template.identifier %></li>
 <li><%= link_to _('Edit Community Template'), :controller => 'profile_editor', :profile => environment.community_template.identifier %></li>
-<li><%= link_to _('Edit Enterprise Template'), :controller => 'profile_editor', :profile => environment.enterprise_template.identifier %></li>
+<li><%= link_to __('Edit Enterprise Template'), :controller => 'profile_editor', :profile => environment.enterprise_template.identifier %></li>
 </ul>
 <%= 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'))%>
-<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 want to add %s as a favorite enterprise") % @favorite_enterprise.name) %>
+  <%= submit_button(:ok, __("Yes, 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 enteprises") % 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 enteprises 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 %>
@@ -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" -->
-<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 %>
@@ -72,7 +72,7 @@
       <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><%= __("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')) %>
         <%= submit_button(:ok, _('Activate')) %>
	@@ -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	- flash[:notice] = _('Enterprise fields updated successfully.')	37	+ flash[: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
	@@ -132,7 +132,7 @@ class ProfileController < PublicController		@@ -132,7 +132,7 @@ class ProfileController < PublicController
132	flash[:notice] = _("You have unblocked %s successfully. ") % profile.name	132	flash[:notice] = _("You have unblocked %s successfully. ") % profile.name
133	redirect_to :controller => 'profile', :action => 'index'	133	redirect_to :controller => 'profile', :action => 'index'
134	else	134	else
135	- message = _('You are not allowed to unblock enterprises in this environment.')	135	+ message = __('You are not allowed to unblock enterprises in this environment.')
136	render_access_denied(message)	136	render_access_denied(message)
137	end	137	end
138	end	138	end
	@@ -154,7 +154,7 @@ class CreateEnterprise < Task		@@ -154,7 +154,7 @@ class CreateEnterprise < Task
154	end	154	end
155		155
156	def description	156	def description
157	- _('Enterprise registration: "%s"') % self.name	157	+ __('Enterprise registration: "%s"') % self.name
158	end	158	end
159		159
160	def task_created_message	160	def task_created_message
	@@ -164,18 +164,18 @@ class CreateEnterprise < Task		@@ -164,18 +164,18 @@ class CreateEnterprise < Task
164	end	164	end
165		165
166	def task_finished_message	166	def task_finished_message
167	- _('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 }	167	+ __('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	end	168	end
169		169
170	def task_cancelled_message	170	def task_cancelled_message
171	- _("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 }	171	+ __("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	end	172	end
173		173
174	def target_notification_message	174	def target_notification_message
175	msg = ""	175	msg = ""
176	- 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 }	176	+ 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 << "\n"	177	msg << "\n"
178	- msg << _("The data provided by the enterprise was the following:\n") << "\n"	178	+ msg << __("The data provided by the enterprise was the following:\n") << "\n"
179		179
180		180
181	msg << (_("Name: %s") % self.name) << "\n"	181	msg << (_("Name: %s") % self.name) << "\n"
	@@ -185,12 +185,12 @@ class CreateEnterprise < Task		@@ -185,12 +185,12 @@ class CreateEnterprise < Task
185	msg << (_("Foundation Year: %d") % self.foundation_year) << "\n" unless self.foundation_year.blank?	185	msg << (_("Foundation Year: %d") % self.foundation_year) << "\n" unless self.foundation_year.blank?
186	msg << (_("Economic activity: %s") % self.economic_activity) << "\n"	186	msg << (_("Economic activity: %s") % self.economic_activity) << "\n"
187		187
188	- msg << _("Information about enterprise's management:\n") << self.management_information.to_s << "\n"	188	+ msg << __("Information about enterprise's management:\n") << self.management_information.to_s << "\n"
189		189
190	msg << (_("Contact phone: %s") % self.contact_phone) << "\n"	190	msg << (_("Contact phone: %s") % self.contact_phone) << "\n"
191	msg << (_("Contact person: %s") % self.contact_person) << "\n"	191	msg << (_("Contact person: %s") % self.contact_person) << "\n"
192		192
193	- msg << _('CreateEnterprise\|Identifier')	193	+ msg << __('CreateEnterprise\|Identifier')
194		194
195	msg	195	msg
196	end	196	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
1	class EnterpriseHomepage < Article	1	class EnterpriseHomepage < Article
2		2
3	def self.short_description	3	def self.short_description
4	- _('Enterprise homepage.')	4	+ __('Enterprise homepage.')
5	end	5	end
6		6
7	def self.description	7	def self.description
	@@ -80,7 +80,7 @@ class Environment < ActiveRecord::Base		@@ -80,7 +80,7 @@ class Environment < ActiveRecord::Base
80	'disable_asset_communities' => __('Disable search for communities'),	80	'disable_asset_communities' => __('Disable search for communities'),
81	'disable_asset_products' => _('Disable search for products'),	81	'disable_asset_products' => _('Disable search for products'),
82	'disable_asset_events' => _('Disable search for events'),	82	'disable_asset_events' => _('Disable search for events'),
83	- 'disable_products_for_enterprises' => _('Disable products for enterprises'),	83	+ 'disable_products_for_enterprises' => __('Disable products for enterprises'),
84	'disable_categories' => _('Disable categories'),	84	'disable_categories' => _('Disable categories'),
85	'disable_cms' => _('Disable CMS'),	85	'disable_cms' => _('Disable CMS'),
86	'disable_header_and_footer' => _('Disable header/footer editing by users'),	86	'disable_header_and_footer' => _('Disable header/footer editing by users'),
	@@ -89,10 +89,10 @@ class Environment < ActiveRecord::Base		@@ -89,10 +89,10 @@ class Environment < ActiveRecord::Base
89	'disable_select_city_for_contact' => _('Disable state/city select for contact form'),	89	'disable_select_city_for_contact' => _('Disable state/city select for contact form'),
90	'disable_contact_person' => _('Disable contact for people'),	90	'disable_contact_person' => _('Disable contact for people'),
91	'disable_contact_community' => _('Disable contact for groups/communities'),	91	'disable_contact_community' => _('Disable contact for groups/communities'),
92	- 'enterprise_registration' => _('Enterprise registration'),	92	+ 'enterprise_registration' => __('Enterprise registration'),
93	'join_community_popup' => _('Ask users to join a group/community with a popup'),	93	'join_community_popup' => _('Ask users to join a group/community with a popup'),
94		94
95	- 'enterprise_activation' => _('Enable activation of enterprises'),	95	+ 'enterprise_activation' => __('Enable activation of enterprises'),
96	'wysiwyg_editor_for_environment_home' => _('Use WYSIWYG editor to edit environment home page'),	96	'wysiwyg_editor_for_environment_home' => _('Use WYSIWYG editor to edit environment home page'),
97	'media_panel' => _('Media panel in WYSIWYG editor'),	97	'media_panel' => _('Media panel in WYSIWYG editor'),
98	'select_preferred_domain' => _('Select preferred domains per profile'),	98	'select_preferred_domain' => _('Select preferred domains per profile'),
	@@ -107,7 +107,7 @@ class Environment < ActiveRecord::Base		@@ -107,7 +107,7 @@ class Environment < ActiveRecord::Base
107	'organizations_are_moderated_by_default' => _("Organizations have moderated publication by default"),	107	'organizations_are_moderated_by_default' => _("Organizations have moderated publication by default"),
108	'enable_organization_url_change' => _("Allow organizations to change their URL"),	108	'enable_organization_url_change' => _("Allow organizations to change their URL"),
109	'admin_must_approve_new_communities' => _("Admin must approve creation of communities"),	109	'admin_must_approve_new_communities' => _("Admin must approve creation of communities"),
110	- 'enterprises_are_disabled_when_created' => _('Enterprises are disabled when created'),	110	+ 'enterprises_are_disabled_when_created' => __('Enterprises are disabled when created'),
111	}	111	}
112	end	112	end
113		113
	@@ -9,7 +9,7 @@ class FavoriteEnterprisesBlock < ProfileListBlock		@@ -9,7 +9,7 @@ class FavoriteEnterprisesBlock < ProfileListBlock
9	end	9	end
10		10
11	def self.description	11	def self.description
12	- __('Favorite enterprises')	12	+ __('Favorite Enterprises')
13	end	13	end
14		14
15	def footer	15	def footer
	@@ -5,7 +5,7 @@ class SellersSearchBlock < Block		@@ -5,7 +5,7 @@ class SellersSearchBlock < Block
5	end	5	end
6		6
7	def self.short_description	7	def self.short_description
8	- _('Products/Enterprises search')	8	+ __('Products/Enterprises search')
9	end	9	end
10		10
11	def default_title	11	def default_title
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	}	11	}
12	</script>	12	</script>
13	<div class=activation-box>	13	<div class=activation-box>
14	- <h2><%= _('Enterprise activation') + ' - ' + (logged_in? ? _('part 2 of 2') : _(' part 2 of 3')) %></h2>	14	+ <h2><%= __('Enterprise activation') + ' - ' + (logged_in? ? _('part 2 of 2') : _(' part 2 of 3')) %></h2>
15		15
16	<div id='terms-of-enterprise-use' class='height: 200px; overflow: auto;'><%= @terms_of_enterprise_use %></div>	16	<div id='terms-of-enterprise-use' class='height: 200px; overflow: auto;'><%= @terms_of_enterprise_use %></div>
17		17
1	<div class='activation-box'>	1	<div class='activation-box'>
2	-<h2><%= _('Enterprise activation - part 3 of 3') %></h2>	2	+<h2><%= __('Enterprise activation - part 3 of 3') %></h2>
3		3
4	<%= error_messages_for :user %>	4	<%= error_messages_for :user %>
5		5
6	-<p><%= _('Now for you manage your enterprise you have to associate an individual account to the enterprise.') %></p>	6	+<p><%= __('Now for you manage your enterprise you have to associate an individual account to the enterprise.') %></p>
7	<p><%= _('Do you have a personal user account in the system?') %></p>	7	<p><%= _('Do you have a personal user account in the system?') %></p>
8		8
9	<div id="enterprise-activation-create-user-or-login-button">	9	<div id="enterprise-activation-create-user-or-login-button">
	@@ -14,7 +14,7 @@		@@ -14,7 +14,7 @@
14	<div id="enterprise-activation-create-user-form" style="display: none">	14	<div id="enterprise-activation-create-user-form" style="display: none">
15	<h3><%= _('Personal signup form') %></h3>	15	<h3><%= _('Personal signup form') %></h3>
16	<%= render :partial => 'signup_form', :locals => { :hidden_atention => true } %>	16	<%= render :partial => 'signup_form', :locals => { :hidden_atention => true } %>
17	- <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>	17	+ <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>
18	</div>	18	</div>
19		19
20	<div id="enterprise-activation-login-form" style="display: none">	20	<div id="enterprise-activation-login-form" style="display: none">