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

Merge pull request #368 from cachethq/lang-errors

Browse Source 
Errors are all translated. Closes #364.
This commit is contained in:
James Brooks
2015-01-13 11:56:03 +00:00
parent 108a1cbc03 e4ee12c170
commit 7f73bd7535
11 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/lang/de/dashboard.php
View File

@@ -89,7 +89,9 @@ return [
'settings' => [
'settings' => 'Einstellungen',
'app-setup' => [
'app-setup' => 'Setup',
'app-setup' => 'Setup',
'images-only' => 'Only images may be uploaded.',
'too-big' => 'The file you uploaded is too big. Upload an image smaller than :size',
],
'security' => [
'security' => 'Sicherheit',

8
app/lang/de/forms.php
View File

@@ -16,9 +16,11 @@ return [
// Login form fields
'login' => [
'email' => 'Email',
'password' => 'Passwort',
'2fauth' => 'Authentifikations-Code',
'email' => 'Email',
'password' => 'Passwort',
'2fauth' => 'Authentifikations-Code',
'invalid' => 'Invalid email or password',
'invalid-token' => 'Invalid token',
],
// Incidents form fields

4
app/lang/en/dashboard.php
View File

@@ -89,7 +89,9 @@ return [
'settings' => [
'settings' => 'Settings',
'app-setup' => [
'app-setup' => 'Application Setup',
'app-setup' => 'Application Setup',
'images-only' => 'Only images may be uploaded.',
'too-big' => 'The file you uploaded is too big. Upload an image smaller than :size',
],
'security' => [
'security' => 'Security',

8
app/lang/en/forms.php
View File

@@ -16,9 +16,11 @@ return [
// Login form fields
'login' => [
'email' => 'Email',
'password' => 'Password',
'2fauth' => 'Authentication Code',
'email' => 'Email',
'password' => 'Password',
'2fauth' => 'Authentication Code',
'invalid' => 'Invalid email or password',
'invalid-token' => 'Invalid token',
],
// Incidents form fields

4
app/lang/fr/dashboard.php
View File

@@ -89,7 +89,9 @@ return [
'settings' => [
'settings' => 'Réglages',
'app-setup' => [
'app-setup' => 'Configuration',
'app-setup' => 'Configuration',,
'images-only' => 'Only images may be uploaded.',
'too-big' => 'The file you uploaded is too big. Upload an image smaller than :size',
],
'security' => [
'security' => 'Sécurité',

8
app/lang/fr/forms.php
View File

@@ -16,9 +16,11 @@ return [
// Login form fields
'login' => [
'email' => 'Adresse email',
'password' => 'Mot de passe',
'2fauth' => 'Authentication Code',
'email' => 'Adresse email',
'password' => 'Mot de passe',
'2fauth' => 'Authentication Code',
'invalid' => 'Invalid email or password',
'invalid-token' => 'Invalid token',
],
// Incidents form fields

4
app/lang/pt-BR/dashboard.php
View File

@@ -89,7 +89,9 @@ return [
'settings' => [
'settings' => 'Configurações',
'app-setup' => [
'app-setup' => 'Instalação do aplicativo',
'app-setup' => 'Instalação do aplicativo',,
'images-only' => 'Only images may be uploaded.',
'too-big' => 'The file you uploaded is too big. Upload an image smaller than :size',
],
'security' => [
'security' => 'Segurança',

8
app/lang/pt-BR/forms.php
View File

@@ -15,9 +15,11 @@ return [
// Login form fields
'login' => [
'email' => 'Email',
'password' => 'Senha',
'2fauth' => 'Authentication Code',
'email' => 'Email',
'password' => 'Senha',
'2fauth' => 'Authentication Code',
'invalid' => 'Invalid email or password',
'invalid-token' => 'Invalid token',
],
// Incidents form fields

6
src/Http/Controllers/AuthController.php
View File

@@ -57,7 +57,7 @@ class AuthController extends Controller
return Redirect::back()
->withInput(Binput::except('password'))
->with('error', 'Invalid email or password');
->with('error', trans('forms.login.invalid'));
}
/**
@@ -94,11 +94,11 @@ class AuthController extends Controller
// Failed login, log back out.
Auth::logout();
return Redirect::route('login')->with('error', 'Invalid token');
return Redirect::route('login')->with('error', trans('forms.login.invalid-token'));
}
}
return Redirect::route('login')->with('error', 'Invalid token');
return Redirect::route('login')->with('error', trans('forms.login.invalid-token'));
}
/**

2
src/Http/Controllers/DashAPIController.php
View File

@@ -21,7 +21,7 @@ class DashAPIController extends Controller
public function postUpdateComponent(Component $component)
{
if (!$component->update(Binput::except(['_token']))) {
throw new Exception('Failed to update the component.');
throw new Exception(trans('dashboard.components.edit.failure'));
}
return $component;

4
src/Http/Controllers/DashSettingsController.php
View File

@@ -169,7 +169,7 @@ class DashSettingsController extends Controller
$maxSize = $file->getMaxFilesize();
if ($file->getSize() > $maxSize) {
return Redirect::back()->withErrors("You need to upload an image that is less than $maxSize.");
return Redirect::back()->withErrors(trans('dashboard.settings.app-setup.too-big', ['size' => $maxSize]));
}
if (!$file->isValid() || $file->getError()) {
@@ -177,7 +177,7 @@ class DashSettingsController extends Controller
}
if (strpos($file->getMimeType(), 'image/') !== 0) {
return Redirect::back()->withErrors('Only images may be uploaded.');
return Redirect::back()->withErrors(trans('dashboard.settings.app-setup.images-only'));
}
// Store the banner.