Download as
Browse Code »

Commit 634e3005fb072defd65bf7cc7e1dd9d4e0d049c3

Authored by Braulio Bhavamitra
1 parent be1a989b
Exists in master and in 23 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, 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,7 +5,7 @@
5 <span class='control-panel-sep'>&#150;</span> 5 <span class='control-panel-sep'>&#150;</span>
6 <span class='control-panel-subtitle'><%= _('Control Panel') %></span> 6 <span class='control-panel-subtitle'><%= _('Control Panel') %></span>
7 </h1> 7 </h1>
8 - 8 +
9 <%= render :partial => 'pending_tasks' %> 9 <%= render :partial => 'pending_tasks' %>
10 10
11 <% control_panel do %> 11 <% control_panel do %>
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <%= control_panel_button(_('Edit sideboxes'), 'blocks', :controller => 'profile_design', :action => 'index') %> 23 <%= control_panel_button(_('Edit sideboxes'), 'blocks', :controller => 'profile_design', :action => 'index') %>
24 24
25 <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'themes', :action => 'index') %> 25 <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'themes', :action => 'index') %>
26 - 26 +
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) %> 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 <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') %> 29 <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') %>
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 45
46 <%= control_panel_button(_('Manage Members'), 'members', :controller => 'profile_members') if profile.organization? && user.has_permission?(:manage_memberships, profile) %> 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 <% if !environment.enabled?('disable_asset_enterprises') %> 50 <% if !environment.enabled?('disable_asset_enterprises') %>
51 <% if profile.is_validation_entity? %> 51 <% if profile.is_validation_entity? %>
features/manage_products.feature
  Diff comments   View file @634e300
@@ -14,7 +14,7 @@ Feature: manage products @@ -14,7 +14,7 @@ Feature: manage products
14 Scenario: display "create new product" button 14 Scenario: display "create new product" button
15 Given I am logged in as "joaosilva" 15 Given I am logged in as "joaosilva"
16 And I am on redemoinho's control panel 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 Then I should see "New product or service" 18 Then I should see "New product or service"
19 19
20 Scenario: paginate public listing products and services 20 Scenario: paginate public listing products and services
@@ -53,13 +53,13 @@ Feature: manage products @@ -53,13 +53,13 @@ Feature: manage products
53 Scenario: listing products and services 53 Scenario: listing products and services
54 Given I am logged in as "joaosilva" 54 Given I am logged in as "joaosilva"
55 And I am on redemoinho's control panel 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 Then I should see "Listing products and services" 57 Then I should see "Listing products and services"
58 58
59 Scenario: see button to back in categories hierarchy 59 Scenario: see button to back in categories hierarchy
60 Given I am logged in as "joaosilva" 60 Given I am logged in as "joaosilva"
61 And I am on redemoinho's control panel 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 When I follow "New product or service" 63 When I follow "New product or service"
64 Then I should see "Back to the product listing" link 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,7 +67,7 @@ Feature: bsc
67 And feature "disable_products_for_enterprises" is disabled on environment 67 And feature "disable_products_for_enterprises" is disabled on environment
68 And I am logged in as "pedro-silva" 68 And I am logged in as "pedro-silva"
69 And I am on Bsc Test's control panel 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 Then I should not see "New product or service" 71 Then I should not see "New product or service"
72 72
73 Scenario: display bsc's enterprises' products name on the bsc catalog 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,7 +6663,7 @@ msgid &quot;Manage Members&quot;
6663 msgstr "Mitglieder verwalten" 6663 msgstr "Mitglieder verwalten"
6664 6664
6665 #: app/views/profile_editor/index.rhtml:48 6665 #: app/views/profile_editor/index.rhtml:48
6666 -msgid "Manage Products and Services" 6666 +msgid "Manage Products/Services"
6667 msgstr "Produkte und Services verwalten" 6667 msgstr "Produkte und Services verwalten"
6668 6668
6669 #: app/views/profile_editor/index.rhtml:52 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,7 +6406,7 @@ msgid &quot;Manage Members&quot;
6406 msgstr "" 6406 msgstr ""
6407 6407
6408 #: app/views/profile_editor/index.rhtml:48 6408 #: app/views/profile_editor/index.rhtml:48
6409 -msgid "Manage Products and Services" 6409 +msgid "Manage Products/Services"
6410 msgstr "" 6410 msgstr ""
6411 6411
6412 #: app/views/profile_editor/index.rhtml:52 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,7 +6735,7 @@ msgid &quot;Manage Members&quot;
6735 msgstr "Administrar miembros" 6735 msgstr "Administrar miembros"
6736 6736
6737 #: app/views/profile_editor/index.rhtml:48 6737 #: app/views/profile_editor/index.rhtml:48
6738 -msgid "Manage Products and Services" 6738 +msgid "Manage Products/Services"
6739 msgstr "Administrar productos y servicios" 6739 msgstr "Administrar productos y servicios"
6740 6740
6741 #: app/views/profile_editor/index.rhtml:52 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,7 +7054,7 @@ msgid &quot;Manage Members&quot;
7054 msgstr "Gérer les membres" 7054 msgstr "Gérer les membres"
7055 7055
7056 #: app/views/profile_editor/index.rhtml:48 7056 #: app/views/profile_editor/index.rhtml:48
7057 -msgid "Manage Products and Services" 7057 +msgid "Manage Products/Services"
7058 msgstr "Gérer les produits et services" 7058 msgstr "Gérer les produits et services"
7059 7059
7060 #: app/views/profile_editor/index.rhtml:52 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,7 +6911,7 @@ msgid &quot;Manage Members&quot;
6911 msgstr "Կառավարել անդամներին" 6911 msgstr "Կառավարել անդամներին"
6912 6912
6913 #: app/views/profile_editor/index.rhtml:48 6913 #: app/views/profile_editor/index.rhtml:48
6914 -msgid "Manage Products and Services" 6914 +msgid "Manage Products/Services"
6915 msgstr "Կառավարել արտադրանքն ու ծառայությունները" 6915 msgstr "Կառավարել արտադրանքն ու ծառայությունները"
6916 6916
6917 #: app/views/profile_editor/index.rhtml:52 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,7 +6386,7 @@ msgid &quot;Manage Members&quot;
6386 msgstr "" 6386 msgstr ""
6387 6387
6388 #: app/views/profile_editor/index.rhtml:48 6388 #: app/views/profile_editor/index.rhtml:48
6389 -msgid "Manage Products and Services" 6389 +msgid "Manage Products/Services"
6390 msgstr "" 6390 msgstr ""
6391 6391
6392 #: app/views/profile_editor/index.rhtml:52 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,7 +6386,7 @@ msgid &quot;Manage Members&quot;
6386 msgstr "" 6386 msgstr ""
6387 6387
6388 #: app/views/profile_editor/index.rhtml:48 6388 #: app/views/profile_editor/index.rhtml:48
6389 -msgid "Manage Products and Services" 6389 +msgid "Manage Products/Services"
6390 msgstr "" 6390 msgstr ""
6391 6391
6392 #: app/views/profile_editor/index.rhtml:52 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,8 +6549,8 @@ msgid &quot;Manage Members&quot;
6549 msgstr "Gerenciar Integrantes" 6549 msgstr "Gerenciar Integrantes"
6550 6550
6551 #: app/views/profile_editor/index.rhtml:48 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 #: app/views/profile_editor/index.rhtml:52 6555 #: app/views/profile_editor/index.rhtml:52
6556 msgid "Enterprise Validation" 6556 msgid "Enterprise Validation"