end of day commit

app/assets/javascripts/user/application.js.erb

@@ -67,7 +67,13 @@ var $translations = {
       body: '%{email} wants to join the table',
       reject: 'Reject',
       approve: 'Approve',
-      waiting_for_confirmation: 'Waiting for approval of the person on this table...'
+      requestor: {
+        title: 'This table is occupied',
+        go_back: 'Back',
+        show_the_products: 'Show the menu',
+        join_this_table: 'Join this table',
+        waiting_for_confirmation: 'Waiting for approval of the person on this table...'
+      }
     },
     move_table: {
       cannot_move_to_occupied_table: 'You cannot move to an occupied table',
@@ -102,7 +108,13 @@ var $translations = {
       body: '%{email} wil ook op jouw lijst bestellen',
       reject: 'Afwijzen',
       approve: 'Toestaan',
-      waiting_for_confirmation: 'Wachten op toestemming van huidige gebruikers om hier te kunnen bestellen...'
+      requestor: {
+        title: 'Deze tafel is bezet',
+        go_back: 'Terug',
+        show_the_products: 'Toon het menu',
+        join_this_table: 'Ook bestellen aan deze tafel',
+        waiting_for_confirmation: 'Wachten op toestemming van huidige gebruikers om hier te kunnen bestellen...'
+      }
     },
     move_table: {
       cannot_move_to_occupied_table: 'Je kan niet verhuizen naar een tafel die reeds gebruikt wordt.',

app/assets/javascripts/user/quser.js.coffee

@@ -386,7 +386,7 @@ class Quser
     cont = $('#join-occupied-table-progress-container')
     cont.html('')
     cont.append $($('<img />').attr('src', "#{$asset_path}spinner.gif"))
-    cont.append $($('<p>').html(t('join_request.waiting_for_confirmation')))
+    cont.append $($('<p data-t="join_request.requestor.waiting_for_confirmation">').html(t('join_request.requestor.waiting_for_confirmation')))
     @ensure_token =>
       $.post(data_host + '/user/join_occupied_table', $.extend({table_id: table_id}, @authentication_object))
     #setInterval('Quser.check_if_can_join_occupied_table("'+table_id+'")', 7500)