Download as
Browse Code »

Commit 634e3005fb072defd65bf7cc7e1dd9d4e0d049c3

Authored by Braulio Bhavamitra
1 parent be1a989b
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

Change to Manage Products/Services (as in catalog)

Showing 11 changed files with 16 additions and 16 deletions   Show diff stats
app/views/profile_editor/index.rhtml
  Diff comments   View file @634e300
... ... @@ -5,7 +5,7 @@
5 5 <span class='control-panel-sep'>&#150;</span>
6 6 <span class='control-panel-subtitle'><%= _('Control Panel') %></span>
7 7 </h1>
8   -
  8 +
9 9 <%= render :partial => 'pending_tasks' %>
10 10  
11 11 <% control_panel do %>
... ... @@ -23,7 +23,7 @@
23 23 <%= control_panel_button(_('Edit sideboxes'), 'blocks', :controller => 'profile_design', :action => 'index') %>
24 24  
25 25 <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'themes', :action => 'index') %>
26   -
  26 +
27 27 <%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
28 28  
29 29 <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') %>
... ... @@ -45,7 +45,7 @@
45 45  
46 46 <%= control_panel_button(_('Manage Members'), 'members', :controller => 'profile_members') if profile.organization? && user.has_permission?(:manage_memberships, profile) %>
47 47  
48   - <%= control_panel_button(_('Manage Products and Services'), 'products', :controller => 'manage_products') if profile.enterprise? && environment.enabled?('products_for_enterprises') %>
  48 + <%= control_panel_button(_('Manage Products/Services'), 'products', :controller => 'manage_products') if profile.enterprise? && environment.enabled?('products_for_enterprises') %>
49 49  
50 50 <% if !environment.enabled?('disable_asset_enterprises') %>
51 51 <% if profile.is_validation_entity? %>
... ...
features/manage_products.feature
  Diff comments   View file @634e300
... ... @@ -14,7 +14,7 @@ Feature: manage products
14 14 Scenario: display "create new product" button
15 15 Given I am logged in as "joaosilva"
16 16 And I am on redemoinho's control panel
17   - When I follow "Manage Products and Services"
  17 + When I follow "Manage Products/Services"
18 18 Then I should see "New product or service"
19 19  
20 20 Scenario: paginate public listing products and services
... ... @@ -53,13 +53,13 @@ Feature: manage products
53 53 Scenario: listing products and services
54 54 Given I am logged in as "joaosilva"
55 55 And I am on redemoinho's control panel
56   - And I follow "Manage Products and Services"
  56 + And I follow "Manage Products/Services"
57 57 Then I should see "Listing products and services"
58 58  
59 59 Scenario: see button to back in categories hierarchy
60 60 Given I am logged in as "joaosilva"
61 61 And I am on redemoinho's control panel
62   - And I follow "Manage Products and Services"
  62 + And I follow "Manage Products/Services"
63 63 When I follow "New product or service"
64 64 Then I should see "Back to the product listing" link
65 65  
... ...
plugins/bsc/features/bsc.feature
  Diff comments   View file @634e300
... ... @@ -67,7 +67,7 @@ Feature: bsc
67 67 And feature "disable_products_for_enterprises" is disabled on environment
68 68 And I am logged in as "pedro-silva"
69 69 And I am on Bsc Test's control panel
70   - When I follow "Manage Products and Services"
  70 + When I follow "Manage Products/Services"
71 71 Then I should not see "New product or service"
72 72  
73 73 Scenario: display bsc's enterprises' products name on the bsc catalog
... ...
po/de/noosfero.po
  Diff comments   View file @634e300
... ... @@ -6663,7 +6663,7 @@ msgid &quot;Manage Members&quot;
6663 6663 msgstr "Mitglieder verwalten"
6664 6664  
6665 6665 #: app/views/profile_editor/index.rhtml:48
6666   -msgid "Manage Products and Services"
  6666 +msgid "Manage Products/Services"
6667 6667 msgstr "Produkte und Services verwalten"
6668 6668  
6669 6669 #: app/views/profile_editor/index.rhtml:52
... ...
po/eo/noosfero.po
  Diff comments   View file @634e300
... ... @@ -6406,7 +6406,7 @@ msgid &quot;Manage Members&quot;
6406 6406 msgstr ""
6407 6407  
6408 6408 #: app/views/profile_editor/index.rhtml:48
6409   -msgid "Manage Products and Services"
  6409 +msgid "Manage Products/Services"
6410 6410 msgstr ""
6411 6411  
6412 6412 #: app/views/profile_editor/index.rhtml:52
... ...
po/es/noosfero.po
  Diff comments   View file @634e300
... ... @@ -6735,7 +6735,7 @@ msgid &quot;Manage Members&quot;
6735 6735 msgstr "Administrar miembros"
6736 6736  
6737 6737 #: app/views/profile_editor/index.rhtml:48
6738   -msgid "Manage Products and Services"
  6738 +msgid "Manage Products/Services"
6739 6739 msgstr "Administrar productos y servicios"
6740 6740  
6741 6741 #: app/views/profile_editor/index.rhtml:52
... ...
po/fr/noosfero.po
  Diff comments   View file @634e300
... ... @@ -7054,7 +7054,7 @@ msgid &quot;Manage Members&quot;
7054 7054 msgstr "Gérer les membres"
7055 7055  
7056 7056 #: app/views/profile_editor/index.rhtml:48
7057   -msgid "Manage Products and Services"
  7057 +msgid "Manage Products/Services"
7058 7058 msgstr "Gérer les produits et services"
7059 7059  
7060 7060 #: app/views/profile_editor/index.rhtml:52
... ...
po/hy/noosfero.po
  Diff comments   View file @634e300
... ... @@ -6911,7 +6911,7 @@ msgid &quot;Manage Members&quot;
6911 6911 msgstr "Կառավարել անդամներին"
6912 6912  
6913 6913 #: app/views/profile_editor/index.rhtml:48
6914   -msgid "Manage Products and Services"
  6914 +msgid "Manage Products/Services"
6915 6915 msgstr "Կառավարել արտադրանքն ու ծառայությունները"
6916 6916  
6917 6917 #: app/views/profile_editor/index.rhtml:52
... ...
po/it/noosfero.po
  Diff comments   View file @634e300
... ... @@ -6386,7 +6386,7 @@ msgid &quot;Manage Members&quot;
6386 6386 msgstr ""
6387 6387  
6388 6388 #: app/views/profile_editor/index.rhtml:48
6389   -msgid "Manage Products and Services"
  6389 +msgid "Manage Products/Services"
6390 6390 msgstr ""
6391 6391  
6392 6392 #: app/views/profile_editor/index.rhtml:52
... ...
po/noosfero.pot
  Diff comments   View file @634e300
... ... @@ -6386,7 +6386,7 @@ msgid &quot;Manage Members&quot;
6386 6386 msgstr ""
6387 6387  
6388 6388 #: app/views/profile_editor/index.rhtml:48
6389   -msgid "Manage Products and Services"
  6389 +msgid "Manage Products/Services"
6390 6390 msgstr ""
6391 6391  
6392 6392 #: app/views/profile_editor/index.rhtml:52
... ...
po/pt/noosfero.po
  Diff comments   View file @634e300
... ... @@ -6549,8 +6549,8 @@ msgid &quot;Manage Members&quot;
6549 6549 msgstr "Gerenciar Integrantes"
6550 6550  
6551 6551 #: app/views/profile_editor/index.rhtml:48
6552   -msgid "Manage Products and Services"
6553   -msgstr "Gerenciar Produtos e Serviços"
  6552 +msgid "Manage Products/Services"
  6553 +msgstr "Gerenciar Produtos/Serviços"
6554 6554  
6555 6555 #: app/views/profile_editor/index.rhtml:52
6556 6556 msgid "Enterprise Validation"
... ...