From aaffeacf1d31403165e3aff7a78486a93fb73585 Mon Sep 17 00:00:00 2001 From: Sam Georges Date: Sat, 30 Aug 2014 09:42:55 +1000 Subject: [PATCH] Fixes #584 - pt-br locale not defined correctly. --- modules/backend/models/BackendPreferences.php | 9 +++++++-- modules/system/lang/de/lang.php | 13 +++++++++++++ modules/system/lang/en/lang.php | 2 +- modules/system/lang/fr/lang.php | 2 +- modules/system/lang/it/lang.php | 2 +- modules/system/lang/ja/lang.php | 13 +++++++++++++ modules/system/lang/nl/lang.php | 2 +- modules/system/lang/pt-br/lang.php | 13 +++++++++++++ modules/system/lang/ro/lang.php | 2 +- modules/system/lang/ru/lang.php | 2 +- modules/system/lang/sv/lang.php | 13 +++++++++++++ modules/system/lang/tr/lang.php | 13 +++++++++++++ 12 files changed, 78 insertions(+), 8 deletions(-) diff --git a/modules/backend/models/BackendPreferences.php b/modules/backend/models/BackendPreferences.php index c7845c61f..40cda5061 100644 --- a/modules/backend/models/BackendPreferences.php +++ b/modules/backend/models/BackendPreferences.php @@ -25,6 +25,10 @@ class BackendPreferences extends Model $config->set('app.locale', $settings->locale); } + /** + * Returns available options for the "locale" attribute. + * @return array + */ public function getLocaleOptions() { $locales = [ @@ -34,15 +38,16 @@ class BackendPreferences extends Model 'ja' => [Lang::get('system::lang.locale.ja'), 'flag-jp'], 'se' => [Lang::get('system::lang.locale.se'), 'flag-se'], 'tr' => [Lang::get('system::lang.locale.tr'), 'flag-tr'], - 'br' => [Lang::get('system::lang.locale.br'), 'flag-br'], 'de' => [Lang::get('system::lang.locale.de'), 'flag-de'], 'fr' => [Lang::get('system::lang.locale.fr'), 'flag-fr'], 'it' => [Lang::get('system::lang.locale.it'), 'flag-it'], 'ro' => [Lang::get('system::lang.locale.ro'), 'flag-ro'], + 'pt-br' => [Lang::get('system::lang.locale.pt-br'), 'flag-br'], ]; - // Sort the locales alphabetically + // Sort locales alphabetically asort($locales); + return $locales; } diff --git a/modules/system/lang/de/lang.php b/modules/system/lang/de/lang.php index a6c6dc404..cf104e1fb 100644 --- a/modules/system/lang/de/lang.php +++ b/modules/system/lang/de/lang.php @@ -5,6 +5,19 @@ return [ 'name' => 'October CMS', 'motto' => 'Zurück zum Wesentlichen', ], + 'locale' => [ + 'en' => 'English', + 'nl' => 'Dutch', + 'ja' => 'Japanese', + 'se' => 'Swedish', + 'tr' => 'Turkish', + 'de' => 'German', + 'ru' => 'Russian', + 'fr' => 'French', + 'it' => 'Italian', + 'ro' => 'Romana', + 'pt-br' => 'Brazilian Portuguese', + ], 'directory' => [ 'create_fail' => "Konnte Verzeichnis: :name nicht erstellen", ], diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php index 63522a3a2..5323f7761 100644 --- a/modules/system/lang/en/lang.php +++ b/modules/system/lang/en/lang.php @@ -11,12 +11,12 @@ return [ 'ja' => 'Japanese', 'se' => 'Swedish', 'tr' => 'Turkish', - 'br' => 'Brazilian Portuguese', 'de' => 'German', 'ru' => 'Russian', 'fr' => 'French', 'it' => 'Italian', 'ro' => 'Romana', + 'pt-br' => 'Brazilian Portuguese', ], 'directory' => [ 'create_fail' => "Cannot create directory: :name", diff --git a/modules/system/lang/fr/lang.php b/modules/system/lang/fr/lang.php index 140f69e04..7f933c0ac 100644 --- a/modules/system/lang/fr/lang.php +++ b/modules/system/lang/fr/lang.php @@ -11,10 +11,10 @@ return [ 'ja' => 'Japonais', 'se' => 'Suédois', 'tr' => 'Turque', - 'br' => 'Portugais-Brésilien', 'de' => 'Allemand', 'ru' => 'Russe', 'fr' => 'Français', + 'pt-br' => 'Portugais-Brésilien', ], 'directory' => [ 'create_fail' => "Impossible de créer le répertoire : :name", diff --git a/modules/system/lang/it/lang.php b/modules/system/lang/it/lang.php index 0b8a5ec26..487c4ffa7 100644 --- a/modules/system/lang/it/lang.php +++ b/modules/system/lang/it/lang.php @@ -11,11 +11,11 @@ return [ 'ja' => 'Giapponese', 'se' => 'Svedese', 'tr' => 'Turco', - 'br' => 'Portoghese (Brasile)', 'de' => 'Tedesco', 'ru' => 'Russo', 'fr' => 'Francese', 'it' => 'Italiano', + 'pt-br' => 'Portoghese (Brasile)', ], 'directory' => [ 'create_fail' => "Impossibile creare la cartella: :name", diff --git a/modules/system/lang/ja/lang.php b/modules/system/lang/ja/lang.php index cc9d13b7c..abe5cc6fd 100644 --- a/modules/system/lang/ja/lang.php +++ b/modules/system/lang/ja/lang.php @@ -5,6 +5,19 @@ return [ 'name' => 'October CMS', 'motto' => '基本に戻ろう！', ], + 'locale' => [ + 'en' => 'English', + 'nl' => 'Dutch', + 'ja' => 'Japanese', + 'se' => 'Swedish', + 'tr' => 'Turkish', + 'de' => 'German', + 'ru' => 'Russian', + 'fr' => 'French', + 'it' => 'Italian', + 'ro' => 'Romana', + 'pt-br' => 'Brazilian Portuguese', + ], 'directory' => [ 'create_fail' => "ディレクトリーが作成できません： :name", ], diff --git a/modules/system/lang/nl/lang.php b/modules/system/lang/nl/lang.php index ebab1b31c..9a4ccc7f3 100644 --- a/modules/system/lang/nl/lang.php +++ b/modules/system/lang/nl/lang.php @@ -11,12 +11,12 @@ return [ 'ja' => 'Japans', 'se' => 'Zweeds', 'tr' => 'Turks', - 'br' => 'Braziliaans Portugees', 'de' => 'Duits', 'ru' => 'Russisch', 'fr' => 'Frans', 'it' => 'Italiaans', 'ro' => 'Roemeens', + 'pt-br' => 'Braziliaans Portugees', ], 'directory' => [ 'create_fail' => "Map aanmaken mislukt: :name", diff --git a/modules/system/lang/pt-br/lang.php b/modules/system/lang/pt-br/lang.php index 39f48112a..f747342dd 100644 --- a/modules/system/lang/pt-br/lang.php +++ b/modules/system/lang/pt-br/lang.php @@ -5,6 +5,19 @@ return [ 'name' => 'October CMS', 'motto' => 'Voltando ao básico', ], + 'locale' => [ + 'en' => 'English', + 'nl' => 'Dutch', + 'ja' => 'Japanese', + 'se' => 'Swedish', + 'tr' => 'Turkish', + 'de' => 'German', + 'ru' => 'Russian', + 'fr' => 'French', + 'it' => 'Italian', + 'ro' => 'Romana', + 'pt-br' => 'Brazilian Portuguese', + ], 'directory' => [ 'create_fail' => "Não é possível criar o diretório: :name", ], diff --git a/modules/system/lang/ro/lang.php b/modules/system/lang/ro/lang.php index bb4119810..8accc5496 100644 --- a/modules/system/lang/ro/lang.php +++ b/modules/system/lang/ro/lang.php @@ -11,11 +11,11 @@ return [ 'ja' => 'Japoneza', 'sv' => 'Suedeza', 'tr' => 'Turca', - 'br' => 'Portugheza (Brazilia)', 'de' => 'Germana', 'ru' => 'Rusa', 'fr' => 'Franceza', 'ro' => 'Romana' + 'pt-br' => 'Portugheza (Brazilia)', ], 'directory' => [ 'create_fail' => "Nu se poate crea directorul: :name", diff --git a/modules/system/lang/ru/lang.php b/modules/system/lang/ru/lang.php index 488555fd5..6aa777fd4 100644 --- a/modules/system/lang/ru/lang.php +++ b/modules/system/lang/ru/lang.php @@ -11,12 +11,12 @@ return [ 'ja' => 'Japanese', 'se' => 'Swedish', 'tr' => 'Turkish', - 'br' => 'Brazilian Portuguese', 'de' => 'German', 'ru' => 'Russian', 'fr' => 'French', 'it' => 'Italian', 'ro' => 'Romana', + 'pt-br' => 'Brazilian Portuguese', ], 'directory' => [ 'create_fail' => "Невозможно создать директорию: :name", diff --git a/modules/system/lang/sv/lang.php b/modules/system/lang/sv/lang.php index 9d64c93cf..8462962bd 100644 --- a/modules/system/lang/sv/lang.php +++ b/modules/system/lang/sv/lang.php @@ -5,6 +5,19 @@ return [ 'name' => 'October CMS', 'motto' => 'Getting back to basics', ], + 'locale' => [ + 'en' => 'English', + 'nl' => 'Dutch', + 'ja' => 'Japanese', + 'se' => 'Swedish', + 'tr' => 'Turkish', + 'de' => 'German', + 'ru' => 'Russian', + 'fr' => 'French', + 'it' => 'Italian', + 'ro' => 'Romana', + 'pt-br' => 'Brazilian Portuguese', + ], 'directory' => [ 'create_fail' => "Kunde inte skapa mapp: :name", ], diff --git a/modules/system/lang/tr/lang.php b/modules/system/lang/tr/lang.php index e2fceaf6f..fb3bae1ee 100644 --- a/modules/system/lang/tr/lang.php +++ b/modules/system/lang/tr/lang.php @@ -5,6 +5,19 @@ return [ 'name' => 'October CMS', 'motto' => 'Basitliğe dönüş...', ], + 'locale' => [ + 'en' => 'English', + 'nl' => 'Dutch', + 'ja' => 'Japanese', + 'se' => 'Swedish', + 'tr' => 'Turkish', + 'de' => 'German', + 'ru' => 'Russian', + 'fr' => 'French', + 'it' => 'Italian', + 'ro' => 'Romana', + 'pt-br' => 'Brazilian Portuguese', + ], 'directory' => [ 'create_fail' => "Klasör oluşturulamıyor: :name", ],