From 1db1c114e2d916d7806edd784e17b7c30b1dd780 Mon Sep 17 00:00:00 2001
From: Jan Kessler <jakessle@uni-mainz.de>
Date: Mon, 29 Apr 2024 14:18:54 +0200
Subject: [PATCH] final polish (including translated strings)

---
 app/assets/locales/en.json                               | 3 +++
 .../components/rooms/room/room_settings/RoomSettings.jsx | 2 +-
 .../components/rooms/room/room_settings/ServerTagRow.jsx | 9 +++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/assets/locales/en.json b/app/assets/locales/en.json
index edd28bdebd6..dd592c1e427 100644
--- a/app/assets/locales/en.json
+++ b/app/assets/locales/en.json
@@ -163,6 +163,9 @@
       "wrong_access_code": "Wrong Access Code",
       "generate_viewers_access_code": "Generate access code for viewers",
       "generate_mods_access_code": "Generate access code for moderators",
+      "server_tag": "Select a server type for this room",
+      "server_tag_desired": "Desired",
+      "server_tag_required": "Required",
       "are_you_sure_delete_room": "Are you sure you want to delete this room?"
     }
   },
diff --git a/app/javascript/components/rooms/room/room_settings/RoomSettings.jsx b/app/javascript/components/rooms/room/room_settings/RoomSettings.jsx
index 3f579abd581..6abf56b499f 100644
--- a/app/javascript/components/rooms/room/room_settings/RoomSettings.jsx
+++ b/app/javascript/components/rooms/room/room_settings/RoomSettings.jsx
@@ -73,7 +73,7 @@ export default function RoomSettings() {
                   currentTag={roomSetting?.data?.serverTag}
                   tagRequired={roomSetting?.data?.serverTagRequired === 'true'}
                   allowedTags={currentUser?.allowedTags}
-                  description="Select a specialized server type for this room"
+                  description={t('room.settings.server_tag')}
                 />
               )}
             </Col>
diff --git a/app/javascript/components/rooms/room/room_settings/ServerTagRow.jsx b/app/javascript/components/rooms/room/room_settings/ServerTagRow.jsx
index 96e5e74cd37..1fce2eb7244 100644
--- a/app/javascript/components/rooms/room/room_settings/ServerTagRow.jsx
+++ b/app/javascript/components/rooms/room/room_settings/ServerTagRow.jsx
@@ -15,6 +15,7 @@
 // with Greenlight; if not, see <http://www.gnu.org/licenses/>.
 
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 import PropTypes from 'prop-types';
 import {
   Row, Col, Dropdown, ButtonGroup, ToggleButton,
@@ -25,6 +26,7 @@ export default function ServerTagRow({
   updateMutation: useUpdateAPI, currentTag, tagRequired, allowedTags, description,
 }) {
   const updateAPI = useUpdateAPI();
+  const { t } = useTranslation();
 
   /* eslint-disable no-param-reassign */
   const serverTagsMap = process.env.SERVER_TAG_NAMES.split(',').reduce((map, pair) => {
@@ -63,6 +65,7 @@ export default function ServerTagRow({
             <Dropdown.Item
               key=""
               value={process.env.DEFAULT_TAG_NAME}
+              disabled={updateAPI.isLoading}
               onClick={() => updateAPI.mutate({ settingName: 'serverTag', settingValue: '' })}
             >
               {process.env.DEFAULT_TAG_NAME}
@@ -79,11 +82,12 @@ export default function ServerTagRow({
             variant="outline-success"
             name="radio"
             checked={tagRequired === false}
+            disabled={updateAPI.isLoading}
             onChange={() => {
               updateAPI.mutate({ settingName: 'serverTagRequired', settingValue: false });
             }}
           >
-            Desired
+            {t('room.settings.server_tag_desired')}
           </ToggleButton>
           <ToggleButton
             key="required"
@@ -92,11 +96,12 @@ export default function ServerTagRow({
             variant="outline-danger"
             name="radio"
             checked={tagRequired === true}
+            disabled={updateAPI.isLoading}
             onChange={() => {
               updateAPI.mutate({ settingName: 'serverTagRequired', settingValue: true });
             }}
           >
-            Required
+            {t('room.settings.server_tag_required')}
           </ToggleButton>
         </ButtonGroup>
       </Col>