end of day commit

2013-01-10 01:00:59 +01:00
parent b85bbf1aee
commit 87046c872c
23 changed files with 642 additions and 28 deletions
@@ -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)