Merge branch 'master' into openid

[rails.git] / test / fixtures / diary_entries.yml

diff --git a/test/fixtures/diary_entries.yml b/test/fixtures/diary_entries.yml
index 5d07e5fa7137c65bce0009b7daadc005f26d1697..34fb552687e33d3ec4d3254393f14412a16aae9d 100644 (file)
--- a/test/fixtures/diary_entries.yml
+++ b/test/fixtures/diary_entries.yml
@@ -7,7 +7,7 @@ normal_user_entry_1:
   updated_at: "2008-11-07 17:43:34"
   latitude: 
   longitude: 
   updated_at: "2008-11-07 17:43:34"
   latitude: 
   longitude: 

-  language: 
+  language_code: en

   
 normal_user_geo_entry:
   id: 2
   
 normal_user_geo_entry:
   id: 2


@@ -18,4 +18,4 @@ normal_user_geo_entry:
   updated_at: "2008-11-07 17:47:34"
   latitude: 51.50763
   longitude: -0.10781
   updated_at: "2008-11-07 17:47:34"
   latitude: 51.50763
   longitude: -0.10781

-  language: 
+  language_code: de