From 8c4b546caad361cb7c063f5d462815444ac4a05c Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Tue, 28 Apr 2015 17:30:53 +0200
Subject: [PATCH] Moved to new locales.

---
 public/assets/tests/core.js     | 14 +++++++-------
 public/assets/tests/model-ui.js |  6 +++---
 public/assets/tests/table.js    |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/public/assets/tests/core.js b/public/assets/tests/core.js
index a8f4de7e5..2fe4bc6fd 100644
--- a/public/assets/tests/core.js
+++ b/public/assets/tests/core.js
@@ -258,9 +258,9 @@ App.Delay.set( function() {
 test( "i18n", function() {
 
   // de
-  App.i18n.set('de');
+  App.i18n.set('de-de');
   var translated = App.i18n.translateContent('yes');
-  equal( translated, 'ja', 'de - yes / ja translated correctly' );
+  equal( translated, 'ja', 'de-de - yes / ja translated correctly' );
 
   translated = App.i18n.translateContent('<test&now>//*äöüß');
   equal( translated, '&lt;test&amp;now&gt;//*äöüß', 'de - <test&now>//*äöüß' );
@@ -268,18 +268,18 @@ test( "i18n", function() {
   var time_local = new Date();
   var offset = time_local.getTimezoneOffset();
   var timestamp = App.i18n.translateTimestamp('2012-11-06T21:07:24Z', offset);
-  equal( timestamp, '06.11.2012 21:07', 'de - timestamp translated correctly' );
+  equal( timestamp, '06.11.2012 21:07', 'de-de - timestamp translated correctly' );
 
   // en
-  App.i18n.set('en');
+  App.i18n.set('en-us');
   translated = App.i18n.translateContent('yes');
-  equal( translated, 'yes', 'en - yes translated correctly' );
+  equal( translated, 'yes', 'en-us - yes translated correctly' );
 
   translated = App.i18n.translateContent('<test&now>');
-  equal( translated, '&lt;test&amp;now&gt;', 'en - <test&now>' );
+  equal( translated, '&lt;test&amp;now&gt;', 'en-us - <test&now>' );
 
   timestamp = App.i18n.translateTimestamp('2012-11-06T21:07:24Z', offset);
-  equal( timestamp, '2012-11-06 21:07', 'en - timestamp translated correctly' );
+  equal( timestamp, '11/06/2012 21:07', 'en - timestamp translated correctly' );
 });
 
 // events
diff --git a/public/assets/tests/model-ui.js b/public/assets/tests/model-ui.js
index 54decbf5b..2031ba50d 100644
--- a/public/assets/tests/model-ui.js
+++ b/public/assets/tests/model-ui.js
@@ -38,7 +38,7 @@ test( "model ui basic tests", function() {
     textarea:   "some new\nline"
   })
 
-  App.i18n.set('en')
+  App.i18n.set('en-us')
   equal( App.viewPrint( ticket, 'id' ), 1000)
   equal( App.viewPrint( ticket, 'title' ), 'some title &lt;&gt;&amp;')
   equal( App.viewPrint( ticket, 'state' ), 'open')
@@ -49,7 +49,7 @@ test( "model ui basic tests", function() {
   equal( App.viewPrint( ticket, 'textarea' ), '<div>some new</div><div>line</div>')
 
 
-  App.i18n.set('de')
+  App.i18n.set('de-de')
   equal( App.viewPrint( ticket, 'id' ), 1000)
   equal( App.viewPrint( ticket, 'title' ), 'some title &lt;&gt;&amp;')
   equal( App.viewPrint( ticket, 'state' ), 'offen')
@@ -60,7 +60,7 @@ test( "model ui basic tests", function() {
   equal( App.viewPrint( ticket, 'textarea' ), '<div>some new</div><div>line</div>')
 
 
-  App.i18n.set('en')
+  App.i18n.set('en-us')
   ticket.state_id = 3
   equal( App.viewPrint( ticket, 'state' ), 'closed &lt;&gt;&amp;')
   equal( App.viewPrint( ticket, 'state_id' ), 'closed &lt;&gt;&amp;')
diff --git a/public/assets/tests/table.js b/public/assets/tests/table.js
index b89d9093c..a0af495f6 100644
--- a/public/assets/tests/table.js
+++ b/public/assets/tests/table.js
@@ -1,6 +1,6 @@
 // form
 test( "table test", function() {
-  App.i18n.set('de')
+  App.i18n.set('de-de')
 
   $('#table').append('<hr><h1>table simple I</h1><div id="table1"></div>')
   var el = $('#table1')
@@ -358,7 +358,7 @@ test( "table test", function() {
 });
 
 test( "table test 2", function() {
-  App.i18n.set('de')
+  App.i18n.set('de-de')
 
   $('#table').append('<hr><h1>table with hash</h1><div id="table-hash1"></div>')
   var el = $('#table-hash1')
@@ -421,7 +421,7 @@ test( "table test 2", function() {
 });
 
 test( "table test 3", function() {
-  App.i18n.set('de')
+  App.i18n.set('de-de')
 
   $('#table').append('<hr><h1>table with link</h1><div id="table-link1"></div>')
   var el = $('#table-link1')
@@ -520,7 +520,7 @@ test( "table test 3", function() {
 });
 
 test( "table test 4", function() {
-  App.i18n.set('de')
+  App.i18n.set('de-de')
 
   $('#table').append('<hr><h1>table with data</h1><div id="table-data1"></div>')
   var el = $('#table-data1')