From ecb8c9872ded0397c580369aa77170c1ce4d5329 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Thu, 5 Aug 2010 13:55:49 -0300 Subject: [PATCH] Marking all "enterprise" mentions for terminology --- app/controllers/admin/features_controller.rb | 4 ++-- app/controllers/public/profile_controller.rb | 2 +- app/models/create_enterprise.rb | 14 +++++++------- app/models/disabled_enterprise_message_block.rb | 4 ++-- app/models/enterprise_homepage.rb | 2 +- app/models/environment.rb | 8 ++++---- app/models/favorite_enterprises_block.rb | 2 +- app/models/sellers_search_block.rb | 2 +- app/views/account/accept_terms.rhtml | 2 +- app/views/account/activate_enterprise.rhtml | 6 +++--- app/views/account/activation_question.rhtml | 6 +++--- app/views/account/already_activated.rhtml | 2 +- app/views/account/blocked.rhtml | 8 ++++---- app/views/account/invalid_enterprise_code.rhtml | 4 ++-- app/views/account/welcome.rhtml | 4 ++-- app/views/admin_panel/edit_templates.rhtml | 2 +- app/views/enterprise_registration/basic_information.rhtml | 6 +++--- app/views/enterprise_registration/confirmation.rhtml | 4 ++-- app/views/enterprise_registration/creation.rhtml | 6 +++--- app/views/enterprise_registration/select_validator.rhtml | 4 ++-- app/views/enterprise_validation/details.rhtml | 4 ++-- app/views/enterprise_validation/list_processed.rhtml | 2 +- app/views/favorite_enterprises/add.rhtml | 6 +++--- app/views/favorite_enterprises/index.rhtml | 4 ++-- app/views/favorite_enterprises/remove.rhtml | 6 +++--- app/views/profile/enterprises.rhtml | 2 +- app/views/profile_editor/disable.rhtml | 2 +- app/views/profile_editor/enable.rhtml | 2 +- app/views/profile_editor/index.rhtml | 2 +- 29 files changed, 61 insertions(+), 61 deletions(-) diff --git a/app/controllers/admin/features_controller.rb b/app/controllers/admin/features_controller.rb index 0765cc8..1fc7f2b 100644 --- a/app/controllers/admin/features_controller.rb +++ b/app/controllers/admin/features_controller.rb @@ -34,9 +34,9 @@ class FeaturesController < 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 diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb index 2540a57..000a69c 100644 --- a/app/controllers/public/profile_controller.rb +++ b/app/controllers/public/profile_controller.rb @@ -132,7 +132,7 @@ class ProfileController < 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 diff --git a/app/models/create_enterprise.rb b/app/models/create_enterprise.rb index f5ecfa4..aef1dba 100644 --- a/app/models/create_enterprise.rb +++ b/app/models/create_enterprise.rb @@ -154,7 +154,7 @@ class CreateEnterprise < 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 < 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 < 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 diff --git a/app/models/disabled_enterprise_message_block.rb b/app/models/disabled_enterprise_message_block.rb index d668201..1de47a3 100644 --- a/app/models/disabled_enterprise_message_block.rb +++ b/app/models/disabled_enterprise_message_block.rb @@ -1,11 +1,11 @@ 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 diff --git a/app/models/enterprise_homepage.rb b/app/models/enterprise_homepage.rb index d6908fc..eefcd4f 100644 --- a/app/models/enterprise_homepage.rb +++ b/app/models/enterprise_homepage.rb @@ -1,7 +1,7 @@ class EnterpriseHomepage < Article def self.short_description - _('Enterprise homepage.') + __('Enterprise homepage.') end def self.description diff --git a/app/models/environment.rb b/app/models/environment.rb index 2fa53a5..f3e7470 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -80,7 +80,7 @@ class Environment < 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 < 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 < 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 diff --git a/app/models/favorite_enterprises_block.rb b/app/models/favorite_enterprises_block.rb index 5d6d1cc..2cb14d3 100644 --- a/app/models/favorite_enterprises_block.rb +++ b/app/models/favorite_enterprises_block.rb @@ -9,7 +9,7 @@ class FavoriteEnterprisesBlock < ProfileListBlock end def self.description - __('Favorite enterprises') + __('Favorite Enterprises') end def footer diff --git a/app/models/sellers_search_block.rb b/app/models/sellers_search_block.rb index 0ed2ac5..a7ec3ef 100644 --- a/app/models/sellers_search_block.rb +++ b/app/models/sellers_search_block.rb @@ -5,7 +5,7 @@ class SellersSearchBlock < Block end def self.short_description - _('Products/Enterprises search') + __('Products/Enterprises search') end def default_title diff --git a/app/views/account/accept_terms.rhtml b/app/views/account/accept_terms.rhtml index 7a03f64..7aa7b9b 100644 --- a/app/views/account/accept_terms.rhtml +++ b/app/views/account/accept_terms.rhtml @@ -11,7 +11,7 @@ }
-

<%= _('Enterprise activation') + ' - ' + (logged_in? ? _('part 2 of 2') : _(' part 2 of 3')) %>

+

<%= __('Enterprise activation') + ' - ' + (logged_in? ? _('part 2 of 2') : _(' part 2 of 3')) %>

<%= @terms_of_enterprise_use %>
diff --git a/app/views/account/activate_enterprise.rhtml b/app/views/account/activate_enterprise.rhtml index 779af71..5debce6 100644 --- a/app/views/account/activate_enterprise.rhtml +++ b/app/views/account/activate_enterprise.rhtml @@ -1,9 +1,9 @@
-

<%= _('Enterprise activation - part 3 of 3') %>

+

<%= __('Enterprise activation - part 3 of 3') %>

<%= error_messages_for :user %> -

<%= _('Now for you manage your enterprise you have to associate an individual account to the enterprise.') %>

+

<%= __('Now for you manage your enterprise you have to associate an individual account to the enterprise.') %>

<%= _('Do you have a personal user account in the system?') %>

@@ -14,7 +14,7 @@