Commit 49ab47a71f94faf42574deca81df5ac0c9ea5540
Exists in
master
and in
22 other branches
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
| @@ -41,6 +41,7 @@ module ProfileHelper | @@ -41,6 +41,7 @@ module ProfileHelper | ||
| 41 | :birth_date => _('Date of birth'), | 41 | :birth_date => _('Date of birth'), |
| 42 | :created_at => _('Profile created at'), | 42 | :created_at => _('Profile created at'), |
| 43 | :members_count => _('Members'), | 43 | :members_count => _('Members'), |
| 44 | + :privacy_setting => _('Privacy setting'), | ||
| 44 | :article_tags => _('Tags') | 45 | :article_tags => _('Tags') |
| 45 | } | 46 | } |
| 46 | 47 | ||
| @@ -64,7 +65,7 @@ module ProfileHelper | @@ -64,7 +65,7 @@ module ProfileHelper | ||
| 64 | 65 | ||
| 65 | def title(field, entry = nil) | 66 | def title(field, entry = nil) |
| 66 | return self.send("#{field}_custom_title", entry) if MULTIPLE[kind].include?(field) && entry.present? | 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 | end | 69 | end |
| 69 | 70 | ||
| 70 | def display_field(field) | 71 | def display_field(field) |
debian/changelog
| 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 | noosfero (1.0~rc3) wheezy-test; urgency=low | 7 | noosfero (1.0~rc3) wheezy-test; urgency=low |
| 2 | 8 | ||
| 3 | * Third release candidate to Noosfero 1.0 | 9 | * Third release candidate to Noosfero 1.0 |