From 15956c20c3f9889c718761683bb89b92156ff2b6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 17 Dec 2020 09:14:21 +0100
Subject: [PATCH] Improve hints for default_phone_region

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 config/config.sample.php               | 2 +-
 core/js/setupchecks.js                 | 4 +++-
 core/js/tests/specs/setupchecksSpec.js | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 50bf46353e..ddfb26f5b6 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -202,7 +202,7 @@ $CONFIG = [
  *
  * No default value!
  */
-'default_phone_region' => 'EN',
+'default_phone_region' => 'GB',
 
 /**
  * With this setting a locale can be forced for all users. If a locale is
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index 22c8589f73..60d6350634 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -218,7 +218,9 @@
 					}
 					if (!data.isDefaultPhoneRegionSet) {
 						messages.push({
-							msg: t('core', 'Your installation has no default phone region set. This is required to be able to validate phone numbers in the profile settings without a country code. To allow numbers without a country code, please add "default_phone_region" with the respective ISO 3166-1 code of the wished region.'),
+							msg: t('core', 'Your installation has no default phone region set. This is required to validate phone numbers in the profile settings without a country code. To allow numbers without a country code, please add "default_phone_region" with the respective {linkstart}ISO 3166-1 code ↗{linkend} of the region to your config file.')
+								.replace('{linkstart}', '<a target="_blank" rel="noreferrer noopener" class="external" href="https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements">')
+								.replace('{linkend}', '</a>'),
 							type: OC.SetupChecks.MESSAGE_TYPE_INFO
 						});
 					}
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index c3cddb88a9..d801928281 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -1143,7 +1143,7 @@ describe('OC.SetupChecks tests', function() {
 
 			async.done(function( data, s, x ){
 				expect(data).toEqual([{
-					msg: 'Your installation has no default phone region set. This is required to be able to validate phone numbers in the profile settings without a country code. To allow numbers without a country code, please add "default_phone_region" with the respective ISO 3166-1 code of the wished region.',
+					msg: 'Your installation has no default phone region set. This is required to validate phone numbers in the profile settings without a country code. To allow numbers without a country code, please add "default_phone_region" with the respective <a target="_blank" rel="noreferrer noopener" class="external" href="https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements">ISO 3166-1 code ↗</a> of the region to your config file.',
 					type: OC.SetupChecks.MESSAGE_TYPE_INFO
 				}]);
 				done();