Skip to content

Commit

Permalink
Merge pull request #946 from PlanoramaEvents/PLAN-919-online
Browse files Browse the repository at this point in the history
PLAN-919 rename 'virtual' to 'online'
  • Loading branch information
Gailbear authored Feb 13, 2024
2 parents 2d20232 + f67a4ae commit b7ad77b
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions app/controllers/settings_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions app/javascript/constants/strings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -302,7 +302,7 @@ module.exports = {
unknown: "Unknown",
in_person: "In Person",
hybrid: "Hybrid",
virtual: "Virtual"
virtual: "Online"
},
SESSION_STATUS: {
draft: "Draft",
Expand Down Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions app/javascript/dashboard/dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
Update your name(s), pronouns, email address, bio, and social media as needed
</li>
<li v-if="eventVirtual">
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.
</li>
</ul>
</li>
Expand Down Expand Up @@ -61,7 +61,7 @@
Select sessions by using the slider to the right of the description. Your selections will save automatically.
</li>
<li v-if="eventVirtual">
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.
</li>
</ul>
</li>
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/profile/availability_and_interests.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<p>
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. <span v-if="eventVirtual" >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.
</span>
<span v-if="!eventVirtual">The time is displayed in the convention time zone, which is currently {{timezone}}.</span>
Expand Down
4 changes: 2 additions & 2 deletions app/javascript/profile/person_details.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
</div>
<div class="d-flex flex-column w-50 p-2">
<div v-if="eventVirtual && readOnly">
<h5>Virtual</h5>
<h5>Online</h5>
<dl-person :fields="['attendance_type', 'timezone']">
<template #attendance_type-val="{value}">{{PERSON_ATTENDANCE_TYPE[value]}}</template>
</dl-person>
</div>
<div v-if="eventVirtual && !readOnly">
<h5>Virtual</h5>
<h5>Online</h5>
<div><b>I plan to attend the convention:</b></div>
<b-form-radio-group
v-model="selected.attendance_type"
Expand Down
6 changes: 3 additions & 3 deletions app/javascript/surveys/question.mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,19 +126,19 @@ export const questionMixin = {
},
inPersonLabel() {
return this.currentSettings?.attendance_type?.find(at => 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"
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/venues/room.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"}],
},
Expand Down

0 comments on commit b7ad77b

Please sign in to comment.