Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

clarify header options

as-op49ac8b01dd67
diff --git a/modules/meeting/app/components/meetings/exports/modal_dialog_component.html.erb b/modules/meeting/app/components/meetings/exports/modal_dialog_component.html.erb
index 095e70011eb..2a15af08b00 100644
--- a/modules/meeting/app/components/meetings/exports/modal_dialog_component.html.erb
+++ b/modules/meeting/app/components/meetings/exports/modal_dialog_component.html.erb
@@ -127,12 +127,12 @@
) do
render Primer::Alpha::TextField.new(
id: "pdf_header_left",
- name: :page_header_left,
- label: I18n.t("meeting.export_pdf_dialog.page_header_left.label"),
- caption: I18n.t("meeting.export_pdf_dialog.page_header_left.caption"),
+ name: :first_page_header_left,
+ label: I18n.t("meeting.export_pdf_dialog.first_page_header_left.label"),
+ caption: I18n.t("meeting.export_pdf_dialog.first_page_header_left.caption"),
input_width: :large,
visually_hide_label: false,
- value: default_page_header_left_text
+ value: default_first_page_header_left_text
)
end
modal_body.with_row(
diff --git a/modules/meeting/app/components/meetings/exports/modal_dialog_component.rb b/modules/meeting/app/components/meetings/exports/modal_dialog_component.rb
index 739652e529b..d34a4f26f39 100644
--- a/modules/meeting/app/components/meetings/exports/modal_dialog_component.rb
+++ b/modules/meeting/app/components/meetings/exports/modal_dialog_component.rb
@@ -73,7 +73,7 @@ module Meetings
@meeting.author&.name || User.current.name
end
- def default_page_header_left_text
+ def default_first_page_header_left_text
@meeting.project&.name || Setting.software_name
end
end
diff --git a/modules/meeting/app/workers/meetings/pdf/minutes/exporter.rb b/modules/meeting/app/workers/meetings/pdf/minutes/exporter.rb
index 2b8187c1ba5..30a272c6e30 100644
--- a/modules/meeting/app/workers/meetings/pdf/minutes/exporter.rb
+++ b/modules/meeting/app/workers/meetings/pdf/minutes/exporter.rb
@@ -134,7 +134,7 @@ module Meetings::PDF::Minutes
end
def page_header_text
- options[:page_header_left] || ""
+ options[:first_page_header_left] || ""
end
def write_minutes_headers
diff --git a/modules/meeting/config/locales/crowdin/de.yml b/modules/meeting/config/locales/crowdin/de.yml
index b0cc15d7d39..bcadf22c233 100644
--- a/modules/meeting/config/locales/crowdin/de.yml
+++ b/modules/meeting/config/locales/crowdin/de.yml
@@ -256,6 +256,9 @@ de:
minutes:
label: Protokoll
caption: Die Protokollvorlage eignet sich für Besprechungen, die abgeschlossen sind und archiviert werden.
+ first_page_header_left:
+ label: Kopfzeile links für erste Seite
+ caption: Dieser Text wird auf der ersten Seite links in der Kopfzeile angezeigt.
author:
label: Verfasser:in
caption: Verfasser:in des Protokolls wird in der Unterüberschrift angezeigt.
diff --git a/modules/meeting/config/locales/en.yml b/modules/meeting/config/locales/en.yml
index caaa032c9c6..a26063f75bf 100644
--- a/modules/meeting/config/locales/en.yml
+++ b/modules/meeting/config/locales/en.yml
@@ -277,9 +277,9 @@ en:
minutes:
label: Minutes
caption: The minutes template is suitable for meetings that have been closed and are archived.
- page_header_left:
- label: Page header left
- caption: This text will appear on every page at the left of the header on the first page.
+ first_page_header_left:
+ label: First page header left
+ caption: This text will appear on the first page at the left of the header.
author:
label: Author
caption: The author of the minutes will be displayed in the subtitle.