lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cachethq/Cachet

Browse Source
This commit is contained in:
Graham Campbell
2015-12-16 18:11:27 +00:00
parent 57491b8062 3a5405e032
commit cfe0cefeb3
17 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/lang/da/forms.php
+1
View File
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
'login' => 'Username or Email',
'email' => 'Email',
'password' => 'Kodeord',
'2fauth' => 'Godkendelses kode',
resources/lang/de/forms.php
+1
View File
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
'login' => 'Username or Email',
'email' => 'E-Mail',
'password' => 'Passwort',
'2fauth' => 'Authentifizierungscode',
resources/lang/en-UD/forms.php
+1
View File
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
'login' => 'Username or Email',
'email' => 'crwdns217:0crwdne217:0',
'password' => 'crwdns381:0crwdne381:0',
'2fauth' => 'crwdns382:0crwdne382:0',
resources/lang/en/forms.php
+1
View File
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
'login' => 'Username or Email',
'email' => 'Email',
'password' => 'Password',
'2fauth' => 'Authentication Code',
resources/lang/es/forms.php
+1
View File
@@ -25,6 +25,7 @@ return [
// Login form fields
'login' => [
'login' => 'Username or Email',
'email' => 'Correo electrónico',
'password' => 'Contraseña',
'2fauth' => 'Código de Autenticación',
resources/lang/fr/forms.php
+1
View File
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
'login' => 'Username or Email',
'email' => 'Email',
'password' => 'Mot de passe ',
'2fauth' => 'Code d\'authentification',
resources/lang/id/forms.php
+1
View File
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
'login' => 'Username or Email',
'email' => 'Email',
'password' => 'Password',
'2fauth' => 'Kode Otentikasi',
resources/lang/it/forms.php
+1
View File
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
'login' => 'Username or Email',
'email' => 'Email',
'password' => 'Password',
'2fauth' => 'Codice di autenticazione',
resources/lang/ko/forms.php
+1
View File
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
'login' => 'Username or Email',
'email' => '이메일',
'password' => '비밀번호',
'2fauth' => '인증 코드',
resources/lang/nl/forms.php
+1
View File
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
'login' => 'Username or Email',
'email' => 'E-mail',
'password' => 'Wachtwoord',
'2fauth' => 'Authenticatie Code',
resources/lang/pl/forms.php
+1
View File
@@ -25,6 +25,7 @@ return [
// Login form fields
'login' => [
'login' => 'Username or Email',
'email' => 'Email',
'password' => 'Hasło',
'2fauth' => 'Kod autentykacji',
resources/lang/pt-BR/forms.php
+1
View File
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
'login' => 'Username or Email',
'email' => 'Email',
'password' => 'Senha',
'2fauth' => 'Código de autenticação',
resources/lang/ru/forms.php
+1
View File
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
'login' => 'Username or Email',
'email' => 'Эл. почта',
'password' => 'Пароль',
'2fauth' => 'Код аутентификации',
resources/lang/zh-CN/forms.php
+1
View File
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
'login' => '用户名或电子邮箱',
'email' => '电子邮箱',
'password' => '密码',
'2fauth' => '双因素验证代码',
resources/lang/zh-TW/forms.php
+1
View File
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
'login' => 'Username or Email',
'email' => '電子郵箱',
'password' => '密碼',
'2fauth' => '雙因素驗證代碼',
resources/views/auth/login.blade.php
+2 -2
View File
@@ -30,8 +30,8 @@
@endif
<div class="form-group">
<label class="sr-only">{{ trans('forms.login.email') }}</label>
<input autocomplete="off" class="form-control login-input" placeholder="{{ trans('forms.login.email') }}" required="required" name="email" type="email" autofocus>
<label class="sr-only">{{ trans('forms.login.login') }}</label>
<input autocomplete="off" class="form-control login-input" placeholder="{{ trans('forms.login.login') }}" required="required" name="login" type="text" autofocus>
</div>
<div class="form-group">
<label class="sr-only">{{ trans('forms.login.password') }}</label>