diff --git a/config/locales/en.yml b/config/locales/en.yml index 7e0bd1b46..be80cb8a4 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -468,3 +468,23 @@ en: user_permission_verify_info: "* Only for users on Madrid Census." user_permission_verify_url: verify your account user_permission_votes: Participate on final voting + omniauth: + finish_signup: + title: "Additional details" + twitter: + sign_in: "Sign in with Twitter" + sign_up: "Sign up with Twitter" + facebook: + sign_in: "Sign in with Facebook" + sign_up: "Sign up with Facebook" + #google_oauth2: + # sign_in: "Sign in with Google" + # sign_up: "Sign up with Google" + legislation: + help: + title: "How I can comment this document?" + text_logged: "Select the text you want to comment and press the button with the pencil." + text: "To comment this document you must %{sign_in} or %{sign_up}. Then select the text you want to comment and press the button with the pencil." + text_sign_in: "login" + text_sign_up: "sign up" + alt: "Select the text you want to comment and press the button with the pencil." diff --git a/config/locales/es.yml b/config/locales/es.yml index 848a14bf9..9ba8a24ef 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -468,3 +468,23 @@ es: user_permission_verify_info: "* Sólo usuarios empadronados en el municipio de Madrid." user_permission_verify_url: verifica tu cuenta user_permission_votes: Participar en las votaciones finales* + omniauth: + finish_signup: + title: "Detalles adicionales de tu cuenta" + twitter: + sign_in: "Entra con Twitter" + sign_up: "Regístrate con Twitter" + facebook: + sign_in: "Entra con Facebook" + sign_up: "Regístrate con Facebook" + #google_oauth2: + # sign_in: "Entra con Google" + # sign_up: "Regístrate con Google" + legislation: + help: + title: "¿Cómo puedo comentar este documento?" + text_logged: "Selecciona el texto que quieres comentar y pulsa en el botón con el lápiz." + text: "Para comentar este documento debes %{sign_in} o %{sign_up}. Después selecciona el texto que quieres comentar y pulsa en el botón con el lápiz." + text_sign_in: "iniciar sesión" + text_sign_up: "registrarte" + alt: "Selecciona el texto que quieres comentar y pulsa en el botón con el lápiz." diff --git a/db/migrate/20160119164320_add_registering_with_oauth_to_users.rb b/db/migrate/20160119164320_add_registering_with_oauth_to_users.rb new file mode 100644 index 000000000..a29d310ba --- /dev/null +++ b/db/migrate/20160119164320_add_registering_with_oauth_to_users.rb @@ -0,0 +1,5 @@ +class AddRegisteringWithOauthToUsers < ActiveRecord::Migration + def change + add_column :users, :registering_with_oauth, :bool, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index df5bbc3a9..963cce889 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -397,6 +397,7 @@ ActiveRecord::Schema.define(version: 20160122153329) do t.boolean "newsletter", default: false t.integer "notifications_count", default: 0 t.string "locale" + t.boolean "registering_with_oauth", default: false end add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree