From ce633c6b292a9b6f371822afac1291e62f4eda35 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Tue, 27 Oct 2015 08:18:09 +0000 Subject: [PATCH] Closes #1050, link to Gravatar.com in the profile page --- resources/lang/da/forms.php | 1 + resources/lang/de/forms.php | 1 + resources/lang/en-UD/forms.php | 1 + resources/lang/en/forms.php | 1 + resources/lang/es/forms.php | 1 + resources/lang/fr/forms.php | 1 + resources/lang/id/forms.php | 1 + resources/lang/it/forms.php | 1 + resources/lang/ko/forms.php | 1 + resources/lang/nl/forms.php | 1 + resources/lang/pl/forms.php | 1 + resources/lang/pt-BR/forms.php | 1 + resources/lang/ru/forms.php | 1 + resources/lang/zh-CN/forms.php | 1 + .../views/dashboard/user/index.blade.php | 95 ++++++++++--------- 15 files changed, 65 insertions(+), 44 deletions(-) diff --git a/resources/lang/da/forms.php b/resources/lang/da/forms.php index 7d04bac4..a671f9c1 100755 --- a/resources/lang/da/forms.php +++ b/resources/lang/da/forms.php @@ -143,6 +143,7 @@ return [ 'password' => 'Kodeord', 'api-token' => 'API nøgle', 'api-token-help' => 'Hvis du regenerere din API nøgle vil eksisterende applikationer ikke kunne tilgå API\'et.', + 'gravatar' => 'Change your profile picture at Gravatar.', 'user_level' => 'Brugertype', 'levels' => [ 'admin' => 'Administrator', diff --git a/resources/lang/de/forms.php b/resources/lang/de/forms.php index ca234e64..c9438590 100755 --- a/resources/lang/de/forms.php +++ b/resources/lang/de/forms.php @@ -133,6 +133,7 @@ return [ 'password' => 'Passwort', 'api-token' => 'API Token', 'api-token-help' => 'Wenn sie ihren API-Token neu generieren, können bestehende Anwendungen nicht mehr auf Cachet zugreifen.', + 'gravatar' => 'Change your profile picture at Gravatar.', '2fa' => [ 'help' => 'Die Zwei-Faktor-Authentifizierung erhöht die Sicherheit Ihres Kontos. Sie benötigen Google Authenticator oder eine ähnliche App auf Ihrem Mobilgerät. Beim Anmelden werden sie aufgefordert, einen Token einzugeben, der von der App generiert wird.', ], diff --git a/resources/lang/en-UD/forms.php b/resources/lang/en-UD/forms.php index e9f12ad8..7c053aaa 100755 --- a/resources/lang/en-UD/forms.php +++ b/resources/lang/en-UD/forms.php @@ -133,6 +133,7 @@ return [ 'password' => 'crwdns413:0crwdne413:0', 'api-token' => 'crwdns414:0crwdne414:0', 'api-token-help' => 'crwdns436:0crwdne436:0', + 'gravatar' => 'Change your profile picture at Gravatar.', '2fa' => [ 'help' => 'crwdns416:0crwdne416:0', ], diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php index 6265c2cf..9b49b27d 100755 --- a/resources/lang/en/forms.php +++ b/resources/lang/en/forms.php @@ -143,6 +143,7 @@ return [ 'password' => 'Password', 'api-token' => 'API Token', 'api-token-help' => 'Regenerating your API token will prevent existing applications from accessing Cachet.', + 'gravatar' => 'Change your profile picture at Gravatar.', 'user_level' => 'User Level', 'levels' => [ 'admin' => 'Admin', diff --git a/resources/lang/es/forms.php b/resources/lang/es/forms.php index 82fb6891..85953387 100755 --- a/resources/lang/es/forms.php +++ b/resources/lang/es/forms.php @@ -125,6 +125,7 @@ return [ 'password' => 'Contraseña', 'api-token' => 'API Token', 'api-token-help' => 'Al regenerar tu API key revocarás todas las aplicaciones existentes.', + 'gravatar' => 'Change your profile picture at Gravatar.', '2fa' => [ 'help' => 'Habilitar autenticación de dos pasos aumenta la seguridad de tu cuenta. Necesitarás descargar Google Authenticator o una aplicación similar en tu dispositivo móvil. Al iniciar sesión te pedirá proporcionar un token generado por la aplicación.', ], diff --git a/resources/lang/fr/forms.php b/resources/lang/fr/forms.php index e4fedbcf..9315ee01 100755 --- a/resources/lang/fr/forms.php +++ b/resources/lang/fr/forms.php @@ -133,6 +133,7 @@ return [ 'password' => 'Mot de passe ', 'api-token' => 'Jeton de l\'API', 'api-token-help' => 'Régénérer votre jeton API permettra d\'éviter les applications existantes d\'accéder à Cachet.', + 'gravatar' => 'Change your profile picture at Gravatar.', '2fa' => [ 'help' => 'Habilitante authentification à deux facteurs augmente la sécurité de votre compte. Vous aurez besoin de télécharger Google Authenticator ou une application similaire sur votre appareil mobile. Lorsque vous vous connectez vous sera demandé de fournir un jeton généré par l\'application.', ], diff --git a/resources/lang/id/forms.php b/resources/lang/id/forms.php index 78600426..53b99451 100755 --- a/resources/lang/id/forms.php +++ b/resources/lang/id/forms.php @@ -133,6 +133,7 @@ return [ 'password' => 'Password', 'api-token' => 'Token API', 'api-token-help' => 'Pembuatan ulang token API akan bermasalah jika sudah ada aplikasi lain yang mengakses Cachet.', + 'gravatar' => 'Change your profile picture at Gravatar.', '2fa' => [ 'help' => 'Mengaktifkan otentikasi dua faktor akan memperkuat keamanan akun anda. Anda perlu mengunduh Google Authenticator atau app sejenis di gadget anda. Saat login anda akan ditanyakan untuk mengisi token yang dibuat oleh app tersebut.', ], diff --git a/resources/lang/it/forms.php b/resources/lang/it/forms.php index b5315b08..fadbce4d 100644 --- a/resources/lang/it/forms.php +++ b/resources/lang/it/forms.php @@ -134,6 +134,7 @@ return [ 'password' => 'Password', 'api-token' => 'Token API', 'api-token-help' => 'Rigenerando il token delle API impedirai l\'accesso a Cachet alle applicazioni esistenti.', + 'gravatar' => 'Change your profile picture at Gravatar.', 'user_level' => 'Livello utente', 'levels' => [ 'admin' => 'Amministratore', diff --git a/resources/lang/ko/forms.php b/resources/lang/ko/forms.php index 2ae9ee93..2ad399db 100755 --- a/resources/lang/ko/forms.php +++ b/resources/lang/ko/forms.php @@ -134,6 +134,7 @@ return [ 'password' => '비밀번호', 'api-token' => 'API 토큰', 'api-token-help' => '기존의 프로그램이 Cachet에 접근하는 것을 막기 위해, API token 을 재성성합니다.', + 'gravatar' => 'Change your profile picture at Gravatar.', '2fa' => [ 'help' => '2단계 인증을 활성화하면 계정 보안이 강화됩니다. Google Authenticator 또는 유사한 앱을 모바일 기기에 다운로드 받아야 합니다. 로그인 할 때, 해당 앱에서 생성된 토큰을 입력해야합니다.', ], diff --git a/resources/lang/nl/forms.php b/resources/lang/nl/forms.php index d47ccd41..38daf31d 100755 --- a/resources/lang/nl/forms.php +++ b/resources/lang/nl/forms.php @@ -133,6 +133,7 @@ return [ 'password' => 'Wachtwoord', 'api-token' => 'API-token', 'api-token-help' => 'Het opnieuw genereren van je API-token zorgt ervoor dat bestaande applicaties geen toegang meer hebben tot Cachet.', + 'gravatar' => 'Change your profile picture at Gravatar.', '2fa' => [ 'help' => 'Het inschakelen van two-factor authenticatie verhoogt de veiligheid van uw account. U zult een applicatie zoals Google Authenticator of een vergelijkbare applicatie moeten downloaden op uw mobiele apparaat. Wanneer u inlogt wordt u gevraagd om een token in te voeren welke door de applicatie wordt gegenereerd.', ], diff --git a/resources/lang/pl/forms.php b/resources/lang/pl/forms.php index 410c6a46..4fec1273 100755 --- a/resources/lang/pl/forms.php +++ b/resources/lang/pl/forms.php @@ -127,6 +127,7 @@ return [ 'password' => 'Hasło', 'api-token' => 'Klucz API', 'api-token-help' => 'Zregenerowanie twojego klucza API uniemożliwi dostęp istniejących aplikacji do Cachet.', + 'gravatar' => 'Change your profile picture at Gravatar.', '2fa' => [ 'help' => 'Aktywacja dwuetapowej autentykacji zwiększą bezpieczeństwo twojego konta. Musisz ściągnąć Google Authenticator lub podobną aplikację na swój telefon. Przy logowaniu będziesz proszony o podanie kodu wygenerowanego przez tą aplikację.', ], diff --git a/resources/lang/pt-BR/forms.php b/resources/lang/pt-BR/forms.php index 7673b545..e1185424 100755 --- a/resources/lang/pt-BR/forms.php +++ b/resources/lang/pt-BR/forms.php @@ -143,6 +143,7 @@ return [ 'password' => 'Senha', 'api-token' => 'Token da API', 'api-token-help' => 'Gerar nova chave da API impedirá que aplicativos existentes acessem o Cachet.', + 'gravatar' => 'Change your profile picture at Gravatar.', 'user_level' => 'Nível de Usuário', 'levels' => [ 'admin' => 'Administrador', diff --git a/resources/lang/ru/forms.php b/resources/lang/ru/forms.php index 74a26f88..5177483c 100644 --- a/resources/lang/ru/forms.php +++ b/resources/lang/ru/forms.php @@ -134,6 +134,7 @@ return [ 'password' => 'Пароль', 'api-token' => 'API токен', 'api-token-help' => 'Обновление вашего API токена заблокирует существующим приложениям доступ в Cachet. Вам будет необходимо прописать в них новый токен.', + 'gravatar' => 'Change your profile picture at Gravatar.', '2fa' => [ 'help' => 'Включение двухфакторной аутентификации увеличивает безопасность вашей учетной записи. Вам понадобится скачать Google Authenticator или аналогичное приложение на свой смартфон. Когда в следующий раз вы войдете в панель управления, вам понадобится токен, выданный этим приложением.', ], diff --git a/resources/lang/zh-CN/forms.php b/resources/lang/zh-CN/forms.php index c983d451..1dfa0073 100755 --- a/resources/lang/zh-CN/forms.php +++ b/resources/lang/zh-CN/forms.php @@ -134,6 +134,7 @@ return [ 'password' => '密码', 'api-token' => 'API 令牌', 'api-token-help' => '重新生成您的 API 令牌将阻止现有的应用程序访问Cachet。', + 'gravatar' => 'Change your profile picture at Gravatar.', '2fa' => [ 'help' => '启用双因素身份验证会增加您的帐户安全。您将需要下载 Google Authenticator 或类似的应用到您的移动设备。当您登录时将会要求您提供由应用程序生成的一个短码。', ], diff --git a/resources/views/dashboard/user/index.blade.php b/resources/views/dashboard/user/index.blade.php index d754d4e0..702f1826 100644 --- a/resources/views/dashboard/user/index.blade.php +++ b/resources/views/dashboard/user/index.blade.php @@ -15,52 +15,59 @@ @include('dashboard.partials.errors')
-
- - -
-
- - -
-
- - -
-
-
-
- -
- - {{ trans('cachet.api.regenerate') }} +
+
+
- {{ trans('forms.user.api-token-help') }} -
-
-
- -
- @if($current_user->hasTwoFactor) -
- email, - $current_user->google_2fa_secret - ); - ?> - - {!! trans('forms.user.2fa.help') !!} -
- @endif -
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ +
+ + {{ trans('cachet.api.regenerate') }} +
+ {{ trans('forms.user.api-token-help') }} +
+
+
+ +
+ @if($current_user->hasTwoFactor) +
+ email, + $current_user->google_2fa_secret + ); + ?> + + {!! trans('forms.user.2fa.help') !!} +
+ @endif - + +
+ +