diff --git a/app/config/app.php b/app/config/app.php index 1f294f4f..0efbe921 100644 --- a/app/config/app.php +++ b/app/config/app.php @@ -127,6 +127,7 @@ return [ 'GrahamCampbell\Markdown\MarkdownServiceProvider', 'Roumen\Feed\FeedServiceProvider', 'Thujohn\Rss\RssServiceProvider', + 'Jenssegers\Date\DateServiceProvider', 'CachetHQ\Cachet\Providers\AuthServiceProvider', 'CachetHQ\Cachet\Providers\ConsoleServiceProvider', diff --git a/app/lang/en/forms.php b/app/lang/en/forms.php index 273af0d7..705d2247 100644 --- a/app/lang/en/forms.php +++ b/app/lang/en/forms.php @@ -4,11 +4,13 @@ return [ // Setup form fields 'setup' => [ - 'email' => 'Email', - 'username' => 'Username', - 'password' => 'Password', - 'site_name' => 'Site Name', - 'site_domain' => 'Site Domain', + 'email' => 'Email', + 'username' => 'Username', + 'password' => 'Password', + 'site_name' => 'Site Name', + 'site_domain' => 'Site Domain', + 'site_timezone' => 'Select your timezone', + 'site_locale' => 'Select your language', ], // Login form fields @@ -51,6 +53,8 @@ return [ 'app-setup' => [ 'site-name' => 'Site Name', 'site-url' => 'Site URL', + 'site-timezone' => 'Site Timezone', + 'site-locale' => 'Site Language', 'about-this-page' => 'About this page', 'days-of-incidents' => 'How many days of incidents to show?', 'banner' => 'Banner Image', diff --git a/app/lang/fr/forms.php b/app/lang/fr/forms.php index 9a5d27be..8c8fbdf9 100644 --- a/app/lang/fr/forms.php +++ b/app/lang/fr/forms.php @@ -4,11 +4,13 @@ return [ // Setup form fields 'setup' => [ - 'email' => 'Adresse email', - 'username' => 'Identifiant', - 'password' => 'Mot de passe', - 'site_name' => 'Nom du site', - 'site_domain' => 'Domaine du site', + 'email' => 'Adresse email', + 'username' => 'Identifiant', + 'password' => 'Mot de passe', + 'site_name' => 'Nom du site', + 'site_domain' => 'Domaine du site', + 'site_timezone' => 'Sélectionnez votre fuseau horaire', + 'site_locale' => 'Sélectionnez votre langue', ], // Login form fields @@ -51,6 +53,8 @@ return [ 'app-setup' => [ 'site-name' => 'Nom du site', 'site-url' => 'URL du site', + 'site-timezone' => 'Fuseau horaire du site', + 'site-locale' => 'Langue du site', 'about-this-page' => 'À propos de cette page', 'days-of-incidents' => 'Nombre de jours à afficher ?', 'banner' => 'Bannière', diff --git a/app/lang/pt-BR/forms.php b/app/lang/pt-BR/forms.php index 71ba3553..7b125e08 100755 --- a/app/lang/pt-BR/forms.php +++ b/app/lang/pt-BR/forms.php @@ -3,11 +3,13 @@ return [ // Setup form fields 'setup' => [ - 'email' => 'Email', - 'username' => 'Usuário', - 'password' => 'Senha', - 'site_name' => 'Nome do site', - 'site_domain' => 'Domínio do site', + 'email' => 'Email', + 'username' => 'Usuário', + 'password' => 'Senha', + 'site_name' => 'Nome do site', + 'site_domain' => 'Domínio do site', + 'site_timezone' => 'Select your timezone', + 'site_locale' => 'Select your language', ], // Login form fields @@ -50,6 +52,8 @@ return [ 'app-setup' => [ 'site-name' => 'Nome do site', 'site-url' => 'URL do site', + 'site-timezone' => 'Site Timezone', + 'site-locale' => 'Site Language', 'about-this-page' => 'Sobre esta página', 'days-of-incidents' => 'Quantos dias de incidentes para mostrar?', 'banner' => 'Imagem do banner', diff --git a/app/views/dashboard/settings/app-setup.blade.php b/app/views/dashboard/settings/app-setup.blade.php index 9f5609ad..0fbace84 100644 --- a/app/views/dashboard/settings/app-setup.blade.php +++ b/app/views/dashboard/settings/app-setup.blade.php @@ -42,6 +42,40 @@ +
+
+
+ + +
+
+
+
+
+
+ + +
+
+
diff --git a/app/views/setup.blade.php b/app/views/setup.blade.php index 0a2c76df..b72d110a 100644 --- a/app/views/setup.blade.php +++ b/app/views/setup.blade.php @@ -40,6 +40,38 @@ {{ $errors->first('settings.app_domain') }} @endif
+
+ + + @if($errors->has('settings.app_timezone')) + {{ $errors->first('settings.app_timezone') }} + @endif +
+
+ + + @if($errors->has('settings.app_locale')) + {{ $errors->first('settings.app_locale') }} + @endif +