Skip to content
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

Fixes #162 - Undefined method 'id' for False class error in view partial #169

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fixes #162 - Undefined method 'id' for False class error in view partial #169

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
13 changes: 5 additions & 8 deletions app/controllers/lit/localization_keys_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,18 +119,15 @@ def grouped_localizations
def localization_for(locale, localization_key)
@_localization_for ||= {}
key = [locale, localization_key]
ret = @_localization_for[key]
if ret == false
nil
elsif ret.nil?
if @_localization_for.key?(key)
@_localization_for[key]
else
ret = grouped_localizations[localization_key][locale]
unless ret
Lit.init.cache.refresh_key("#{locale}.#{localization_key.localization_key}")
ret = localization_key.localizations.where(locale_id: Lit.init.cache.find_locale(locale).id).first
ret = localization_key.localizations.find_by(locale_id: Lit.init.cache.find_locale(locale).id)
end
@_localization_for[key] = ret ? ret : false
else
ret
@_localization_for[key] = ret ? ret : nil
end
end
helper_method :localization_for
Expand Down
10 changes: 7 additions & 3 deletions app/views/lit/localization_keys/_localizations_list.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,13 @@
<%- available_locales.each do |locale| %>
<%- localization = localization_for(locale, lk) %>
<tr>
<td class="localization_row" data-id="<%= localization.id%>" data-edit="<%= edit_localization_key_localization_path(lk, localization, format: :js) %>" data-editing=0 data-content="">
<%= render partial: 'localization_row', locals: {localization: Lit.init.cache["#{locale}.#{lk.localization_key}"]} %>
</td>
<% if localization %>
<td class="localization_row" data-id="<%= localization.id%>" data-edit="<%= edit_localization_key_localization_path(lk, localization, format: :js) %>" data-editing=0 data-content="">
<%= render partial: 'localization_row', locals: {localization: Lit.init.cache["#{locale}.#{lk.localization_key}"]} %>
</td>
<% else %>
<td class="localization_row"><em>missing</em></td>
<% end %>
<td class="locale_row text-center">
<%= EmojiFlag.new(locale) %>
<%= locale %>
Expand Down
1 change: 1 addition & 0 deletions lib/lit/cache.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ def localization_keys

def find_localization(locale, key_without_locale, value: nil, force_array: false, update_value: false, default_fallback: false)
return nil if value.is_a?(Hash)

full_key = "#{locale}.#{key_without_locale}"
ActiveRecord::Base.transaction do
localization_key = find_localization_key(key_without_locale)
Expand Down