From b4d7cdbba20954955e9d57e8017923c93da9f490 Mon Sep 17 00:00:00 2001 From: Felix Eckhofer <felix@eckhofer.com> Date: Thu, 26 Dec 2024 18:37:53 +0100 Subject: [PATCH] Show user languages only for "more languages" track --- app/views/shared/_user_languages.erb | 2 +- .../20241226172555_add_more_languages_to_conferences.rb | 5 +++++ db/schema.rb | 3 ++- db/seeds.rb | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20241226172555_add_more_languages_to_conferences.rb diff --git a/app/views/shared/_user_languages.erb b/app/views/shared/_user_languages.erb index 9d2be9b..23d3c4a 100644 --- a/app/views/shared/_user_languages.erb +++ b/app/views/shared/_user_languages.erb @@ -1,4 +1,4 @@ -<% if !user.languages_from.blank? || !user.languages_to.blank? %><small class="text-2xs uppercase font-light bg-black/10 rounded-sm p-1 ml-1" aria-label="Languages <%= user.name %> can translate" title="Languages <%= user.name %> can translate"> +<% if session.conference.more_languages && (!user.languages_from.blank? || !user.languages_to.blank?) %><small class="text-2xs uppercase font-light bg-black/10 rounded-sm p-1 ml-1" aria-label="Languages <%= user.name %> can translate" title="Languages <%= user.name %> can translate"> <% if !user.languages_from.blank? && !user.languages_from.split(',').include?(session.language) %> <span aria-help="User doesn't understand the language of the talk" title="User doesn't understand the language of the talk">⚠️</span> <% end %> diff --git a/db/migrate/20241226172555_add_more_languages_to_conferences.rb b/db/migrate/20241226172555_add_more_languages_to_conferences.rb new file mode 100644 index 0000000..753309e --- /dev/null +++ b/db/migrate/20241226172555_add_more_languages_to_conferences.rb @@ -0,0 +1,5 @@ +class AddMoreLanguagesToConferences < ActiveRecord::Migration[7.1] + def change + add_column :conferences, :more_languages, :boolean, null: false, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index f2d669d..8af166c 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.1].define(version: 2024_12_25_223515) do +ActiveRecord::Schema[7.1].define(version: 2024_12_26_172555) do create_table "assignments", force: :cascade do |t| t.integer "user_id", null: false t.integer "session_id", null: false @@ -43,6 +43,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_12_25_223515) do t.string "slug" t.string "import_job_class" t.string "time_zone" + t.boolean "more_languages", default: false, null: false end create_table "crono_jobs", force: :cascade do |t| diff --git a/db/seeds.rb b/db/seeds.rb index 5597543..0bd398e 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -65,6 +65,7 @@ end Conference.find_or_create_by(slug: "38c3-more").tap do |c| c.name = "38th Chaos Communication Congress (more languages)" + c.more_languages = true c.time_zone = "Berlin" c.starts_at = DateTime.parse("27 December 2024 10:30 CET") c.ends_at = DateTime.parse("30 December 2024 19:00 CET") -- GitLab