replace wagon specific correspondence_language with core language

app/domain/pbs/export/tabular/people/households_full.rb

@@ -6,7 +6,7 @@
 module Pbs::Export::Tabular::People
   class HouseholdsFull < Export::Tabular::People::Households
     ADDITIONAL_PERSON_ATTRIBUTES =
-      %i[correspondence_language prefers_digital_correspondence kantonalverband_id id
+      %i[language prefers_digital_correspondence kantonalverband_id id
         layer_group_id company_name company].freeze
 
     def person_attributes

app/domain/pbs/export/tabular/people/participation_nds_row.rb

@@ -9,11 +9,11 @@ module Pbs::Export::Tabular::People::ParticipationNdsRow
   extend ActiveSupport::Concern
 
   included do
-    alias_method_chain :first_language, :correspondence_language
+    alias_method_chain :first_language, :language
   end
 
-  def first_language_with_correspondence_language
-    lang = entry.correspondence_language.presence
-    lang ? lang.upcase : 'DE'
+  # TBD: move to youth wagon? https://github.com/hitobito/hitobito_youth/blob/3322054e2d64db19f8b049773e61f68e7f614546/app/domain/export/tabular/people/participation_nds_row.rb#L70
+  def first_language_with_language
+    entry.language.presence&.upcase || 'DE'
   end
 end

app/domain/pbs/export/tabular/people/people_address.rb

@@ -28,7 +28,7 @@ def initialize_with_kv(list)
 
           def person_attributes_with_title
             person_attributes_without_title +
-            [:title, :salutation, :correspondence_language, :prefers_digital_correspondence,
+            [:title, :salutation, :language, :prefers_digital_correspondence,
              :kantonalverband_id, :id, :layer_group_id]
           end
         end

app/helpers/pbs/contact_attrs/control_builder.rb

@@ -22,8 +22,7 @@ def initialize_with_required_contact_attrs(form, event)
         return if @event.persisted? || @event.event.type != 'Event::Camp'
 
         @event.event.required_contact_attrs += %w(address zip_code town country gender birthday
-                                                  nationality_j_s ahv_number
-                                                  correspondence_language)
+                                                  nationality_j_s ahv_number language)
       end
 
       def radio_buttons_with_supercamp_flag(*args)

app/jobs/event/camp_reminder_job.rb

@@ -32,7 +32,7 @@ def camps_to_remind
   def send_reminder(camp)
     recipients = fetch_recipients(camp)
     recipients.each do |person|
-      I18n.locale = person.correspondence_language.presence || I18n.default_locale
+      I18n.locale = person.language
       Event::CampMailer.remind(camp, person).deliver_now
     end
     camp.update_column(:camp_reminder_sent, true) if recipients.present?

app/models/pbs/event/participation_contact_data.rb

@@ -10,7 +10,7 @@ module Pbs::Event::ParticipationContactData
 
   included do
     Event::ParticipationContactData.contact_attrs << :title << :salutation <<
-     :correspondence_language << :grade_of_school << :entry_date << :leaving_date
+     :language << :grade_of_school << :entry_date << :leaving_date
 
     delegate(*Event::ParticipationContactData.contact_attrs, to: :person)
   end

app/models/pbs/person.rb

@@ -56,7 +56,7 @@ module Pbs::Person
   extend ActiveSupport::Concern
 
   included do
-    Person::PUBLIC_ATTRS << :title << :salutation << :correspondence_language <<
+    Person::PUBLIC_ATTRS << :title << :salutation << :language <<
         :prefers_digital_correspondence << :kantonalverband_id
     Person::ADDRESS_ATTRS << "prefers_digital_correspondence"
 
@@ -73,12 +73,6 @@ module Pbs::Person
               inclusion: { in: ->(_) { Salutation.available.keys },
                            allow_blank: true }
 
-    validates :correspondence_language,
-              inclusion: { in: lambda do |_|
-                                 Settings.application.languages.to_hash.keys.collect(&:to_s)
-                               end,
-                           allow_blank: true }
-
     validates :entry_date, :leaving_date,
               timeliness: { type: :date, allow_blank: true, before: Date.new(9999, 12, 31) }
 

app/serializers/pbs/mailing_list_subscriber_serializer.rb

@@ -10,7 +10,8 @@ module Pbs::MailingListSubscriberSerializer
 
   included do
     schema do
-      property :correspondence_language, item.correspondence_language
+      # TBD: keep this fields name?
+      property :correspondence_language, item.language
       property :kantonalverband_short_name, item.kantonalverband.short_name
     end
   end

app/serializers/pbs/person_serializer.rb

@@ -10,7 +10,8 @@ module Pbs::PersonSerializer
 
   included do
     extension(:details) do |_|
-      map_properties :pbs_number, :salutation_value, :correspondence_language,
+      # TBD: keep fields name?
+      map_properties :pbs_number, :salutation_value, :language,
                      :prefers_digital_correspondence, :grade_of_school, :brother_and_sisters,
                      :entry_date, :leaving_date
     end

app/views/csv_imports/_special_fields_pbs.html.haml

@@ -4,4 +4,3 @@
 -#  https://github.com/hitobito/hitobito_pbs.
 
 = csv_field_documentation(:salutation, Salutation.available)
-= csv_field_documentation(:correspondence_language, Settings.application.languages.to_hash)

app/views/event/participation_contact_datas/_fields_pbs.html.haml

@@ -8,13 +8,6 @@
     = f.labeled_input_field :title
   - if entry.show_attr?(:salutation)
     = f.labeled_collection_select :salutation, Salutation.available, :first, :last, { include_blank: true }, class: 'span6'
-  - if entry.show_attr?(:correspondence_language)
-    = f.labeled_collection_select(:correspondence_language,
-                                  Settings.application.languages.to_hash,
-                                  :first,
-                                  :last,
-                                  { prompt: true },
-                                  class: 'span6')
   - if entry.show_attr?(:grade_of_school)
     = f.labeled_input_field :grade_of_school, help_inline: t('people.fields_pbs.non_automatic_field')
 

app/views/people/_details_pbs.html.haml

@@ -3,7 +3,7 @@
 -#  or later. See the COPYING file at the top-level directory or at
 -#  https://github.com/hitobito/hitobito_pbs.
 
-= render_attrs(entry, :pbs_number, :salutation, :correspondence_language,
+= render_attrs(entry, :pbs_number, :salutation, :language,
                       :grade_of_school, :brother_and_sisters)
 
 = render_attrs(entry, :entry_date, :leaving_date)

app/views/people/_fields_pbs.html.haml

@@ -6,12 +6,6 @@
 = field_set_tag do
   = f.labeled_input_field :title
   = f.labeled_collection_select :salutation, Salutation.available, :first, :last, { include_blank: true }, class: 'span6'
-  = f.labeled_collection_select(:correspondence_language,
-                                Settings.application.languages.to_hash,
-                                :first,
-                                :last,
-                                { prompt: true },
-                                class: 'span6')
 
   = f.labeled_input_field :grade_of_school, help_inline: t('.non_automatic_field')
 

config/locales/models.pbs.de.yml

@@ -1200,7 +1200,6 @@ de:
         entry_date: Eintrittsdatum
         leaving_date: Austrittsdatum
         j_s_number: J+S Personennummer
-        correspondence_language: Korrespondenzsprache
         brother_and_sisters: Geschwister
         relations_to_tails: Geschwister
         kv: Kantonalverband

config/locales/models.pbs.fr.yml

@@ -1178,7 +1178,6 @@ fr:
         entry_date: Membre depuis
         leaving_date: Date de départ
         j_s_number: N° personnel J+S
-        correspondence_language: Langue de correspondance
         brother_and_sisters: Frères et soeurs
         relations_to_tails: fratrie
         kv: Assocation cantonale

config/locales/models.pbs.it.yml

@@ -1192,7 +1192,6 @@ it:
         entry_date: Data d'entrata
         leaving_date: Data d'uscita
         j_s_number: Numero personale G+S
-        correspondence_language: Lingua di corrispondenza
         brother_and_sisters: Fratelli
         relations_to_tails: Fratelli
         kv: Associazione cantonale

config/settings.yml

@@ -70,3 +70,7 @@ groups:
     enabled: true
   statistics:
     enabled: false
+
+# Not needed
+person_language:
+  enabled: true

db/migrate/20230915105810_replace_correspondance_language_with_core_language.rb

@@ -0,0 +1,7 @@
+class ReplaceCorrespondanceLanguageWithCoreLanguage < ActiveRecord::Migration[6.1]
+  def change
+    Person.where(correspondence_language: nil).update_all(correspondence_language: :de)
+    Person.update_all("language = correspondence_language")
+    remove_column :people, :correspondence_language, :string, limit: 5
+  end
+end

lib/hitobito_pbs/wagon.rb

@@ -112,7 +112,7 @@ class Wagon < Rails::Engine
 
       ### controllers
       PeopleController.permitted_attrs += [:salutation, :title, :grade_of_school, :entry_date,
-                                           :leaving_date, :j_s_number, :correspondence_language,
+                                           :leaving_date, :j_s_number,
                                            :prefers_digital_correspondence, :brother_and_sisters]
       Event::KindsController.permitted_attrs += [:documents_text, :campy, :can_have_confirmations,
                                                  :confirmation_name]

spec/domain/export/tabular/people/households_spec.rb

@@ -16,7 +16,7 @@
   context 'header' do
     it 'includes name, address attributes and layer group columns' do
       expect(exporter.attributes).to eq [:salutation, :name, :address, :zip_code, :town,
-                                         :country, :layer_group, :correspondence_language,
+                                         :country, :layer_group, :language,
                                          :prefers_digital_correspondence, :kantonalverband_id,
                                          :id, :layer_group_id, :company_name, :company]
     end
@@ -35,7 +35,7 @@
           nil,
           nil,
           "Pfadibewegung Schweiz",
-          nil,
+          "de",
           "nein",
           "CH",
           337180612,
@@ -68,7 +68,7 @@
           nil,
           nil,
           "Pfadibewegung Schweiz",
-          nil,
+          "de",
           "ja",
           "CH",
           337180612,

spec/domain/export/tabular/people/participation_nds_row_spec.rb

@@ -14,12 +14,12 @@
   let(:row) { described_class.new(participation) }
 
   context 'with correspondence language' do
-    let(:person) { Fabricate(:person, correspondence_language: 'it') }
+    let(:person) { Fabricate(:person, language: 'it') }
     it { expect(row.fetch(:first_language)).to eq 'IT' }
   end
 
   context 'without correspondence language' do
-    let(:person) { Fabricate(:person, correspondence_language: nil) }
+    let(:person) { Fabricate(:person, language: nil) }
     it { expect(row.fetch(:first_language)).to eq 'DE' }
   end
 end

spec/regressions/event/participations_contact_datas_controller_spec.rb

@@ -45,7 +45,6 @@
       end
 
       expect(dom).to have_selector("select#event_participation_contact_data_salutation")
-      expect(dom).to have_selector("select#event_participation_contact_data_correspondence_language")
 
     end