Update gitignore
Wrap has_one conditions in a lambda so that if the current locale changes the association is still valid