Skip to content

Fixing a bug about string and symbol comparison #35

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixing a bug about string and symbol comparison #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78419d6
handles duplicate locales caused in case the i18n returns symbols
Aug 5, 2012
9c6a0e9
Merge branch 'hotfix/duplicated_values_in_available_locales'
Aug 5, 2012
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 lib/copycopter_client/i18n_backend.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def translate(locale, key, options = {})
# Returns locales availabile for this Copycopter project.
# @return [Array<String>] available locales
def available_locales
cached_locales = cache.keys.map { |key| key.split('.').first }
cached_locales = cache.keys.map { |key| key.split('.').first.to_sym }
(cached_locales + super).uniq.map { |locale| locale.to_sym }
end

Expand Down
8 changes: 8 additions & 0 deletions spec/copycopter_client/i18n_backend_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ def build_backend
subject.available_locales.should =~ [:en, :es, :fr]
end

it "handles symbol locales from i18n gem" do
YAML.stubs(:load_file => { :en => { 'key' => 'value' } })
I18n.stubs(:load_path => ["test.yml"])

cache['en.key'] = ''

subject.available_locales.should =~ [:en]
end
it "queues missing keys with default" do
default = 'default value'

Expand Down