Download as
Browse Code »

Commit 3465dd97300e29c71365843cb4383e36e0bd7552

Authored by Rodrigo Souto
1 parent eb4d0d91
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

rails3: remove deprecated terminology method

Showing 2 changed files with 6 additions and 6 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @3465dd9
@@ -105,11 +105,11 @@ class Environment < ActiveRecord::Base @@ -105,11 +105,11 @@ class Environment < ActiveRecord::Base
105 'disable_contact_person' => _('Disable contact for people'), 105 'disable_contact_person' => _('Disable contact for people'),
106 'disable_contact_community' => _('Disable contact for groups/communities'), 106 'disable_contact_community' => _('Disable contact for groups/communities'),
107 107
108 - 'products_for_enterprises' => __('Enable products for enterprises'),  
109 - 'enterprise_registration' => __('Enterprise registration'),  
110 - 'enterprise_activation' => __('Enable activation of enterprises'),  
111 - 'enterprises_are_disabled_when_created' => __('Enterprises are disabled when created'),  
112 - 'enterprises_are_validated_when_created' => __('Enterprises are validated when created'), 108 + 'products_for_enterprises' => _('Enable products for enterprises'),
  109 + 'enterprise_registration' => _('Enterprise registration'),
  110 + 'enterprise_activation' => _('Enable activation of enterprises'),
  111 + 'enterprises_are_disabled_when_created' => _('Enterprises are disabled when created'),
  112 + 'enterprises_are_validated_when_created' => _('Enterprises are validated when created'),
113 113
114 'media_panel' => _('Media panel in WYSIWYG editor'), 114 'media_panel' => _('Media panel in WYSIWYG editor'),
115 'select_preferred_domain' => _('Select preferred domains per profile'), 115 'select_preferred_domain' => _('Select preferred domains per profile'),
app/views/profile/_person_profile.html.erb
  Diff comments   View file @3465dd9
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 </tr> 31 </tr>
32 <% if environment.disabled?('disable_asset_enterprises') %> 32 <% if environment.disabled?('disable_asset_enterprises') %>
33 <tr id="person-profile-network-enterprises"> 33 <tr id="person-profile-network-enterprises">
34 - <td><%= __('Enterprises') + ':' %></td> 34 + <td><%= _('Enterprises') + ':' %></td>
35 <td><%= link_to profile.enterprises.count, :controller => "profile", :action => 'enterprises' %></td> 35 <td><%= link_to profile.enterprises.count, :controller => "profile", :action => 'enterprises' %></td>
36 </tr> 36 </tr>
37 <% end %> 37 <% end %>