Download as
Browse Code »

Commit 49ab47a71f94faf42574deca81df5ac0c9ea5540

Authored by Daniela Feitosa
2 parents ad4f98b3 c265f164
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Merge branch 'stable' 

Ignored changes on po file

Conflicts:
	debian/changelog
	lib/noosfero.rb
	po/pt/noosfero.po
Showing 2 changed files with 8 additions and 1 deletions   Show diff stats
app/helpers/profile_helper.rb
  Diff comments   View file @49ab47a
... ... @@ -41,6 +41,7 @@ module ProfileHelper
41 41 :birth_date => _('Date of birth'),
42 42 :created_at => _('Profile created at'),
43 43 :members_count => _('Members'),
  44 + :privacy_setting => _('Privacy setting'),
44 45 :article_tags => _('Tags')
45 46 }
46 47  
... ... @@ -64,7 +65,7 @@ module ProfileHelper
64 65  
65 66 def title(field, entry = nil)
66 67 return self.send("#{field}_custom_title", entry) if MULTIPLE[kind].include?(field) && entry.present?
67   - CUSTOM_LABELS[field.to_sym] || field.to_s.humanize
  68 + CUSTOM_LABELS[field.to_sym] || _(field.to_s.humanize)
68 69 end
69 70  
70 71 def display_field(field)
... ...
debian/changelog
  Diff comments   View file @49ab47a
  1 +noosfero (0.47.5) unstable; urgency=low
  2 +
  3 + * Bugfixes release
  4 +
  5 + -- Daniela Soares Feitosa <daniela@colivre.coop.br> Thu, 23 Oct 2014 02:24:14 +0000
  6 +
1 7 noosfero (1.0~rc3) wheezy-test; urgency=low
2 8  
3 9 * Third release candidate to Noosfero 1.0
... ...