Skip to content

Rails 4 #40

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
timfjord merged 1 commit into from
Dec 16, 2013
Merged

Rails 4 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/i18n/backend/active_record.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def store_translations(locale, data, options = {})

def lookup(locale, key, scope = [], options = {})
key = normalize_flat_keys(locale, key, scope, options[:separator])
result = Translation.locale(locale).lookup(key).all
result = Translation.locale(locale).lookup(key)

if result.empty?
nil
Expand Down
9 changes: 4 additions & 5 deletions lib/i18n/backend/active_record/translation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,14 @@ class Translation < ::ActiveRecord::Base
TRUTHY_CHAR = "\001"
FALSY_CHAR = "\002"

set_table_name 'translations'
attr_protected :is_proc, :interpolations
self.table_name = 'translations'

serialize :value
serialize :interpolations, Array

class << self
def locale(locale)
scoped(:conditions => { :locale => locale.to_s })
where(:locale => locale.to_s)
end

def lookup(keys, *separator)
Expand All @@ -70,11 +69,11 @@ def lookup(keys, *separator)
end

namespace = "#{keys.last}#{I18n::Backend::Flatten::FLATTEN_SEPARATOR}%"
scoped(:conditions => ["#{column_name} IN (?) OR #{column_name} LIKE ?", keys, namespace])
where("#{column_name} IN (?) OR #{column_name} LIKE ?", keys, namespace)
end

def available_locales
Translation.find(:all, :select => 'DISTINCT locale').map { |t| t.locale.to_sym }
Translation.distinct(:locale).map { |t| t.locale.to_sym }
end
end

Expand Down