Download as
Browse Code »

Commit 4fd5eac8bbca298d6fb28d76477bd899c6dcfee9

Authored by AntonioTerceiro
1 parent 502ac974
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

ActionItem523: calling "Enterprises" as "Organizations" 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2307 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 17 changed files with 58 additions and 37 deletions   Show diff stats
app/controllers/public/search_controller.rb
  Diff comments   View file @4fd5eac
... ... @@ -194,10 +194,10 @@ class SearchController < ApplicationController
194 194 @names = {}
195 195 [
196 196 [ :people, _('People'), @finder.recent('people', limit) ],
197   - [ :enterprises, _('Enterprises'), @finder.recent('enterprises', limit) ],
  197 + [ :enterprises, __('Enterprises'), @finder.recent('enterprises', limit) ],
198 198 [ :products, ('Products'), @finder.recent('products', limit) ],
199 199 [ :events, _('Upcoming events'), @finder.upcoming_events({:per_page => limit}) ],
200   - [ :communities, _('Communities'), @finder.recent('communities', limit) ],
  200 + [ :communities, __('Communities'), @finder.recent('communities', limit) ],
201 201 [ :most_commented_articles, _('Most commented articles'), @finder.most_commented_articles(limit) ],
202 202 [ :articles, _('Articles'), @finder.recent('text_articles', limit) ]
203 203 ].each do |key, name, list|
... ...
app/helpers/assets_helper.rb
  Diff comments   View file @4fd5eac
... ... @@ -7,7 +7,7 @@ module AssetsHelper
7 7 [ options.merge(:asset => 'articles'), "icon-menu-articles", _('Articles') ],
8 8 [ options.merge(:asset => 'people'), "icon-menu-people", _('People') ],
9 9 [ options.merge(:asset => 'products'), "icon-menu-product", _('Products') ],
10   - [ options.merge(:asset => 'enterprises'), "icon-menu-enterprise", _('Enterprises') ],
  10 + [ options.merge(:asset => 'enterprises'), "icon-menu-enterprise", __('Enterprises') ],
11 11 [ options.merge(:asset => 'communities'), "icon-menu-community", __('Communities') ],
12 12 [ options.merge(:asset => 'events'), "icon-menu-events", _('Events') ],
13 13  
... ...
app/models/enterprises_block.rb
  Diff comments   View file @4fd5eac
1 1 class EnterprisesBlock < ProfileListBlock
2 2  
3 3 def default_title
4   - _('Enterprises')
  4 + __('Enterprises')
5 5 end
6 6  
7 7 def help
8   - _('The enterprises where this user works.')
  8 + __('The enterprises where this user works.')
9 9 end
10 10  
11 11 def self.description
12   - _('A block that displays your enterprises')
  12 + __('A block that displays your enterprises')
13 13 end
14 14  
15 15 def footer
... ... @@ -17,11 +17,11 @@ class EnterprisesBlock &lt; ProfileListBlock
17 17 case owner
18 18 when Profile
19 19 lambda do
20   - link_to _('All enterprises'), :profile => owner.identifier, :controller => 'profile', :action => 'enterprises'
  20 + link_to __('All enterprises'), :profile => owner.identifier, :controller => 'profile', :action => 'enterprises'
21 21 end
22 22 when Environment
23 23 lambda do
24   - link_to _('All enterprises'), :controller => 'search', :action => 'assets', :asset => 'enterprises'
  24 + link_to __('All enterprises'), :controller => 'search', :action => 'assets', :asset => 'enterprises'
25 25 end
26 26 else
27 27 ''
... ...
app/models/environment.rb
  Diff comments   View file @4fd5eac
... ... @@ -23,7 +23,7 @@ class Environment &lt; ActiveRecord::Base
23 23 def self.available_features
24 24 {
25 25 'disable_asset_articles' => _('Disable search for articles '),
26   - 'disable_asset_enterprises' => _('Disable search for enterprises'),
  26 + 'disable_asset_enterprises' => __('Disable search for enterprises'),
27 27 'disable_asset_people' => _('Disable search for people'),
28 28 'disable_asset_communities' => __('Disable search for communities'),
29 29 'disable_asset_products' => _('Disable search for products'),
... ...
app/models/environment_statistics_block.rb
  Diff comments   View file @4fd5eac
... ... @@ -15,7 +15,7 @@ class EnvironmentStatisticsBlock &lt; Block
15 15  
16 16 info = [
17 17 n_('One user', '%{num} users', users) % { :num => users },
18   - n_('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises },
  18 + n__('One enterprise', '%{num} enterprises', enterprises) % { :num => enterprises },
19 19 n__('One community', '%{num} communities', communities) % { :num => communities },
20 20 ]
21 21  
... ...
app/models/favorite_enterprises_block.rb
  Diff comments   View file @4fd5eac
1 1 class FavoriteEnterprisesBlock < ProfileListBlock
2 2  
3 3 def default_title
4   - _('Favorite Enterprises')
  4 + __('Favorite Enterprises')
5 5 end
6 6  
7 7 def help
8   - _('This users favorite enterprises.')
  8 + __('This users favorite enterprises.')
9 9 end
10 10  
11 11 def self.description
12   - _('A block that displays your favorite enterprises')
  12 + __('A block that displays your favorite enterprises')
13 13 end
14 14  
15 15 def footer
16 16 owner = self.owner
17 17 return '' unless owner.kind_of?(Person)
18 18 lambda do
19   - link_to _('All favorite enterprises'), :profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'
  19 + link_to __('All favorite enterprises'), :profile => owner.identifier, :controller => 'profile', :action => 'favorite_enterprises'
20 20 end
21 21 end
22 22  
... ...
app/models/sellers_search_block.rb
  Diff comments   View file @4fd5eac
1 1 class SellersSearchBlock < Block
2 2  
3 3 def self.description
4   - _('A search for enterprises by products selled and local')
  4 + __('A search for enterprises by products selled and local')
5 5 end
6 6  
7 7 def self.short_description
... ...
app/views/admin_panel/index.rhtml
  Diff comments   View file @4fd5eac
... ... @@ -4,7 +4,7 @@
4 4  
5 5 <ul>
6 6 <li><%= link_to _('Edit site info'), :action => 'site_info' %></li>
7   - <li><%= link_to _('Edit message for disabled enterprises'), :action => 'message_for_disabled_enterprise' %></li>
  7 + <li><%= link_to __('Edit message for disabled enterprises'), :action => 'message_for_disabled_enterprise' %></li>
8 8 <li><%= link_to _('Enable/disable features'), :controller => 'features' %></li>
9 9 <li><%= link_to _('Edit the Visual Design'), :controller => 'environment_design'%></li>
10 10 <li><%= link_to _('Manage Categories'), :controller => 'categories'%></li>
... ...
app/views/blocks/profile_info_actions/enterprise.rhtml
  Diff comments   View file @4fd5eac
1 1 <ul>
2 2 <%if logged_in? %>
3 3 <%if !user.favorite_enterprises.include?(profile) %>
4   - <li><%= link_to content_tag('span', _('Add favorite enterprise')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add' %></li>
  4 + <li><%= link_to content_tag('span', __('Add favorite enterprise')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add' %></li>
5 5 <% end %>
6 6 <% if profile.members.include?(user) %>
7   - <li><%= link_to content_tag('span', _('Leave this enterprise')), { :profile => user.identifier, :controller => 'memberships', :action => 'leave', :id => profile.id }, :class => 'button with-text icon-delete' %></li>
  7 + <li><%= link_to content_tag('span', __('Leave this enterprise')), { :profile => user.identifier, :controller => 'memberships', :action => 'leave', :id => profile.id }, :class => 'button with-text icon-delete' %></li>
8 8 <% else %>
9   - <li><%= link_to content_tag('span', _('Join this enterprise')), { :profile => user.identifier, :controller => 'memberships', :action => 'join', :id => profile.id }, :class => 'button with-text icon-add' %></li>
  9 + <li><%= link_to content_tag('span', __('Join this enterprise')), { :profile => user.identifier, :controller => 'memberships', :action => 'join', :id => profile.id }, :class => 'button with-text icon-add' %></li>
10 10 <% end %>
11 11 <% end %>
12 12 </ul>
... ...
app/views/enterprise_validation/index.rhtml
  Diff comments   View file @4fd5eac
1   -<h1><%= _('Enterprise validations') %></h1>
  1 +<h1><%= __('Enterprise validations') %></h1>
2 2  
3 3 <% button_bar do %>
4   - <%= button(:edit, _('Edit validation info'), { :action => 'edit_validation_info' }, :help => _('Validation info is the information the enterprises will see about how your organization processes the enterprises validations it receives: validation methodology, restrictions to the types of enterprises the organization validates etc.')) %>
  4 + <%= button(:edit, _('Edit validation info'), { :action => 'edit_validation_info' }, :help => __('Validation info is the information the enterprises will see about how your organization processes the enterprises validations it receives: validation methodology, restrictions to the types of enterprises the organization validates etc.')) %>
5 5 <%= button(:back, _('Go Back'), { :controller => 'profile_editor' }, :help => _('Go back to the control panel.')) %>
6 6 <% end %>
7 7  
8   -<h2><%= _("Pending enterprise validations") %></h2>
  8 +<h2><%= __("Pending enterprise validations") %></h2>
9 9  
10 10 <% for pending in @pending_validations %>
11 11 <h3><%= pending.name %></h3>
... ... @@ -27,7 +27,7 @@
27 27 <%= link_to _("See details/approve/reject"), :action => 'details', :id => pending.code %>
28 28 <% end %>
29 29  
30   -<h2><%= _('Processed enterprise validations') %></h2>
  30 +<h2><%= __('Processed enterprise validations') %></h2>
31 31  
32   -<p><%= link_to _("See the list of processed enterprise validations"), :action => 'list_processed' %></p>
  32 +<p><%= link_to __("See the list of processed enterprise validations"), :action => 'list_processed' %></p>
33 33  
... ...
app/views/profile/enterprises.rhtml
  Diff comments   View file @4fd5eac
1 1 <div class="common-profile-list-block"
2   - help="<%= _('Here are all <b>%s</b>s enterprises.') % profile.name %>">
  2 + help="<%= __('Here are all <b>%s</b>s enterprises.') % profile.name %>">
3 3  
4   -<h1><%= _("%s's enterprises") % profile.name %></h1>
  4 +<h1><%= __("%s's enterprises") % profile.name %></h1>
5 5  
6 6 <ul class='profile-list'>
7 7 <% @enterprises.each do |enterprise| %>
... ... @@ -12,7 +12,7 @@
12 12 <% button_bar do %>
13 13 <%= button :back, _('Go back'), { :controller => 'profile' },
14 14 :help => _('Back to the page where you come from.') %>
15   - <%= button :add, _('Register a new Enterprise'),
  15 + <%= button :add, __('Register a new Enterprise'),
16 16 :controller => 'enterprise_registration' if logged_in? %>
17 17 <% end %>
18 18  
... ...
app/views/profile/favorite_enterprises.rhtml
  Diff comments   View file @4fd5eac
1 1 <div class="common-profile-list-block"
2   - help="<%= _('Here are all <b>%s</b>s favorite enterprises.') % profile.name %>">
  2 + help="<%= __('Here are all <b>%s</b>s favorite enterprises.') % profile.name %>">
3 3  
4   -<h1><%= _("%s's favorite enterprises") % profile.name %></h1>
  4 +<h1><%= __("%s's favorite enterprises") % profile.name %></h1>
5 5  
6 6 <ul class='profile-list'>
7 7 <% @favorite_enterprises.each do |enterprise| %>
... ...
app/views/profile/index.rhtml
  Diff comments   View file @4fd5eac
... ... @@ -20,7 +20,7 @@
20 20 <% if profile.kind_of? Person %>
21 21 <li><%= link_to _('Friends'), :action => 'friends' %></li>
22 22 <li><%= link_to __('Communities'), :action => 'communities' %></li>
23   - <li><%= link_to _('Enterprises'), :action => 'enterprises' %></li>
  23 + <li><%= link_to __('Enterprises'), :action => 'enterprises' %></li>
24 24 <% end %>
25 25 <% if profile.kind_of? Organization %>
26 26 <li><%= link_to _('Members'), :action => 'members' %></li>
... ...
app/views/profile_editor/index.rhtml
  Diff comments   View file @4fd5eac
... ... @@ -26,15 +26,15 @@
26 26  
27 27 <%= file_manager_button(_('Manage Products and Services'), 'icons-app/products.png', :controller => 'manage_products') if profile.enterprise? %>
28 28  
29   - <%= file_manager_button(_('Enterprise Validation'), 'icons-app/validation.png', :controller => 'enterprise_validation') if profile.is_validation_entity? %>
  29 + <%= file_manager_button(__('Enterprise Validation'), 'icons-app/validation.png', :controller => 'enterprise_validation') if profile.is_validation_entity? %>
30 30  
31   - <%= file_manager_button(_('Favorite Enterprises'), 'icons-app/favorites.png', :controller => 'favorite_enterprises') if profile.person? %>
  31 + <%= file_manager_button(__('Favorite Enterprises'), 'icons-app/favorites.png', :controller => 'favorite_enterprises') if profile.person? %>
32 32  
33 33 <% if profile.enterprise? %>
34 34 <% if profile.enabled? %>
35   - <%= file_manager_button(_('Disable Enterprise'), 'icons-app/disable.png', :action => 'disable') %>
  35 + <%= file_manager_button(__('Disable Enterprise'), 'icons-app/disable.png', :action => 'disable') %>
36 36 <% else %>
37   - <%= file_manager_button(_('Enable Enterprise'), 'icons-app/enable.png', :action => 'enable') %>
  37 + <%= file_manager_button(__('Enable Enterprise'), 'icons-app/enable.png', :action => 'enable') %>
38 38 <% end %>
39 39 <% end %>
40 40  
... ...
app/views/search/_sellers_form.rhtml
  Diff comments   View file @4fd5eac
... ... @@ -4,7 +4,7 @@
4 4  
5 5 <div class="search-in-opt"><%= _('Search in:') %>
6 6 <dir>
7   - <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', true %><br />
  7 + <%= labelled_radio_button __('Enterprises'), 'asset', 'enterprises', true %><br />
8 8 <%= labelled_radio_button _('Products'), 'asset', 'products', false %>
9 9 </dir>
10 10 </div>
... ...
app/views/search/enterprises.rhtml
  Diff comments   View file @4fd5eac
1 1 <h1>
2 2 <% if !@query.blank? %>
3   - <%=h @category ? (_('Enterprise results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (_('Enterprise results for "%s"') % @query) %>
  3 + <%=h @category ? (__('Enterprise results for "%{query}" in "%{category}"') % { :query => @query, :category => @category.name}) : (__('Enterprise results for "%s"') % @query) %>
4 4 <% else %>
5   - <%=h @category ? (_('Enterprises in "%s"') % @category.name) : _('Enterprise') %>
  5 + <%=h @category ? (__('Enterprises in "%s"') % @category.name) : __('Enterprises') %>
6 6 <% end %>
7 7 </h1>
8 8  
... ...
lib/zen3_terminology.rb
  Diff comments   View file @4fd5eac
... ... @@ -8,6 +8,7 @@ class Zen3Terminology &lt; Noosfero::Terminology::Custom
8 8 super({
9 9 'My Home Page' => N_('My ePortfolio'),
10 10 'Homepage' => N_('ePortfolio'),
  11 +
11 12 'Communities' => N_('Groups'),
12 13 'A block that displays your communities' => N_('A block that displays your groups'),
13 14 'The communities in which the user is a member' => N_('The groups in which the user is a member'),
... ... @@ -16,6 +17,26 @@ class Zen3Terminology &lt; Noosfero::Terminology::Custom
16 17 'One community' => N_('One group'),
17 18 '%{num} communities' => N_('%{num} groups'),
18 19 'Disable search for communities' => N_('Disable search for groups'),
  20 +
  21 + 'Enterprises' => N_('Organizations'),
  22 + 'The enterprises where this user works.' => N_('The organizations where this user works.'),
  23 + 'A block that displays your enterprises' => N_('A block that displays your organizations.'),
  24 + 'All enterprises' => N_('All organizations'),
  25 + 'Disable search for enterprises' => N_('Disable search for organizations'),
  26 + 'One enterprise' => N_('One organization'),
  27 + '%{num} enterprises' => N_('%{num} organizations'),
  28 + 'Favorite Enterprises' => N_('Favorite Organizations'),
  29 + 'This user\'s favorite enterprises.' => N_('This user\'s favorite organizations'),
  30 + 'A block that displays your favorite enterprises' => N_('A block that displays your favorite organizations'),
  31 + 'All favorite enterprises' => N_('All favorite organizations'),
  32 + 'A search for enterprises by products selled and local' => N_('A search for organizations by products selled and local'),
  33 + 'Edit message for disabled enterprises' => N_('Edit message for disabled organizations'),
  34 + 'Add favorite enterprise' => N_('Add favorite organization'),
  35 + 'Validation info is the information the enterprises will see about how your organization processes the enterprises validations it receives: validation methodology, restrictions to the types of enterprises the organization validates etc.' => N_('Validation info is the information the organizations will see about how your organization processes the organizations validations it receives: validation methodology, restrictions to the types of organizations the organization validates etc.'),
  36 + 'Here are all <b>%s</b>\'s enterprises.' => N_('Here all all <b>%s</b>\'s organizations.'),
  37 + 'Here are all <b>%s</b>\'s favorite enterprises.' => N_('Here are all <b>%s</b>\'s favorite organizations.'),
  38 + 'Favorite Enterprises' => N_('Favorite Organizations'),
  39 + 'Enterprises in "%s"' => N_('Organizations in "%s"'),
19 40 })
20 41 end
21 42  
... ...