lobby 0.0.26 → 0.0.27

data/app/controllers/lobby/confirmation_controller.rb

@@ -7,7 +7,7 @@ module Lobby
       if @user
         @user.confirm_signup!
         session[:user_id] = @user.id
-        redirect_to root_url, flash: { success: t( '.flash.success' ) }
+        redirect_to :controller => "/home", :action => "index", flash: { success: t( '.flash.success' ) }
       else
         flash.now[:notice] = t( '.flash.error') if params[:token]
       end

data/app/controllers/lobby/confirmation_controller.rb~

@@ -7,7 +7,7 @@ module Lobby
       if @user
         @user.confirm_signup!
         session[:user_id] = @user.id
-        redirect_to root_url, flash: { success: t( '.flash.success' ) }
+        redirect_to :controller => "/home", :action => "index", flash: { success: t( '.flash.success' ) }
       else
         flash.now[:notice] = t( '.flash.error') if params[:token]
       end

data/app/controllers/lobby/sessions_controller.rb

@@ -10,7 +10,7 @@ module Lobby
           if @user.active?
             session[:user_id] = @user.id
             flash.now[:success] = t( '.flash.success' )
-            redirect_to root_url
+            redirect_to :controller => "/home", :action => "index"
           else
             flash.now[:danger] = t( '.flash.error.not_active' )
             redirect_to log_in_url

data/app/controllers/lobby/sessions_controller.rb~

@@ -0,0 +1,33 @@
+module Lobby
+  class SessionsController < ApplicationController
+    def new
+    end
+
+    def create
+      @user = User.where('email = ? OR username = ?', params[:email], params[:email]).first
+      if @user && @user.authenticate(params[:password])
+        if @user.confirmed?
+          if @user.active?
+            session[:user_id] = @user.id
+            flash.now[:success] = t( '.flash.success' )
+            redirect_to root_url
+          else
+            flash.now[:danger] = t( '.flash.error.not_active' )
+            redirect_to log_in_url
+          end
+        else
+          flash.now[:danger] = t( '.flash.error.not_confirmed' )
+          redirect_to confirm_url( :action => "registration" )
+        end
+      else
+        flash.now[:danger] = t( '.flash.error.wrong_password_or_email' )
+        render :new
+      end
+    end
+
+    def destroy
+      session[:user_id] = nil
+      redirect_to root_url, flash: {success: t( '.success' ) }
+    end
+  end
+end

data/config/locales/de.yml

@@ -87,7 +87,7 @@ de:
         title: "Token"
         resend_signup_token_link: "oder den Token nochmal senden."
         flash:
-          success: 'Deine Registrierung war erfolgreich. Nun kannst Du Dich einloggen.'
+          success: 'Deine Registrierung war erfolgreich und Du bist jetzt eingeloggt.'
           error: 'Deine Registrierung konnte nicht bestätigt werden. War der Link korrekt? Sollte Dein E-Mail-Programm den Bestätigungslink nicht richtig darstellen, so kannst Du den Aktivierungstoken auch unten in das Feld kopieren.'
       resend_signup_token:
         label_email: "E-Mail"

data/config/locales/de.yml~

@@ -0,0 +1,154 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+de:
+  common:
+    button:
+      send: 'Abschicken'
+    form:
+      error: "Fehler"
+
+  activerecord:
+    errors:
+      full_messages:
+        format: "{{message}}"
+      messages:
+        confirmation: "Passwortwiederholung ist falsch."
+      models:
+        user:
+          attributes:
+            password:
+              blank: "Bitte gib ein Passwort ein."
+              too_short: "Passwort ist zu kurz."
+            password_confirmation:
+              blank: "Passwort bitte wiederholen."
+            email:
+              taken: 'Diese E-Mail ist schon im System.'
+              blank: "Bitte gib eine E-Mail an."
+              invalid: "Die E-Mail hat ein falsches Format."
+            password_digest:
+              blank: "Bitte gib ein Passwort ein."
+            username:
+              blank: "Bitte gib einen Username an."
+              taken: 'Dieser Username ist schon im System.'
+  activemodel:
+    errors:
+      models:
+        password_forgotten_form:
+          attributes:
+            new_password:
+              too_short: 'Das neue Passwort ist zu kurz (mind. 5 Zeichen)'
+            new_password_confirmation:
+              confirmation: 'Die Passwortbestätigung war falsch.'
+
+  lobby:
+
+    users:
+      new:
+        title: 'Registrieren'
+        label_email: 'E-Mail'
+        label_username: 'Username'
+        label_password: 'Passwort'
+        label_password_confirmation: 'Passwort wiederholen'
+      create:
+        success: "Um die Registrierung abzuschließen, klicke bitte auf den Link den wir Dir soeben geschickt haben."
+
+    sessions:
+      destroy:
+        success: "Du bis nun ausgeloggt. Bis zum nächsten Mal."
+      new:
+        title: 'Login'
+        label_email: 'E-Mail oder Username'
+        label_password: 'Passwort'
+        link_password_forgotten: 'Passwort vergessen?'
+      create:
+        flash:
+          success: "Du bist drin."
+          error:
+            not_active: "Dein Account wurde deaktiviert."
+            not_confirmed: "Bitte erst die Registrierung bestätigen."
+            wrong_password_or_email: "Falsche E-Mail und/oder Passwort"
+
+    info:
+      login_status:
+        logged_in:
+          message_html: "Du bist angemeldet als: %{email}. %{logout_link}"
+          link1: "Abmelden?"
+        logged_out:
+          message_html: "Sie sind nicht angemeldet. %{signin_link} or %{signup_link}"
+          link1: "Registrieren?"
+          link2: "Anmelden?"
+
+    confirmation:
+      new_email:
+        flash:
+          success: "Deine E-Mail-Adresse wurde geändert."
+      registration:
+        title: "Token"
+        resend_signup_token_link: "oder den Token nochmal senden."
+        flash:
+          success: 'Deine Registrierung war erfolgreich. Nun kannst Du Dich einloggen.'
+          error: 'Deine Registrierung konnte nicht bestätigt werden. War der Link korrekt? Sollte Dein E-Mail-Programm den Bestätigungslink nicht richtig darstellen, so kannst Du den Aktivierungstoken auch unten in das Feld kopieren.'
+      resend_signup_token:
+        label_email: "E-Mail"
+        label_password: "Passwort"
+        title: "Aktivierungstoken bitte nochmal zusenden"
+        flash:
+          success: "Der Aktivierungstoken wurde nochmal gesendet"
+          error: "Du bist schon freigeschaltet. Dieser Link ist nicht mehr gültig."
+
+    password_forgotten:
+      new:
+        title: "Neues Passwort erstellen"
+        label_new_password: "Neues Passwort"
+        label_new_password_confirmation: "Neues Passwort wiederholen"
+        flash:
+          success: "Dein Passwort wurde geändert. Du kannst Dich nun mit Deinem neuen Passwort einloggen."
+      create:
+        notice:
+          success: "Dein Passwort wurde geändert."
+      create:
+        notice:
+          success: "Das neue Password wurde erfolgreich angelegt."
+      recover_password_auth:
+        title: 'Jetzt neues Passwort erstellen'
+        label_token: 'Token'
+      order_new_password:
+        title: "Neues Passwort generieren"
+        label_email: "Deine registrierte E-Mail"
+        flash:
+          success: 'Bitte prüfe Deine E-Mails. Dort findest Du einen Link zum Setzen Deines Passwortes.'
+
+    confirmation_mailer:
+
+      registration:
+        subject: 'Bitte Anmeldung bestätigen'
+        body: "Hallo,
+  vielen Danke für die Registrierung bei XYZ. Um Deine Registrierung abzuschließen klicke bitte auf folgenden Link:
+
+  %{url}
+
+  Vielen Dank"
+
+
+      send_password_reset:
+        subject: 'Neues Passwort angefordert'
+        body: "Hallo,
+  dies ist eine automatisch generierte Nachricht von XYZ für Nutzer die ihre Zugangsdaten vergessen haben. Anbei erhälst Du,
+  wie angefordert, einen Link mit dem Du Dein Passwort neu setzen kannst:
+
+  %{url}
+
+  Vielen Dank"
+
+
+
+      resend_signup_token:
+        subject: 'Neuer Registrierungstoken'
+        body: "Hallo,
+  dies ist eine automatisch generierte Nachricht von XYZ für Nutzer die ihre Registrierungsmail verloren haben. Anbei erhälst Du,
+  wie angefordert, einen Link mit dem Du Deine Registrierung bestätigen kannst:
+
+  %{url}
+
+  Vielen Dank"

data/config/locales/en.yml

@@ -87,7 +87,7 @@ en:
         title: "Token"
         resend_signup_token_link: "or send token again."
         flash:
-          success: 'Your registration was successful. Now you can login'
+          success: 'Your registration was successful and you are logged in now.'
           error: 'Your registration could not be confirmed. Was the link incorrect? If your email program does not properly represent the confirmation link, so you can copy it to the field activation token below.'
       resend_signup_token:
         label_email: "E-mail"

data/config/locales/en.yml~

@@ -0,0 +1,145 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  common:
+    button:
+      send: 'send'
+    form:
+      error: "error"
+
+  activerecord:
+    errors:
+      full_messages:
+        format: "{{message}}"
+      messages:
+        confirmation: "Repeat Password is incorrect."
+      models:
+        user:
+          attributes:
+            password:
+              blank: "Please enter a password."
+              too_short: "Password is too short."
+            password_confirmation:
+              blank: "Please verify the password."
+            email:
+              taken: 'This e-mail is already in the system.'
+              blank: "Please enter an e-mail."
+              invalid: "The e-mail has an incorrect format."
+            password_digest:
+              blank: "Please enter a password"
+            username:
+              blank: "Please enter a user name."
+              taken: 'This username is already in the system.'
+  activemodel:
+    errors:
+      models:
+        password_forgotten_form:
+          attributes:
+            new_password:
+              too_short: 'The new password is too short (minimum 5 characters)'
+            new_password_confirmation:
+              confirmation: 'Incorrect password confirmation.'
+
+  lobby:
+
+    users:
+      new:
+        title: 'Register'
+        label_email: 'e-mail'
+        label_username: 'Username'
+        label_password: 'Password'
+        label_password_confirmation: 'Password confirmation'
+      create:
+        success: "To complete the registration please click on the link we've just sent you."
+
+    sessions:
+      destroy:
+        success: "You logged out. Bye."
+      new:
+        title: 'Login'
+        label_email: 'e-mail or username'
+        label_password: 'password'
+        link_password_forgotten: 'Forgot Password?'
+      create:
+        flash:
+          success: "You're in."
+          error:
+            not_active: "Your account has been disabled."
+            not_confirmed: "Please confirm the registration first."
+            wrong_password_or_email: "Incorrect email and / or password"
+
+    info:
+      login_status:
+        logged_in:
+          message_html: "You are logged in as: %{email}. %{logout_link}"
+          link1: "log off?"
+        logged_out:
+          message_html: "You are not logged in. %{signin_link} or %{signup_link}"
+          link1: "Sign up?"
+          link2: "Log in?"
+
+    confirmation:
+      new_email:
+        flash:
+          success: "Your e-mail was updated."
+      registration:
+        title: "Token"
+        resend_signup_token_link: "or send token again."
+        flash:
+          success: 'Your registration was successful. Now you can login'
+          error: 'Your registration could not be confirmed. Was the link incorrect? If your email program does not properly represent the confirmation link, so you can copy it to the field activation token below.'
+      resend_signup_token:
+        label_email: "E-mail"
+        label_password: "Password"
+        title: "Send activation token again"
+        flash:
+          success: "The activation token was again sent"
+          error: "You are already confirmed. This link is no longer valid."
+
+
+    password_forgotten:
+      create:
+        notice:
+          success: "New password created."
+      recover_password_auth:
+        title: 'Create new password'
+        label_token: 'Token'
+      order_new_password:
+        title: "Generate new password"
+        label_email: "Your registered e-mail"
+        flash:
+          success: 'Please check your e-mails. There you will find a link to set your password.'
+
+    confirmation_mailer:
+
+      registration:
+        subject: 'Please confirm registration'
+        body: "Hello,
+  many Thanks for registering with XYZ. To complete your registration please click on the following link:
+
+  %{url}
+
+  Thank you very much"
+
+
+      send_password_reset:
+        subject: 'Requested new password'
+        body: "Hello.
+  This is an automatically generated message from XYZ for users who have forgotten their login details. Enclosed you will receive,
+   as requested, a link with which you can generate your new password:
+
+  %{url}
+
+  Thank you very much"
+
+
+      resend_signup_token:
+        subject: 'New registration token'
+        body: "Hello.
+  This is an automatically generated message from XYZ for users who have lost their registration email. Enclosed you will receive,
+   as requested, a link with which you can confirm your registration:
+
+  %{url}
+
+  VThank you very much"

data/lib/lobby/version.rb

@@ -1,3 +1,3 @@
 module Lobby
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

data/lib/lobby/version.rb~

@@ -1,3 +1,3 @@
 module Lobby
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lobby
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,6 +234,7 @@ files:
 - app/controllers/lobby/application_controller.rb
 - app/controllers/lobby/confirmation_controller.rb
 - app/controllers/lobby/password_forgotten_controller.rb~
+- app/controllers/lobby/sessions_controller.rb~
 - app/controllers/lobby/users_controller.rb
 - app/controllers/lobby/confirmation_controller.rb~
 - app/controllers/lobby/sessions_controller.rb
@@ -241,8 +242,10 @@ files:
 - app/helpers/lobby/application_helper.rb
 - app/models/lobby/password_forgotten_form_abstract.rb
 - config/locales/de.yml
+- config/locales/en.yml~
 - config/locales/en.yml
 - config/locales/en.bootstrap.yml
+- config/locales/de.yml~
 - config/routes.rb~
 - config/routes.rb
 - lib/lobby/engine.rb~