added license to javascripts.en.yml; better langcodes_alias_map.yml; …

….gitignore users.yaml fixture
webgem-jpl · Feb 18, 2011 · ece7cdd · ece7cdd
1 parent 05a7b88
commit ece7cdd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,7 +18,7 @@ config/database.yml
 log/*
 public/stylesheets/*.css
 public/diaspora
-spec/fixtures/*.yml
+spec/fixtures/*.y*ml
 spec/fixtures/*.fixture.*
 
 # Uploded files and local files

diff --git a/config/langcodes_alias_map.yml b/config/langcodes_alias_map.yml
@@ -1,5 +1,6 @@
-en: [:en-US, :en-GB]
-en-shaw: [:en, :en-GB, :en-US]
+en-GB: [:en]
+en-US: [:en]
+en_shaw: [:en, :en-GB, :en-US]
 sv: [:sv-SE]
 he: [:he-IL]
 es-CL: [:es]

diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
@@ -1,3 +1,8 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
 en:
   javascripts:
       confirm_dialog: "Are you sure?"