From 4e670f1597cc32a47508b5c9f0e6a079fab67a85 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Wed, 14 May 2025 16:40:11 +0300 Subject: [PATCH] Rename default_lang to diary_language_preference --- app/controllers/diary_entries_controller.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb index b1cceee8f..1625d2ef0 100644 --- a/app/controllers/diary_entries_controller.rb +++ b/app/controllers/diary_entries_controller.rb @@ -87,8 +87,8 @@ class DiaryEntriesController < ApplicationController def new @title = t ".title" - default_lang = current_user.preferences.find_by(:k => "diary.default_language") - lang_code = default_lang ? default_lang.v : current_user.preferred_language + diary_language_preference = current_user.preferences.find_by(:k => "diary.default_language") + lang_code = diary_language_preference ? diary_language_preference.v : current_user.preferred_language @diary_entry = DiaryEntry.new(entry_params.reverse_merge(:language_code => lang_code)) set_map_location render :action => "new" @@ -112,10 +112,10 @@ class DiaryEntriesController < ApplicationController @diary_entry.user = current_user if @diary_entry.save - default_lang = current_user.preferences.find_by(:k => "diary.default_language") - if default_lang - default_lang.v = @diary_entry.language_code - default_lang.save! + diary_language_preference = current_user.preferences.find_by(:k => "diary.default_language") + if diary_language_preference + diary_language_preference.v = @diary_entry.language_code + diary_language_preference.save! else current_user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code) end -- 2.39.5