From ece7cddc5156a3b3b8928c64f8b73dd766aa6661 Mon Sep 17 00:00:00 2001 From: MrZYX Date: Fri, 18 Feb 2011 14:52:52 +0100 Subject: [PATCH] added license to javascripts.en.yml; better langcodes_alias_map.yml; .gitignore users.yaml fixture --- .gitignore | 2 +- config/langcodes_alias_map.yml | 5 +++-- config/locales/javascript/javascript.en.yml | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d6d421b50..a353c150f 100644 --- 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 index 2ba3597b7..7063cadd1 100644 --- 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 index 91adf6f7a..75e04f1c4 100644 --- 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?"