Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Felix Niklas 2015-11-18 09:20:05 +01:00
commit 341088625b
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/models/translation.rb
View file

@ -44,16 +44,17 @@ dedicated:
)
fail "Can't load translations from #{url}: #{result.error}" if !result.success?
translations = Translation.where(locale: locale).all
ActiveRecord::Base.transaction do
result.data.each {|translation_raw|
# handle case insensitive sql
exists = Translation.where(locale: translation_raw['locale'], format: translation_raw['format'], source: translation_raw['source'])
translation = nil
exists.each {|item|
if item.source == translation_raw['source']
translations.each {|item|
next if item.format != translation_raw['format']
next if item.source != translation_raw['source']
translation = item
end
break
}
if translation