Skip to content

Use context.locale instead of ::I18n.locale #814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
drujensen merged 5 commits into from May 27, 2018
Merged

Use context.locale instead of ::I18n.locale #814

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4fcec0f
Use context.locale instead of ::I18n.locale
docelic May 23, 2018
6a53c7d
Add missing require
docelic May 24, 2018
06789a4
Remove unnecessary require; use citrine-i18n v0.2.0
docelic May 24, 2018
772b90e
Merge branch 'master' into master
faustinoaq May 26, 2018
7bf4a2d
Merge branch 'master' into master
drujensen May 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/amber/cli/templates/app/shard.yml.ecr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies:

citrine-i18n:
github: amberframework/citrine-i18n
version: 0.1.0
version: 0.2.0

<% case @model when "crecto" -%>
crecto:
Expand Down
4 changes: 2 additions & 2 deletions src/amber/controller/helpers/i18n.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module Amber::Controller::Helpers
module I18n
def t(*arg)
::I18n.translate(*arg)
::I18n.translate(*arg, force_locale: context.locale)
end

def l(*arg)
::I18n.localize(*arg)
::I18n.localize(*arg, force_locale: context.locale)
end
end
end