FIX: Customizing site texts ignored current locale for _MF keys

app/controllers/admin/site_texts_controller.rb

@@ -71,7 +71,7 @@ class Admin::SiteTextsController < Admin::AdminController
 
     def record_for(k, value = nil)
       if k.ends_with?("_MF")
-        ovr = TranslationOverride.where(translation_key: k).pluck(:value)
+        ovr = TranslationOverride.where(translation_key: k, locale: I18n.locale).pluck(:value)
         value = ovr[0] if ovr.present?
       end
 

spec/controllers/admin/site_texts_controller_spec.rb

@@ -125,6 +125,34 @@ describe Admin::SiteTextsController do
         expect(log.new_value).to eq(original_title)
         expect(log.action).to eq(UserHistory.actions[:change_site_text])
       end
+
+      it 'returns site texts for the correct locale' do
+        SiteSetting.default_locale = :ru
+
+        ru_title = 'title ru'
+        ru_mf_text = 'ru {NUM_RESULTS, plural, one {1 result} other {many} }'
+
+        put :update, params: { id: 'title', site_text: { value: ru_title } }, format: :json
+        put :update, params: { id: 'js.topic.read_more_MF', site_text: { value: ru_mf_text } }, format: :json
+
+        get :show, params: { id: 'title' }, format: :json
+        json = ::JSON.parse(response.body)
+        expect(json['site_text']['value']).to eq(ru_title)
+
+        get :show, params: { id: 'js.topic.read_more_MF' }, format: :json
+        json = ::JSON.parse(response.body)
+        expect(json['site_text']['value']).to eq(ru_mf_text)
+
+        SiteSetting.default_locale = :en
+
+        get :show, params: { id: 'title' }, format: :json
+        json = ::JSON.parse(response.body)
+        expect(json['site_text']['value']).to_not eq(ru_title)
+
+        get :show, params: { id: 'js.topic.read_more_MF' }, format: :json
+        json = ::JSON.parse(response.body)
+        expect(json['site_text']['value']).to_not eq(ru_mf_text)
+      end
     end
   end