Download as
Browse Code »

Commit 25b98859a8c8d6a8c4f965b390ae6a014e5d2068

Authored by Daniela Feitosa
2 parents 4733f69a eb66bb8b
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'stable' of gitlab.com:noosfero/noosfero into stable

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/models/product_categories_block.rb
  Diff comments   View file @25b9885
@@ -33,7 +33,7 @@ class ProductCategoriesBlock < Block @@ -33,7 +33,7 @@ class ProductCategoriesBlock < Block
33 end 33 end
34 end 34 end
35 35
36 - DISPLAY_OPTIONS['catalog_only'] = __('Only on the catalog') 36 + DISPLAY_OPTIONS = DISPLAY_OPTIONS.merge('catalog_only' => _('Only on the catalog'))
37 37
38 def display 38 def display
39 settings[:display].nil? ? 'catalog_only' : super 39 settings[:display].nil? ? 'catalog_only' : super