end of day commit

config/locales/devise.en.yml

@@ -13,6 +13,7 @@ en:
         title: Change your password
         button: Change password
     registrations:
+      title: Sign up for mozo as a restaurant
       link: Sign up
     links:
       prefix: 'OR:'

config/locales/devise.nl.yml

@@ -3,10 +3,17 @@ nl:
     sign_in:
       title: Inloggen
       remember_me: Mij onthouden
+      link: Inloggen
       button: Inloggen
-    recoverable:
-      button: Wachtwoord vergeten
+    passwords:
+      title: Wachtwoord vergeten
+      link: Wachtwoord vergeten
+      button: Stuur reset
+      edit:
+        title: Change your password
+        button: Change password
     registrations:
-      button: Aanmelden
+      title: Aanmelden als restaurant
+      link: Aanmelden
     links:
       prefix: 'OF:'

config/locales/models.en.yml

@@ -68,6 +68,11 @@ en:
         postal_code: Postal code
         city: City
         country: Country
+      new_supplier:
+        supplier_name: Restaurant name
+        email: E-mail
+        password: Password
+        password_confirmation: Password confirmation
       table:
         number: Number
         from_number: From number

config/locales/models.nl.yml

@@ -67,6 +67,11 @@ nl:
         postal_code: Postcode
         city: Stad
         country: Land
+      new_supplier:
+        supplier_name: Restaurant name
+        email: E-mail
+        password: Wachtwoord
+        password_confirmation: Nogmaals wachtwoord
       table:
         number: Nummer
         from_number: Vanaf nummer

config/routes.rb

@@ -32,17 +32,20 @@ Qwaiter::Application.routes.draw do
     root to: 'users#index'
   end
 
-  resources :new_suppliers
 
   post '/user_app' => 'dashboard#user_app_log' #TODO: separate high speed app at log.mozo.bar
   post '/user_feedback' => 'user#feedback'
 
   #WAITER
-  get '/waiter' => 'waiter#index' #, controller: 'waiter', action: 'index'
+  #get '/waiter' => 'waiter#index' #, controller: 'waiter', action: 'index'
   get '/waiter/sections' => 'waiter#sections'
   get '/waiter/product_categories' => 'waiter#product_categories'
   get '/waiter/*rest' => redirect('/waiter') # Ember app refresh
   post '/waiter/order_products' => 'waiter#order_products', as: :order_products_waiter
+  namespace :waiter do
+    root to: 'dashboard#index'
+
+  end
 
 
   # USER
@@ -172,12 +175,15 @@ Qwaiter::Application.routes.draw do
 
   mount Cmtool::Engine => '/cmtool'
 
-  #get '/:locale' => 'pages#home', constraints: {locale: ALLOWED_LOCALES}
+  # /nl is not matched to pages#home with locale => nl
+  get '/:locale' => 'pages#home', constraints: {locale: ALLOWED_LOCALES}
   #devise_scope :supplier do
     #get '/:locale/suppliers/sign_up' => 'registrations#new', constraints: {locale: ALLOWED_LOCALES}
   #end
   scope '(/:locale)', constraints: {locale: ALLOWED_LOCALES}, defaults: { locale: 'en' } do
     root to: 'pages#home'
+    resources :contact_forms, only: [:create]
+    resources :new_suppliers
     get "/:name" => "pages#show", constraints: {name: /.*/}, as: :go_to
   end
 end