From 4df7c6704e4c37bbc6c128eea24729b3aafc19bd Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Sat, 23 Apr 2016 13:13:52 +1000 Subject: [PATCH] Introduce locale variants Australia Canada UK --- config/cms.php | 3 ++- modules/backend/models/Preferences.php | 4 +++- modules/system/lang/en/lang.php | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/config/cms.php b/config/cms.php index 3a173c4c4..0e12a3817 100644 --- a/config/cms.php +++ b/config/cms.php @@ -44,7 +44,8 @@ return [ |-------------------------------------------------------------------------- | | This acts as the default setting for a back-end user's timezone. This can - | be changed by the user at any time using the backend preferences. + | be changed by the user at any time using the backend preferences. All + | dates displayed in the back-end will be converted to this timezone. | */ diff --git a/modules/backend/models/Preferences.php b/modules/backend/models/Preferences.php index 155107450..c0c7cedd8 100644 --- a/modules/backend/models/Preferences.php +++ b/modules/backend/models/Preferences.php @@ -126,8 +126,10 @@ class Preferences extends Model { $locales = Config::get('app.localeOptions', [ 'cs' => [Lang::get('system::lang.locale.cs'), 'flag-cz'], - 'en' => [Lang::get('system::lang.locale.en'), 'flag-gb'], + 'en' => [Lang::get('system::lang.locale.en'), 'flag-us'], 'en-au' => [Lang::get('system::lang.locale.en-au'), 'flag-au'], + 'en-ca' => [Lang::get('system::lang.locale.en-ca'), 'flag-ca'], + 'en-gb' => [Lang::get('system::lang.locale.en-gb'), 'flag-gb'], 'de' => [Lang::get('system::lang.locale.de'), 'flag-de'], 'es' => [Lang::get('system::lang.locale.es'), 'flag-es'], 'es-ar' => [Lang::get('system::lang.locale.es-ar'), 'flag-ar'], diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php index 30d48ecaf..71bdec75b 100644 --- a/modules/system/lang/en/lang.php +++ b/modules/system/lang/en/lang.php @@ -7,13 +7,17 @@ return [ ], 'locale' => [ 'cs' => 'Czech', - 'en' => 'English', + 'en' => 'English (United States)', + 'en-au' => 'English (Australia)', + 'en-ca' => 'English (Canada)', + 'en-gb' => 'English (United Kingdom)', 'de' => 'German', 'el' => 'Greek', 'es' => 'Spanish', 'es-ar' => 'Spanish (Argentina)', 'fa' => 'Persian', 'fr' => 'French', + 'fr-ca' => 'French (Canada)', 'hu' => 'Hungarian', 'id' => 'Bahasa Indonesia', 'it' => 'Italian',