Download as
Browse Code »

Commit e6ae8af2eaed47b5572079fdb4c52723d33aa9d7

Authored by Weblate
2 parents 1f0d217a 2b336e03
Exists in master and in 27 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, temp_ratings, tests, tests_fixies

Merge remote-tracking branch 'origin/master'

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/models/block.rb
  Diff comments   View file @e6ae8af
@@ -224,7 +224,7 @@ class Block < ActiveRecord::Base @@ -224,7 +224,7 @@ class Block < ActiveRecord::Base
224 'all' => _('All users'), 224 'all' => _('All users'),
225 'logged' => _('Logged'), 225 'logged' => _('Logged'),
226 'not_logged' => _('Not logged'), 226 'not_logged' => _('Not logged'),
227 - 'followers' => owner.organization? ? _('Members') : _('Friends') 227 + 'followers' => owner.class != Environment && owner.organization? ? _('Members') : _('Friends')
228 } 228 }
229 end 229 end
230 230