From 3d6c0690ef6190fff274bc6d9dae6647372d7731 Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Tue, 25 Oct 2022 07:34:19 +0200
Subject: [PATCH] Restore labels for supported applications under 'OTP Policy'
 tab (#15117)

---
 .../theme/base/admin/messages/admin-messages_en.properties    | 2 ++
 .../theme/base/admin/resources/partials/otp-policy.html       | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
index 94598ae5d0..689d8910c0 100644
--- a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
+++ b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
@@ -1360,6 +1360,8 @@ authenticator.alias.tooltip=Name of the configuration
 otp-type=OTP Type
 time-based=Time Based
 counter-based=Counter Based
+totpAppFreeOTPName=FreeOTP
+totpAppGoogleName=Google Authenticator
 otp-type.tooltip=totp is Time-Based One Time Password. 'hotp' is a counter base one time password in which the server keeps a counter to hash against.
 otp-hash-algorithm=OTP Hash Algorithm
 otp-hash-algorithm.tooltip=What hashing algorithm should be used to generate the OTP.
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/otp-policy.html b/themes/src/main/resources/theme/base/admin/resources/partials/otp-policy.html
index 59037a12a2..4de910c448 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/otp-policy.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/otp-policy.html
@@ -76,7 +76,9 @@
         <div class="form-group">
             <label class="col-md-2 control-label">{{:: 'otp-supported-applications' | translate}}</label>
             <div class="col-md-6">
-                {{realm.otpSupportedApplications.join(', ')}}
+                <span data-ng-repeat="key in realm.otpSupportedApplications">
+                    {{:: key | translate}}<span data-ng-if="!$last">, </span>
+                </span>
             </div>
             <kc-tooltip>{{:: 'otp-supported-applications.tooltip' | translate}}</kc-tooltip>
         </div>