Merge pull request #199 from shaded2/csv_import

Csv import

config/locales/en.yml

@@ -386,7 +386,8 @@ en:
       stats: Statistics
       tickler_title: Tickler
       manage_users: Manage users
-      export_title: Import and export data
+      export_title: Export data
+      import_title: Import data
       preferences: Preferences
       integrations_: Integrate Tracks
       feeds_title: See a list of available feeds
@@ -402,6 +403,7 @@ en:
       completed_tasks_title: Completed
       home: Home
       export: Export
+      import: Import 
       contexts_title: Contexts
       calendar: Calendar
       projects_title: Projects
@@ -811,6 +813,7 @@ en:
   data:
     import_successful: Import was successful.
     import_errors: Some errors occurred during import
+    import_destination_invalid: Invalid import destination
   stats:
     index_title: TRACKS::Statistics
     within_one: Within 1

config/routes.rb

@@ -139,4 +139,12 @@ Tracksapp::Application.routes.draw do
   resources :notes
   resources :preferences
 
+  resources :data do
+    collection do
+      get :import
+      post :csv_map
+      post :csv_import
+    end
+  end
+
 end