More translations.

app/Helpers/Csv/Importer.php

@@ -30,7 +30,7 @@ class Importer
     /** @var array */
     protected $errors;
     /** @var int */
-    protected $imported;
+    protected $imported = 0;
     /** @var array */
     protected $map;
     /** @var  array */
@@ -131,12 +131,14 @@ class Importer
         $journal = null;
         if ($result === true) {
             $journal = $this->createTransactionJournal($data);
+        } else {
+            return $result;
         }
         if ($journal instanceof TransactionJournal) {
             return true;
         }
 
-        return 'Not a journal.';
+        return $journal;
 
     }
 
@@ -278,6 +280,9 @@ class Importer
         if ($errors->count() == 0) {
             $journal->completed = 1;
             $journal->save();
+        } else {
+            $text = join(',', $errors->all());
+            return $text;
         }
 
         // add budget:

app/Http/Controllers/CsvController.php

@@ -50,10 +50,9 @@ class CsvController extends Controller
     /**
      * Define column roles and mapping.
      *
-     *
      * STEP THREE
      *
-     * @return View
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
      */
     public function columnRoles()
     {
@@ -82,7 +81,7 @@ class CsvController extends Controller
         }
 
         foreach (Config::get('csv.roles') as $name => $role) {
-            $availableRoles[$name] = $role['name'];
+            $availableRoles[$name] = trans('firefly.csv_column_' . $name);//$role['name'];
         }
         ksort($availableRoles);