diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 647cd7893..f3e56f1a8 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -63,14 +63,14 @@ def index attendance_type: [ { value: 'in person', - label: "**In-person only:** I am planning to attend #{convention_name} in-person" + label: "In-person only: I am planning to attend #{convention_name} in-person" }, { value: 'virtual', - label: "**Virtual only:** I am not planning to attend #{convention_name} in-person, and would like to be a virtual participant on virtual-based items only (via Zoom or similar technology)." + label: "Online only: I am not planning to attend #{convention_name} in-person, and would like to be a online participant on online-based items only (via Zoom or similar technology)." }, { value: 'hybrid', - label: "**In-person and virtual:** I am planning to attend #{convention_name} in-person, but would also like to be considered for virtual panels." + label: "In-person and online: I am planning to attend #{convention_name} in-person, but would also like to be considered for online panels." }, ], age_restrictions: ::AgeRestriction.all, diff --git a/app/javascript/constants/strings.js b/app/javascript/constants/strings.js index f9875af78..1bdd33c83 100644 --- a/app/javascript/constants/strings.js +++ b/app/javascript/constants/strings.js @@ -286,8 +286,8 @@ module.exports = { }, PERSON_ATTENDANCE_TYPE: { 'in person': "In Person", - hybrid: "In Person AND Virtually", - virtual: "Virtually", + hybrid: "In Person AND Online", + virtual: "Online", }, PAGE_CONTENT_SAVE_SUCCESS: "Page content saved successfully", @@ -302,7 +302,7 @@ module.exports = { unknown: "Unknown", in_person: "In Person", hybrid: "Hybrid", - virtual: "Virtual" + virtual: "Online" }, SESSION_STATUS: { draft: "Draft", @@ -342,7 +342,7 @@ module.exports = { }, EVENT_SETTINGS_MUST_RELOAD: "*** Changes to these settings will only take effect after you reload your browser page. ***", CONFIGURATION_LABEL_OVERRIDES: { - event_virtual: "Does this event include a virtual component?", + event_virtual: "Does this event include an online component?", clyde_base_url: "Base URL for Clyde", profile_show_info_demographic_community: "Show Demographics, Community, and Info in Profile" } diff --git a/app/javascript/dashboard/dashboard.vue b/app/javascript/dashboard/dashboard.vue index 928f88b5d..d3daa601a 100644 --- a/app/javascript/dashboard/dashboard.vue +++ b/app/javascript/dashboard/dashboard.vue @@ -21,7 +21,7 @@ Update your name(s), pronouns, email address, bio, and social media as needed
  • - If you’re not going to be attending the convention in-person, please let us know the timezone that you will be in when you attend virtually. + If you’re not going to be attending the convention in-person, please let us know the timezone that you will be in when you attend online.
    • @@ -61,7 +61,7 @@ Select sessions by using the slider to the right of the description. Your selections will save automatically.
  • - While some items are marked or otherwise described as Virtual, many we’re not sure if they will be taking place in-person or online, so everyone should feel free to sign up for items not marked either way. + While some items are marked or otherwise described as online, many we’re not sure if they will be taking place in-person or online, so everyone should feel free to sign up for items not marked either way.
    • diff --git a/app/javascript/profile/availability_and_interests.vue b/app/javascript/profile/availability_and_interests.vue index c9d27e53e..214f9923a 100644 --- a/app/javascript/profile/availability_and_interests.vue +++ b/app/javascript/profile/availability_and_interests.vue @@ -13,7 +13,7 @@

    Under each day, highlight (click and drag) the times of day that you are available for programming in the calendar view below. You can create multiple blocks of time per day. The in-person convention time is currently displayed. - If you will be attending virtually, and want to enter your availability in that time zone, + If you will be attending online, and want to enter your availability in that time zone, select that option from below the calendar. The time is displayed in the convention time zone, which is currently {{timezone}}. diff --git a/app/javascript/profile/person_details.vue b/app/javascript/profile/person_details.vue index a7b00d409..8ef5e6707 100644 --- a/app/javascript/profile/person_details.vue +++ b/app/javascript/profile/person_details.vue @@ -34,13 +34,13 @@

    -
    Virtual
    +
    Online
    -
    Virtual
    +
    Online
    I plan to attend the convention:
    at.value === "in_person") || { - label: "**In-person only:** I am planning to attend in-person", + label: "In-person only: I am planning to attend in-person", value: "in_person" } }, virtualLabel() { return this.currentSettings?.attendance_type?.find(at => at.value === "virtual") || { - label: "**Virtual only:** I am not planning to attend in-person, and would like to be a virtual participant on virtual-based items only (via Zoom or similar technology).", + label: "Online only: I am not planning to attend in-person, and would like to be an online participant on online-based items only (via Zoom or similar technology).", value: "virtual", }; }, hybridLabel() { return this.currentSettings?.attendance_type?.find(at => at.value === "hybrid") || { - label: "**In-person and virtual:** I am planning to attend in-person, but would also like to be considered for virtual panels.", + label: "In-person and online: I am planning to attend in-person, but would also like to be considered for online panels.", value: "hybrid" } } diff --git a/app/javascript/venues/room.js b/app/javascript/venues/room.js index 09f656921..650e11ebf 100644 --- a/app/javascript/venues/room.js +++ b/app/javascript/venues/room.js @@ -29,7 +29,7 @@ export const room_columns = [ }, { key: 'is_virtual', - label: 'Is Virtual', + label: 'Is Online', type: "radio", choices: [{label: "Yes", value: "true"}, {label: "No", value: "false"}], },