From 843f81113ebe71fd725210c5a382268333865cc7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 25 Feb 2023 00:10:50 +0100 Subject: [PATCH] Projects: rename Board to Column in interface and improve consistency (#22767) --- options/locale/locale_en-US.ini | 32 +++++++++++++------------- templates/projects/new.tmpl | 24 ++++++++++--------- templates/projects/view.tmpl | 38 +++++++++++++++---------------- templates/repo/projects/new.tmpl | 6 ++--- templates/repo/projects/view.tmpl | 38 +++++++++++++++---------------- 5 files changed, 70 insertions(+), 68 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index fbd30680534..c818b0dcc56 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -57,7 +57,7 @@ new_mirror = New Mirror new_fork = New Repository Fork new_org = New Organization new_project = New Project -new_project_board = New Project board +new_project_column = New Column manage_org = Manage Organizations admin_panel = Site Administration account_settings = Account Settings @@ -1203,35 +1203,35 @@ projects.description = Description (optional) projects.description_placeholder = Description projects.create = Create Project projects.title = Title -projects.new = New project +projects.new = New Project projects.new_subheader = Coordinate, track, and update your work in one place, so projects stay transparent and on schedule. projects.create_success = The project '%s' has been created. projects.deletion = Delete Project projects.deletion_desc = Deleting a project removes it from all related issues. Continue? projects.deletion_success = The project has been deleted. -projects.edit = Edit Projects +projects.edit = Edit Project projects.edit_subheader = Projects organize issues and track progress. -projects.modify = Update Project +projects.modify = Edit Project projects.edit_success = Project '%s' has been updated. projects.type.none = "None" projects.type.basic_kanban = "Basic Kanban" projects.type.bug_triage = "Bug Triage" -projects.template.desc = "Project template" +projects.template.desc = "Template" projects.template.desc_helper = "Select a project template to get started" projects.type.uncategorized = Uncategorized -projects.board.edit = "Edit board" -projects.board.edit_title = "New Board Name" -projects.board.new_title = "New Board Name" -projects.board.new_submit = "Submit" -projects.board.new = "New Board" -projects.board.set_default = "Set Default" -projects.board.set_default_desc = "Set this board as default for uncategorized issues and pulls" -projects.board.delete = "Delete Board" -projects.board.deletion_desc = "Deleting a project board moves all related issues to 'Uncategorized'. Continue?" -projects.board.color = "Color" +projects.column.edit = "Edit Column" +projects.column.edit_title = "Name" +projects.column.new_title = "Name" +projects.column.new_submit = "Create Column" +projects.column.new = "New Column" +projects.column.set_default = "Set Default" +projects.column.set_default_desc = "Set this column as default for uncategorized issues and pulls" +projects.column.delete = "Delete Column" +projects.column.deletion_desc = "Deleting a project column moves all related issues to 'Uncategorized'. Continue?" +projects.column.color = "Color" projects.open = Open projects.close = Close -projects.board.assigned_to = Assigned to +projects.column.assigned_to = Assigned to projects.card_type.desc = "Card Previews" projects.card_type.images_and_text = "Images and Text" projects.card_type.text_only = "Text Only" diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl index 19bf5036923..c96f948dedf 100644 --- a/templates/projects/new.tmpl +++ b/templates/projects/new.tmpl @@ -31,14 +31,16 @@ {{if not .PageIsEditProjects}} - -
- -
{{.locale.Tr "repo.projects.template.desc_helper"}}
-
- {{range $element := .BoardTypes}} -
{{$.locale.Tr $element.Translation}}
- {{end}} +
+ +
+ +
{{.locale.Tr "repo.projects.template.desc_helper"}}
+
+ {{range $element := .ProjectTypes}} +
{{$.locale.Tr $element.Translation}}
+ {{end}} +
{{end}} @@ -47,14 +49,14 @@
{{if .PageIsEditProjects}} - + {{.locale.Tr "repo.milestones.cancel"}} - {{else}} - {{end}} diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index b25cf2526eb..3d0bea35d51 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -5,21 +5,21 @@
{{if .CanWriteProjects}} - {{.locale.Tr "new_project_board"}} + {{.locale.Tr "new_project_column"}} {{end}}