Skip to content

Lang/fr #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 4, 2015
Merged

Lang/fr #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba0aabe
fix(Upload): fix input name
welcoMattic Nov 3, 2015
938fbf4
Finish fr lang
welcoMattic Nov 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/controllers/UploadController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ class UploadController extends LfmController {
public function upload()
{
// sanity check
if ( ! Input::hasFile('file_to_upload')) {
if ( ! Input::hasFile('upload')) {
// there ws no uploded file
return "You must choose a file!";
exit;
}

$file = Input::file('file_to_upload');
$file = Input::file('upload');
$working_dir = Input::get('working_dir');
$destinationPath = base_path() . "/" . $this->file_location;

Expand All @@ -50,7 +50,7 @@ public function upload()
exit;
}

Input::file('file_to_upload')->move($destinationPath, $new_filename);
Input::file('upload')->move($destinationPath, $new_filename);

if (Session::get('lfm_type') == "Images") {
$this->makeThumb($destinationPath, $new_filename);
Expand Down
48 changes: 24 additions & 24 deletions src/lang/fr/lfm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
'menu-resize' => 'Redimensionner',
'menu-crop' => 'Récolte',

'title-page' => '',
'title-panel' => '',
'title-upload' => '',
'title-view' => '',
'title-root' => '',
'title-page' => 'Gestionnaire de fichiers',
'title-panel' => 'Laravel FileManager',
'title-upload' => 'Envoyer un fichier',
'title-view' => 'Voir le fichier',
'title-root' => 'Fichiers',
'title-shares' => 'Shared Files',
'title-item' => 'Article',
'title-size' => 'Taille du fichier',
Expand All @@ -28,25 +28,25 @@
'type-folder' => 'Dossier',

'message-empty' => 'Dossier est vide',
'message-choose' => '',
'message-delete' => '',
'message-name' => '',
'message-rename' => '',

'btn-upload' => '',
'btn-close' => '',
'btn-uploading' => '',
'btn-crop' => '',
'btn-cancel' => '',
'btn-resize' => '',

'resize-ratio' => '',
'resize-scaled' => '',
'resize-true' => '',
'resize-old-height' => '',
'resize-old-width' => '',
'resize-new-height' => '',
'resize-new-width' => '',
'message-choose' => 'Choisir un fichier',
'message-delete' => 'Êtes-vous sûr de vouloir supprimer ce fichier ?',
'message-name' => 'Nom du dossier:',
'message-rename' => 'Renommer le dossier:',

'btn-upload' => 'Envoyer le fichier',
'btn-close' => 'Fermer',
'btn-uploading' => 'Envoi...',
'btn-crop' => 'Rogner',
'btn-cancel' => 'Annuler',
'btn-resize' => 'Redimensionner',

'resize-ratio' => 'Ratio:',
'resize-scaled' => "Image à l'échelle:",
'resize-true' => 'Oui',
'resize-old-height' => 'Hauteur originale:',
'resize-old-width' => 'Largeur originale:',
'resize-new-height' => 'Hauteur',
'resize-new-width' => 'Largeur',

'locale-bootbox' => 'fr',

Expand Down