diff --git a/config/config.sample.php b/config/config.sample.php index 50bf46353e4ce80fed3d7de241ff98d6e2647ef5..ddfb26f5b6847695c9bdc8f5239f14d9d881bdd5 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 22c8589f73b7ae377191b66c850e1d41deda94aa..60d6350634b263b7c2a8e11fd4471b88aec1cacd 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 c3cddb88a9d7535a2e86b3177a79a5b81f2c4916..d801928281486687fc9846f8a4b63b0e1a916d0c 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();