Skip to content

Commit

Permalink
Merge pull request #371 from MatheusFerraz/master
Browse files Browse the repository at this point in the history
Fixing second part of the issue #312
  • Loading branch information
rafamanzo authored Sep 16, 2016
2 parents 7cd28f9 + 44843d3 commit 644cfeb
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The version numbers below try to follow the conventions at http://semver.org/.

## Unreleased

- Adding translation of the periodicity options in repository helper
- Fixing wrong configurations translation in portuguese navbar
- Fix warnings about 'prezento_errors'
- Creates pattern for creation tooltips in Compound Metric Configuration
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/repository_helper.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module RepositoryHelper
def periodicity_options
[["Not Periodically", 0], ["1 day", 1], ["2 days", 2], ["Weekly", 7], ["Biweekly", 15], ["Monthly", 30]]
[[t('not_periodically'), 0], [t('one_day'), 1], [t('two_days'), 2], [t('weekly'), 7], [t('biweekly'), 15], [t('monthly'), 30]]
end

def license_options
Expand Down
7 changes: 7 additions & 0 deletions config/locales/default/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,10 @@ en:
compound: "Compound"

unauthenticated: "You must be logged in to %{action}"

not_periodically: "Not Periodically"
one_day: "1 day"
two_days: "2 days"
weekly: "Weekly"
biweekly: "Biweekly"
monthly: "Monthly"
7 changes: 7 additions & 0 deletions config/locales/default/pt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,10 @@ pt:
compound: "Composta"

unauthenticated: "Você precisa fazer login para %{action}"

not_periodically: "Sem Periodicidade"
one_day: "1 dia"
two_days: "2 dias"
weekly: "Semanal"
biweekly: "Quinzenal"
monthly: "Mensal"

0 comments on commit 644cfeb

Please sign in to comment.