diff --git a/app/views/profile_editor/index.rhtml b/app/views/profile_editor/index.rhtml index 0fc6b89..66d64b2 100644 --- a/app/views/profile_editor/index.rhtml +++ b/app/views/profile_editor/index.rhtml @@ -5,7 +5,7 @@ – <%= _('Control Panel') %> - + <%= render :partial => 'pending_tasks' %> <% control_panel do %> @@ -23,7 +23,7 @@ <%= control_panel_button(_('Edit sideboxes'), 'blocks', :controller => 'profile_design', :action => 'index') %> <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'themes', :action => 'index') %> - + <%= 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) %> <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') %> @@ -45,7 +45,7 @@ <%= control_panel_button(_('Manage Members'), 'members', :controller => 'profile_members') if profile.organization? && user.has_permission?(:manage_memberships, profile) %> - <%= control_panel_button(_('Manage Products and Services'), 'products', :controller => 'manage_products') if profile.enterprise? && environment.enabled?('products_for_enterprises') %> + <%= control_panel_button(_('Manage Products/Services'), 'products', :controller => 'manage_products') if profile.enterprise? && environment.enabled?('products_for_enterprises') %> <% if !environment.enabled?('disable_asset_enterprises') %> <% if profile.is_validation_entity? %> diff --git a/features/manage_products.feature b/features/manage_products.feature index 7583cd2..5279d75 100644 --- a/features/manage_products.feature +++ b/features/manage_products.feature @@ -14,7 +14,7 @@ Feature: manage products Scenario: display "create new product" button Given I am logged in as "joaosilva" And I am on redemoinho's control panel - When I follow "Manage Products and Services" + When I follow "Manage Products/Services" Then I should see "New product or service" Scenario: paginate public listing products and services @@ -53,13 +53,13 @@ Feature: manage products Scenario: listing products and services Given I am logged in as "joaosilva" And I am on redemoinho's control panel - And I follow "Manage Products and Services" + And I follow "Manage Products/Services" Then I should see "Listing products and services" Scenario: see button to back in categories hierarchy Given I am logged in as "joaosilva" And I am on redemoinho's control panel - And I follow "Manage Products and Services" + And I follow "Manage Products/Services" When I follow "New product or service" Then I should see "Back to the product listing" link diff --git a/plugins/bsc/features/bsc.feature b/plugins/bsc/features/bsc.feature index 2de0414..6ffbd38 100644 --- a/plugins/bsc/features/bsc.feature +++ b/plugins/bsc/features/bsc.feature @@ -67,7 +67,7 @@ Feature: bsc And feature "disable_products_for_enterprises" is disabled on environment And I am logged in as "pedro-silva" And I am on Bsc Test's control panel - When I follow "Manage Products and Services" + When I follow "Manage Products/Services" Then I should not see "New product or service" Scenario: display bsc's enterprises' products name on the bsc catalog diff --git a/po/de/noosfero.po b/po/de/noosfero.po index 7f4bb93..1fa0b57 100644 --- a/po/de/noosfero.po +++ b/po/de/noosfero.po @@ -6663,7 +6663,7 @@ msgid "Manage Members" msgstr "Mitglieder verwalten" #: app/views/profile_editor/index.rhtml:48 -msgid "Manage Products and Services" +msgid "Manage Products/Services" msgstr "Produkte und Services verwalten" #: app/views/profile_editor/index.rhtml:52 diff --git a/po/eo/noosfero.po b/po/eo/noosfero.po index ee7ac46..b273908 100644 --- a/po/eo/noosfero.po +++ b/po/eo/noosfero.po @@ -6406,7 +6406,7 @@ msgid "Manage Members" msgstr "" #: app/views/profile_editor/index.rhtml:48 -msgid "Manage Products and Services" +msgid "Manage Products/Services" msgstr "" #: app/views/profile_editor/index.rhtml:52 diff --git a/po/es/noosfero.po b/po/es/noosfero.po index 99987b4..d1d5c76 100644 --- a/po/es/noosfero.po +++ b/po/es/noosfero.po @@ -6735,7 +6735,7 @@ msgid "Manage Members" msgstr "Administrar miembros" #: app/views/profile_editor/index.rhtml:48 -msgid "Manage Products and Services" +msgid "Manage Products/Services" msgstr "Administrar productos y servicios" #: app/views/profile_editor/index.rhtml:52 diff --git a/po/fr/noosfero.po b/po/fr/noosfero.po index 2ebd7f2..263a90f 100644 --- a/po/fr/noosfero.po +++ b/po/fr/noosfero.po @@ -7054,7 +7054,7 @@ msgid "Manage Members" msgstr "Gérer les membres" #: app/views/profile_editor/index.rhtml:48 -msgid "Manage Products and Services" +msgid "Manage Products/Services" msgstr "Gérer les produits et services" #: app/views/profile_editor/index.rhtml:52 diff --git a/po/hy/noosfero.po b/po/hy/noosfero.po index 88ab384..1f82e0c 100644 --- a/po/hy/noosfero.po +++ b/po/hy/noosfero.po @@ -6911,7 +6911,7 @@ msgid "Manage Members" msgstr "Կառավարել անդամներին" #: app/views/profile_editor/index.rhtml:48 -msgid "Manage Products and Services" +msgid "Manage Products/Services" msgstr "Կառավարել արտադրանքն ու ծառայությունները" #: app/views/profile_editor/index.rhtml:52 diff --git a/po/it/noosfero.po b/po/it/noosfero.po index e078f82..3fc09c4 100644 --- a/po/it/noosfero.po +++ b/po/it/noosfero.po @@ -6386,7 +6386,7 @@ msgid "Manage Members" msgstr "" #: app/views/profile_editor/index.rhtml:48 -msgid "Manage Products and Services" +msgid "Manage Products/Services" msgstr "" #: app/views/profile_editor/index.rhtml:52 diff --git a/po/noosfero.pot b/po/noosfero.pot index 958d248..525c3dd 100644 --- a/po/noosfero.pot +++ b/po/noosfero.pot @@ -6386,7 +6386,7 @@ msgid "Manage Members" msgstr "" #: app/views/profile_editor/index.rhtml:48 -msgid "Manage Products and Services" +msgid "Manage Products/Services" msgstr "" #: app/views/profile_editor/index.rhtml:52 diff --git a/po/pt/noosfero.po b/po/pt/noosfero.po index d14e54c..1a72aee 100644 --- a/po/pt/noosfero.po +++ b/po/pt/noosfero.po @@ -6549,8 +6549,8 @@ msgid "Manage Members" msgstr "Gerenciar Integrantes" #: app/views/profile_editor/index.rhtml:48 -msgid "Manage Products and Services" -msgstr "Gerenciar Produtos e Serviços" +msgid "Manage Products/Services" +msgstr "Gerenciar Produtos/Serviços" #: app/views/profile_editor/index.rhtml:52 msgid "Enterprise Validation" -- libgit2 0.21.2