From 3f0f5e9f757e68c69a046554c658e17b51fe0281 Mon Sep 17 00:00:00 2001
From: Igor Richter <93926487+IgorCapCoder@users.noreply.github.com>
Date: Thu, 12 Oct 2023 12:16:34 +0200
Subject: [PATCH 1/2] N21-1369 fix locales (#3329)

* change tools (new) to tools
* remove duplicate language key "oldTools" and use "tools" everywhere
---
 locales/de.json          | 3 +--
 locales/en.json          | 3 +--
 locales/es.json          | 3 +--
 locales/uk.json          | 3 +--
 views/courses/course.hbs | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/locales/de.json b/locales/de.json
index aa62b14609..6405bed5de 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -992,8 +992,7 @@
 			"tab_label": {
 				"groups": "Gruppen",
 				"tasks": "Aufgaben",
-				"tools": "Tools (neu)",
-				"oldTools": "Tools",
+				"tools": "Tools",
 				"oldTopics": "Themen",
 				"topics": "Lerninhalte"
 			},
diff --git a/locales/en.json b/locales/en.json
index d8af166ef5..526a7536ba 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -992,8 +992,7 @@
 			"tab_label": {
 				"groups": "Groups",
 				"tasks": "Tasks",
-				"tools": "Tools (new)",
-				"oldTools": "Tools",
+				"tools": "Tools",
 				"oldTopics": "Topics",
 				"topics": "Learning content"
 			},
diff --git a/locales/es.json b/locales/es.json
index 097bbd9fc9..77376893ce 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -992,8 +992,7 @@
 			"tab_label": {
 				"groups": "Grupos",
 				"tasks": "Tareas",
-				"tools": "Herramientas (nuevo)",
-				"oldTools": "Herramientas",
+				"tools": "Herramientas",
 				"oldTopics": "Temas",
 				"topics": "Contenidos de aprendizaje"
 			},
diff --git a/locales/uk.json b/locales/uk.json
index 2340eaffd2..967cae688c 100644
--- a/locales/uk.json
+++ b/locales/uk.json
@@ -315,8 +315,7 @@
 			"tab_label": {
 				"groups": "Групи",
 				"tasks": "Завдання",
-				"tools": "Інструменти (новий)",
-				"oldTools": "Інструменти",
+				"tools": "Інструменти",
 				"oldTopics": "Теми",
 				"topics": "Зміст навчання"
 			},
diff --git a/views/courses/course.hbs b/views/courses/course.hbs
index de06b6a604..7ca222a5f7 100644
--- a/views/courses/course.hbs
+++ b/views/courses/course.hbs
@@ -75,7 +75,7 @@
       {{#if (getConfig "FEATURE_LTI_TOOLS_TAB_ENABLED")}}
         <button class="tab" data-testid="tools" data-tab="js-tools" type="button">
           <i class="mdi mdi-puzzle-outline" aria-hidden="true"></i>
-          <span class="text">{{$t "courses._course.tab_label.oldTools"}}</span>
+          <span class="text">{{$t "courses._course.tab_label.tools"}}</span>
         </button>
       {{/if}}
       <button class="tab" data-testid="groups" data-tab="js-groups" type="button">

From 0866f9b80f5a8943dd041808eb8e3172f4deb7f4 Mon Sep 17 00:00:00 2001
From: agnisa-cap <arne.gnisa@capgemini.com>
Date: Thu, 12 Oct 2023 15:27:36 +0200
Subject: [PATCH 2/2] N21-1314 adds a check if the course is archived. if true
 disable checkbox for videoconferences (#3332)

---
 views/courses/edit-course.hbs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/courses/edit-course.hbs b/views/courses/edit-course.hbs
index c72c73f4df..b9b024bca5 100644
--- a/views/courses/edit-course.hbs
+++ b/views/courses/edit-course.hbs
@@ -123,8 +123,8 @@
                 {{#ifConfig "FEATURE_CTL_TOOLS_TAB_ENABLED" true}}
 				{{#ifConfig "FEATURE_VIDEOCONFERENCE_ENABLED" true}}
                     <div class="form-group">
-                        <input id="activateConf" type="checkbox" name="videoconference" value="true" data-testid="videoconf_checkbox" {{#inArray "videoconference" @root.course.features}}checked{{/inArray}} {{#inArray "videoconference" @root.schoolData.features}} {{else}} disabled {{/inArray}}>
-                        <label for="activateConf">{{$t "courses._course.edit.label.activateVideoConferences"}}</label>
+                    <input id="activateConf" type="checkbox" name="videoconference" value="true" data-testid="videoconf_checkbox" {{#if @root.course.isArchived}}disabled{{/if}} {{#inArray "videoconference" @root.course.features}}checked{{/inArray}} {{#inArray "videoconference" @root.schoolData.features}} {{else}} disabled {{/inArray}}>
+                    <label for="activateConf">{{$t "courses._course.edit.label.activateVideoConferences"}}</label>
                         {{#inArray "videoconference" @root.schoolData.features}}
                         {{else}}
                             <small class="form-text text-muted">