Skip to content

Commit 9f2b613

Browse files
authored
Merge pull request #20968 from opf/bug/68825-incorrect-phrasing-copy-as-one-time-in-more-menu-of-meeting-series
[#68825] Incorrect phrasing "Copy as one-time" in More menu of meeting series
2 parents 84ec133 + e11e682 commit 9f2b613

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

modules/meeting/app/components/meetings/header_component.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
data: { turbo_stream: true }
8484
}
8585
) do |item|
86-
item.with_leading_visual_icon(icon: :copy)
86+
item.with_leading_visual_icon(icon: :duplicate)
8787
end
8888

8989
menu.with_item(

modules/meeting/app/components/meetings/header_component.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ def delete_label
145145

146146
def copy_label
147147
if @series.present?
148-
I18n.t("label_recurring_meeting_copy")
148+
I18n.t("label_recurring_meeting_duplicate")
149149
else
150-
I18n.t("button_copy")
150+
I18n.t("button_duplicate")
151151
end
152152
end
153153
end

modules/meeting/app/components/meetings/index/dialog_component.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def render?
5050
end
5151

5252
def title
53-
return I18n.t(:label_meeting_copy) if @copy_from
53+
return I18n.t(:label_meeting_duplicate) if @copy_from
5454
return I18n.t(:label_meeting_edit) if @meeting.persisted?
5555

5656
case @meeting

modules/meeting/app/components/meetings/row_component.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,14 @@ def view_meeting_series(menu)
125125
def copy_action(menu)
126126
return unless copy_allowed?
127127

128-
menu.with_item(label: I18n.t(:label_meeting_copy),
128+
menu.with_item(label: I18n.t(:label_meeting_duplicate),
129129
href: copy_project_meeting_path(project, model),
130130
content_arguments: {
131131
data: {
132132
turbo_stream: true
133133
}
134134
}) do |item|
135-
item.with_leading_visual_icon(icon: :copy)
135+
item.with_leading_visual_icon(icon: :duplicate)
136136
end
137137
end
138138

modules/meeting/config/locales/en.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ en:
132132
label_meeting_new_dynamic: "New one-time meeting"
133133
label_meeting_new_recurring: "New recurring meeting"
134134
label_meeting_create: "Create meeting"
135-
label_meeting_copy: "Copy meeting"
135+
label_meeting_duplicate: "Duplicate meeting"
136136
label_meeting_edit: "Edit Meeting"
137137
label_meeting_agenda: "Agenda"
138138
label_meeting_minutes: "Minutes"
@@ -153,7 +153,7 @@ en:
153153
label_template: "Template"
154154
label_recurring_meeting_view: "View meeting series"
155155
label_recurring_meeting_create: "Open"
156-
label_recurring_meeting_copy: "Copy as one-time"
156+
label_recurring_meeting_duplicate: "Duplicate as a one-time meeting"
157157
label_recurring_meeting_cancel: "Cancel this occurrence"
158158
label_recurring_meeting_delete: "Delete occurrence"
159159
label_recurring_meeting_restore: "Restore this occurrence"

modules/meeting/spec/components/meetings/row_component_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
let(:meeting) { build_stubbed(:meeting, project:) }
131131

132132
it "shows copy menu item" do
133-
expect(subject).to have_link "Copy meeting"
133+
expect(subject).to have_link "Duplicate meeting"
134134
end
135135
end
136136
end

modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
expect(page).to have_css(".flash", text: I18n.t("activerecord.errors.messages.error_conflict"))
286286
end
287287

288-
it "can copy the meeting via the dialog form" do
288+
it "can duplicate the meeting via the dialog form" do
289289
show_page.add_agenda_item do
290290
fill_in "Title", with: "My agenda item"
291291
fill_in "Duration", with: "25"
@@ -308,9 +308,9 @@
308308

309309
retry_block do
310310
click_on("op-meetings-header-action-trigger")
311-
click_on "Copy"
311+
click_on "Duplicate"
312312
# dynamically wait for the modal to be loaded
313-
show_page.expect_modal("Copy meeting")
313+
show_page.expect_modal("Duplicate meeting")
314314
end
315315

316316
fill_in "Title", with: ""

modules/meeting/spec/support/pages/meetings/index.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ def expect_create_new_types
103103

104104
def expect_copy_action(meeting)
105105
within more_menu(meeting) do
106-
expect(page).to have_link("Copy meeting")
106+
expect(page).to have_link("Duplicate meeting")
107107
end
108108
end
109109

110110
def expect_no_copy_action(meeting)
111111
within more_menu(meeting) do
112-
expect(page).to have_no_link("Copy meeting")
112+
expect(page).to have_no_link("Duplicate meeting")
113113
end
114114
end
115115

0 commit comments

Comments
 (0)