updates

app/views/dashboard/demo_both.html.slim

@@ -2,4 +2,7 @@
 iframe.phone-content-frame src=user_root_path
 
 .tablet-wrapper
-iframe.tablet-content-frame src=supplier_root_path
+- if Rails.env.development?
+  iframe.tablet-content-frame src="https://supplier.mozo.local/supplier/"
+- else
+  iframe.tablet-content-frame src="https://supplier.mozo.bar/supplier/"

config/application.rb

@@ -14,7 +14,7 @@ require 'net/http' # lib/qwaiter/broadcaster/faye.rb
 require File.expand_path('./../../lib/couchbase-setting', __FILE__)
 
 
-Bundler.require(*Rails.groups(assets: %w(development test user_app)))
+Bundler.require(*Rails.groups(assets: %w[ development test user_app ]))
 Bundler.require(:assets) if ENV['DEPLOY']=='yes'
 
 if Rails.env.development?
@@ -234,7 +234,7 @@ module Qwaiter
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    config.i18n.default_locale = :nl
+    config.i18n.default_locale = :en
     config.i18n.available_locales = [:en, :nl]
 
     # Configure the default encoding used in templates for Ruby 1.9.

config/locales/models.en.yml

@@ -1,7 +1,7 @@
 en:
   activemodel:
     models:
-      user: Guest
+      user: User
       supplier: Restaurant
       new_supplier: New restaurant
       table: Table
@@ -19,7 +19,7 @@ en:
       section_element: Section element
       section_area: Section area
       plural:
-        user: Guests
+        user: Users
         supplier: Restaurants
         new_supplier: New restaurants
         table: Tables

config/locales/models.nl.yml

@@ -1,7 +1,7 @@
 nl:
   activemodel:
     models:
-      user: Gast
+      user: Gebruiker
       supplier: Restaurant
       new_supplier: Nieuw restaurant
       table: Tafel
@@ -18,9 +18,9 @@ nl:
       section_element: Ruimte element
       section_area: Ruimte blok
       plural:
-        user: Gasten
-        supplier: Restaurants
-        new_supplier: Nieuwe restaurants
+        user: Gebruikers
+        supplier: Restauranten
+        new_supplier: Nieuwe restauranten
         table: Tafels
         list: Bonnen
         product: Producten

translations.yml

@@ -194,7 +194,7 @@ en:
       choose: Choose
   models:
     page: Page
-    user: Guest
+    user: User
     cmtool:
       quote: Quote
       news: News
@@ -207,7 +207,7 @@ en:
       yml_file: Yml file
     plural:
       page: Pages
-      user: Guests
+      user: Users
       cmtool:
         quote: Quotes
         news: News