diff --git a/app/assets/javascripts/app/lib/app_post/auth.js.coffee b/app/assets/javascripts/app/lib/app_post/auth.js.coffee index d7cb4e850..1dac8ef8e 100644 --- a/app/assets/javascripts/app/lib/app_post/auth.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/auth.js.coffee @@ -113,7 +113,7 @@ class App.Auth if preferences && preferences.locale locale = preferences.locale if !locale - locale = window.navigator.userLanguage || window.navigator.language || 'en' + locale = window.navigator.userLanguage || window.navigator.language || 'en-us' App.i18n.set( locale ) App.Event.trigger( 'auth:login', data.session ) diff --git a/public/assets/tests/model-ui.js b/public/assets/tests/model-ui.js index 2031ba50d..bf6dafc76 100644 --- a/public/assets/tests/model-ui.js +++ b/public/assets/tests/model-ui.js @@ -45,7 +45,7 @@ test( "model ui basic tests", function() { equal( App.viewPrint( ticket, 'state_id' ), 'open') equal( App.viewPrint( ticket, 'not_existing' ), '-') equal( App.viewPrint( ticket, 'updated_at' ), "?") - equal( App.viewPrint( ticket, 'date' ), '2015-02-07') + equal( App.viewPrint( ticket, 'date' ), '02/07/2015') equal( App.viewPrint( ticket, 'textarea' ), '
some new
line
') diff --git a/public/assets/tests/table.js b/public/assets/tests/table.js index a0af495f6..44354dc12 100644 --- a/public/assets/tests/table.js +++ b/public/assets/tests/table.js @@ -112,14 +112,14 @@ test( "table test", function() { equal( el.find('table > thead > tr > th:nth-child(1)').text().trim(), 'Name', 'check header') equal( el.find('table > thead > tr > th:nth-child(2)').text().trim(), 'Erstellt', 'check header') equal( el.find('table > thead > tr > th:nth-child(3)').text().trim(), 'Aktiv', 'check header') - equal( el.find('tbody > tr:nth-child(2) > td').length, 3, 'check row 2') - equal( el.find('tbody > tr:nth-child(2) > td:first').text().trim(), '1 niedrig', 'check row 2') - equal( el.find('tbody > tr:nth-child(2) > td:nth-child(2)').text().trim(), '?', 'check row 2') - equal( el.find('tbody > tr:nth-child(2) > td:nth-child(3)').text().trim(), 'true', 'check row 2') equal( el.find('tbody > tr:nth-child(1) > td').length, 3, 'check row 1') equal( el.find('tbody > tr:nth-child(1) > td:first').text().trim(), '2 normal', 'check row 1') equal( el.find('tbody > tr:nth-child(1) > td:nth-child(2)').text().trim(), '?', 'check row 1') equal( el.find('tbody > tr:nth-child(1) > td:nth-child(3)').text().trim(), 'false', 'check row 1') + equal( el.find('tbody > tr:nth-child(2) > td').length, 3, 'check row 2') + equal( el.find('tbody > tr:nth-child(2) > td:first').text().trim(), '1 niedrig', 'check row 2') + equal( el.find('tbody > tr:nth-child(2) > td:nth-child(2)').text().trim(), '?', 'check row 2') + equal( el.find('tbody > tr:nth-child(2) > td:nth-child(3)').text().trim(), 'true', 'check row 2') $('#table').append('

table simple III

') el = $('#table3')