multi_auth 0.0.4 → 0.0.5

data/po/multi_auth.pot

@@ -0,0 +1,637 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: multi_auth 1.0.0\n"
+"POT-Creation-Date: 2010-01-06 15:47+0900\n"
+"PO-Revision-Date: 2009-11-08 22:38+0900\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: app/controllers/credentials/email_controller.rb:41
+msgctxt "MultiAuth"
+msgid "Email authentication credential was successfully added."
+msgstr ""
+
+#: app/controllers/credentials/email_controller.rb:46
+#: app/controllers/credentials/email_controller.rb:73
+#: app/controllers/credentials/open_id_controller.rb:22
+#: app/controllers/signup/email_controller.rb:27
+#: app/controllers/signup/email_controller.rb:39
+#: app/controllers/signup/email_controller.rb:67
+msgctxt "MultiAuth"
+msgid "Please confirm your input."
+msgstr ""
+
+#: app/controllers/credentials/email_controller.rb:68
+msgctxt "MultiAuth"
+msgid "Password was changed."
+msgstr ""
+
+#: app/controllers/credentials/email_controller.rb:87
+msgctxt "MultiAuth"
+msgid "Email authentication credential was successfully deleted."
+msgstr ""
+
+#: app/controllers/credentials/email_controller.rb:121
+#: app/controllers/credentials/email_controller.rb:131
+msgctxt "MultiAuth"
+msgid "It is invalid email authentication credential."
+msgstr ""
+
+#: app/controllers/credentials/email_controller.rb:142
+msgctxt "MultiAuth"
+msgid "It is invalid activation token."
+msgstr ""
+
+#: app/controllers/credentials/email_controller.rb:150
+msgctxt "MultiAuth"
+msgid "This email authentication credential has been already activated."
+msgstr ""
+
+#: app/controllers/credentials/open_id_controller.rb:37
+msgctxt "MultiAuth"
+msgid "OpenID authentication credential was successfully added."
+msgstr ""
+
+#: app/controllers/credentials/open_id_controller.rb:41
+msgctxt "MultiAuth"
+msgid "This OpenID has been already registered."
+msgstr ""
+
+#: app/controllers/credentials/open_id_controller.rb:61
+msgctxt "MultiAuth"
+msgid "OpenID authentication credential was successfully deleted."
+msgstr ""
+
+#: app/controllers/credentials/open_id_controller.rb:74
+#: app/controllers/credentials/open_id_controller.rb:85
+msgctxt "MultiAuth"
+msgid "It is invalid OpenID authentication credential."
+msgstr ""
+
+#: app/controllers/auth/email_controller.rb:30
+msgctxt "MultiAuth"
+msgid "The email address or the password is wrong."
+msgstr ""
+
+#: app/controllers/auth/open_id_controller.rb:24
+#: app/views/auth/logged_in.html.erb:2
+msgctxt "MultiAuth"
+msgid "Logged in successfully."
+msgstr ""
+
+#: app/controllers/auth/open_id_controller.rb:27
+msgctxt "MultiAuth"
+msgid "This OpenID has not been registered yet."
+msgstr ""
+
+#: app/controllers/signup/email_controller.rb:93
+msgctxt "MultiAuth"
+msgid "It is an invalid activation key."
+msgstr ""
+
+#: app/controllers/signup/email_controller.rb:99
+msgctxt "MultiAuth"
+msgid "This email address has been already registered."
+msgstr ""
+
+#: app/controllers/signup/open_id_controller.rb:25
+msgctxt "MultiAuth"
+msgid ""
+"Because specified OpenID has already been registered, it is not possible to "
+"use it. "
+msgstr ""
+
+#: app/models/email_credential_edit_form.rb:21
+msgid "EmailCredentialEditForm|Email"
+msgstr ""
+
+#: app/models/email_credential_edit_form.rb:22
+msgid "EmailCredentialEditForm|Password"
+msgstr ""
+
+#: app/models/email_credential_edit_form.rb:23
+msgid "EmailCredentialEditForm|Password confirmation"
+msgstr ""
+
+#: app/models/open_id_login_form.rb:13
+msgid "OpenIdLoginForm|Openid url"
+msgstr ""
+
+#: app/models/activation_mailer.rb:17
+msgctxt "MultiAuth"
+msgid "User registration"
+msgstr ""
+
+#: app/models/activation_mailer.rb:30
+msgctxt "MultiAuth"
+msgid "User registration completed"
+msgstr ""
+
+#: app/models/activation_mailer.rb:44
+msgctxt "MultiAuth"
+msgid "Email address registration for authentication"
+msgstr ""
+
+#: app/models/activation_mailer.rb:57
+msgctxt "MultiAuth"
+msgid "Email address registration for authentication completed"
+msgstr ""
+
+#: app/models/activation_mailer.rb:71
+msgctxt "MultiAuth"
+msgid "Email address registration for notification"
+msgstr ""
+
+#: app/models/activation_mailer.rb:84
+msgctxt "MultiAuth"
+msgid "Email address registration for notification completed"
+msgstr ""
+
+#: app/models/email_credential.rb:-
+msgid "email credential"
+msgstr ""
+
+#: app/models/email_credential.rb:-
+msgid "EmailCredential|Activation token"
+msgstr ""
+
+#: app/models/email_credential.rb:- app/views/credentials/index.html.erb:50
+#: app/views/credentials/email/delete.html.erb:13
+#: app/views/credentials/email/activation.html.erb:8
+#: app/views/signup/email/validated.html.erb:10
+#: app/views/signup/email/activation.html.erb:16
+msgid "EmailCredential|Email"
+msgstr ""
+
+#: app/models/email_credential.rb:-
+msgid "EmailCredential|Activated at"
+msgstr ""
+
+#: app/models/email_credential.rb:- app/views/credentials/index.html.erb:49
+msgid "EmailCredential|Loggedin at"
+msgstr ""
+
+#: app/models/email_credential.rb:22 app/views/credentials/index.html.erb:48
+msgid "EmailCredential|Activated on"
+msgstr ""
+
+#: app/models/open_id_credential.rb:-
+msgid "open id credential"
+msgstr ""
+
+#: app/models/open_id_credential.rb:-
+msgid "OpenIdCredential|Identity url"
+msgstr ""
+
+#: app/models/open_id_credential.rb:- app/views/credentials/index.html.erb:10
+msgid "OpenIdCredential|Loggedin at"
+msgstr ""
+
+#: app/models/open_id_credential.rb:19 app/views/credentials/index.html.erb:9
+msgid "OpenIdCredential|Activated on"
+msgstr ""
+
+#: app/models/email_login_form.rb:15
+msgid "EmailLoginForm|Email"
+msgstr ""
+
+#: app/models/email_login_form.rb:16
+msgid "EmailLoginForm|Password"
+msgstr ""
+
+#: app/models/email_password_edit_form.rb:15
+msgid "EmailPasswordEditForm|Password"
+msgstr ""
+
+#: app/models/email_password_edit_form.rb:16
+msgid "EmailPasswordEditForm|Password confirmation"
+msgstr ""
+
+#: app/views/credentials/index.html.erb:2
+msgctxt "MultiAuth"
+msgid "Login setting"
+msgstr ""
+
+#: app/views/credentials/index.html.erb:4
+msgctxt "MultiAuth"
+msgid "OpenID authentication"
+msgstr ""
+
+#: app/views/credentials/index.html.erb:19
+msgctxt "MultiAuth"
+msgid "Add OpenID authentication"
+msgstr ""
+
+#: app/views/credentials/index.html.erb:27
+msgctxt "MultiAuth"
+msgid "There are no OpenID authentication."
+msgstr ""
+
+#: app/views/credentials/index.html.erb:36
+#: app/views/credentials/index.html.erb:81
+#: app/views/credentials/open_id/delete.html.erb:19
+#: app/views/credentials/email/delete.html.erb:19
+msgctxt "MultiAuth"
+msgid "Delete"
+msgstr ""
+
+#: app/views/credentials/index.html.erb:43
+msgctxt "MultiAuth"
+msgid "Email address authentication"
+msgstr ""
+
+#: app/views/credentials/index.html.erb:58
+msgctxt "MultiAuth"
+msgid "Add email address authentication"
+msgstr ""
+
+#: app/views/credentials/index.html.erb:66
+msgctxt "MultiAuth"
+msgid "There are no email address authentication."
+msgstr ""
+
+#: app/views/credentials/index.html.erb:77
+msgctxt "MultiAuth"
+msgid "Waiting for activation"
+msgstr ""
+
+#: app/views/credentials/index.html.erb:80
+#: app/views/credentials/email/edit_password.html.erb:2
+msgctxt "MultiAuth"
+msgid "Update password"
+msgstr ""
+
+#: app/views/credentials/open_id/delete.html.erb:2
+#: app/views/credentials/open_id/delete.html.erb:7
+msgctxt "MultiAuth"
+msgid "Delete OpenID authentication credential."
+msgstr ""
+
+#: app/views/credentials/open_id/delete.html.erb:8
+#: app/views/credentials/email/delete.html.erb:8
+msgctxt "MultiAuth"
+msgid "Are you sure?"
+msgstr ""
+
+#: app/views/credentials/open_id/new.html.erb:2
+msgctxt "MultiAuth"
+msgid "Add OpenID authentication credential"
+msgstr ""
+
+#: app/views/credentials/open_id/new.html.erb:16
+#: app/views/credentials/email/new.html.erb:25
+msgctxt "MultiAuth"
+msgid "Add"
+msgstr ""
+
+#: app/views/credentials/email/edit_password.html.erb:21
+msgctxt "MultiAuth"
+msgid "Update"
+msgstr ""
+
+#: app/views/credentials/email/activated.html.erb:2
+#: app/views/signup/open_id/created.html.erb:4
+#: app/views/signup/email/_progress.html.erb:13
+#: app/views/signup/email/activated.html.erb:4
+#: app/views/signup/email/activated.html.erb:8
+msgctxt "MultiAuth"
+msgid "Registration completed"
+msgstr ""
+
+#: app/views/credentials/email/activated.html.erb:6
+msgctxt "MultiAuth"
+msgid "Top"
+msgstr ""
+
+#: app/views/credentials/email/delete.html.erb:2
+#: app/views/credentials/email/delete.html.erb:7
+msgctxt "MultiAuth"
+msgid "Delete email authentication credential."
+msgstr ""
+
+#: app/views/credentials/email/new.html.erb:2
+msgctxt "MultiAuth"
+msgid "Add email authentication credential"
+msgstr ""
+
+#: app/views/credentials/email/created.html.erb:2
+msgctxt "MultiAuth"
+msgid "Pre-registeration completed"
+msgstr ""
+
+#: app/views/credentials/email/created.html.erb:6
+msgctxt "MultiAuth"
+msgid ""
+"System sent a mail to email address you specified. Please access the URL "
+"described in the mail. And complete registration."
+msgstr ""
+
+#: app/views/credentials/email/created.html.erb:7
+msgctxt "MultiAuth"
+msgid "Back"
+msgstr ""
+
+#: app/views/credentials/email/activation.html.erb:2
+msgctxt "MultiAuth"
+msgid "Activation"
+msgstr ""
+
+#: app/views/credentials/email/activation.html.erb:14
+msgctxt "MultiAuth"
+msgid "Activate"
+msgstr ""
+
+#: app/views/auth/logged_out.html.erb:2
+msgctxt "MultiAuth"
+msgid "You have been logged out."
+msgstr ""
+
+#: app/views/auth/logged_out.html.erb:21 app/views/auth/logged_in.html.erb:21
+msgctxt "MultiAuth"
+msgid "Please click %{link} when the page doesn't change."
+msgstr ""
+
+#: app/views/auth/index.html.erb:1 app/views/auth/index.html.erb:16
+#: app/views/auth/index.html.erb:39 app/views/auth/open_id/index.html.erb:2
+#: app/views/auth/open_id/index.html.erb:17
+#: app/views/auth/email/index.html.erb:2
+#: app/views/auth/email/index.html.erb:64
+#: app/views/auth/email/index.html.erb:82
+#: app/views/signup/open_id/created.html.erb:6
+#: app/views/signup/email/activated.html.erb:9
+msgctxt "MultiAuth"
+msgid "Login"
+msgstr ""
+
+#: app/views/auth/index.html.erb:5
+msgctxt "MultiAuth"
+msgid "By OpenID"
+msgstr ""
+
+#: app/views/auth/index.html.erb:21
+msgctxt "MultiAuth"
+msgid "By email address"
+msgstr ""
+
+#: app/views/activation_mailer/request_for_credential.erb:1
+msgctxt "MultiAuth"
+msgid "Email address for authentication will be registered."
+msgstr ""
+
+#: app/views/activation_mailer/request_for_credential.erb:2
+#: app/views/activation_mailer/request_for_signup.erb:2
+#: app/views/activation_mailer/request_for_notice.erb:2
+msgctxt "MultiAuth"
+msgid "Registration is completed by accessing following URL."
+msgstr ""
+
+#: app/views/activation_mailer/request_for_credential.erb:8
+#: app/views/activation_mailer/request_for_signup.erb:8
+#: app/views/activation_mailer/request_for_notice.erb:8
+msgctxt "MultiAuth"
+msgid "- For access with cellular phone etc."
+msgstr ""
+
+#: app/views/activation_mailer/request_for_credential.erb:9
+#: app/views/activation_mailer/request_for_signup.erb:9
+#: app/views/activation_mailer/request_for_notice.erb:9
+msgctxt "MultiAuth"
+msgid ""
+"It is not possible to register from the cellular phone etc. that do not "
+"correspond to Cookie now."
+msgstr ""
+
+#: app/views/activation_mailer/request_for_credential.erb:10
+#: app/views/activation_mailer/request_for_signup.erb:10
+#: app/views/activation_mailer/request_for_notice.erb:10
+msgctxt "MultiAuth"
+msgid ""
+"Please register after forwarding this mail to PC etc. though it is time."
+msgstr ""
+
+#: app/views/activation_mailer/request_for_signup.erb:1
+msgctxt "MultiAuth"
+msgid "Thank you for the user registration to %{app}."
+msgstr ""
+
+#: app/views/activation_mailer/complete_for_notice.erb:1
+msgctxt "MultiAuth"
+msgid "The email address registration was completed."
+msgstr ""
+
+#: app/views/activation_mailer/request_for_notice.erb:1
+msgctxt "MultiAuth"
+msgid "Email address for notification will be registered."
+msgstr ""
+
+#: app/views/activation_mailer/complete_for_credential.erb:1
+msgctxt "MultiAuth"
+msgid "The registration of the email address authentication was completed."
+msgstr ""
+
+#: app/views/activation_mailer/complete_for_signup.erb:1
+msgctxt "MultiAuth"
+msgid "The user registration was completed."
+msgstr ""
+
+#: app/views/signup/index.html.erb:2
+msgctxt "MultiAuth"
+msgid "Register your account"
+msgstr ""
+
+#: app/views/signup/index.html.erb:5
+msgctxt "MultiAuth"
+msgid "Let's start %{app}!"
+msgstr ""
+
+#: app/views/signup/index.html.erb:7
+msgctxt "MultiAuth"
+msgid "Registration is very easy."
+msgstr ""
+
+#: app/views/signup/index.html.erb:11
+msgctxt "MultiAuth"
+msgid "Register by OpenID!"
+msgstr ""
+
+#: app/views/signup/index.html.erb:13
+msgctxt "MultiAuth"
+msgid "Input OpenID"
+msgstr ""
+
+#: app/views/signup/index.html.erb:14
+msgctxt "MultiAuth"
+msgid "OpenID Authentication"
+msgstr ""
+
+#: app/views/signup/index.html.erb:15 app/views/signup/index.html.erb:35
+#: app/views/signup/index.html.erb:37
+msgctxt "MultiAuth"
+msgid "Confirmation"
+msgstr ""
+
+#: app/views/signup/index.html.erb:16 app/views/signup/index.html.erb:38
+msgctxt "MultiAuth"
+msgid "Registration completed!"
+msgstr ""
+
+#: app/views/signup/index.html.erb:17 app/views/signup/index.html.erb:39
+msgctxt "MultiAuth"
+msgid "Flow"
+msgstr ""
+
+#: app/views/signup/index.html.erb:28
+#: app/views/signup/open_id/index.html.erb:15
+msgctxt "MultiAuth"
+msgid "Next"
+msgstr ""
+
+#: app/views/signup/index.html.erb:32
+msgctxt "MultiAuth"
+msgid "Register by email address"
+msgstr ""
+
+#: app/views/signup/index.html.erb:34
+msgctxt "MultiAuth"
+msgid "Input email address and password"
+msgstr ""
+
+#: app/views/signup/index.html.erb:36
+msgctxt "MultiAuth"
+msgid "Recieve confirmation mail"
+msgstr ""
+
+#: app/views/signup/index.html.erb:60 app/views/signup/email/index.html.erb:27
+msgctxt "MultiAuth"
+msgid "Confirm"
+msgstr ""
+
+#: app/views/signup/open_id/authenticated.html.erb:2
+#: app/views/signup/open_id/index.html.erb:2
+#: app/views/signup/open_id/created.html.erb:2
+#: app/views/signup/email/activated.html.erb:2
+#: app/views/signup/email/index.html.erb:2
+#: app/views/signup/email/created.html.erb:2
+#: app/views/signup/email/validated.html.erb:2
+#: app/views/signup/email/activation.html.erb:2
+msgctxt "MultiAuth"
+msgid "Signup"
+msgstr ""
+
+#: app/views/signup/open_id/authenticated.html.erb:4
+msgctxt "MultiAuth"
+msgid "Authentication completed"
+msgstr ""
+
+#: app/views/signup/open_id/authenticated.html.erb:14
+#: app/views/signup/email/validated.html.erb:20
+msgctxt "MultiAuth"
+msgid "Register"
+msgstr ""
+
+#: app/views/signup/email/_progress.html.erb:9
+msgctxt "MultiAuth"
+msgid "Input login info"
+msgstr ""
+
+#: app/views/signup/email/_progress.html.erb:10
+msgctxt "MultiAuth"
+msgid "Confirm login info"
+msgstr ""
+
+#: app/views/signup/email/_progress.html.erb:11
+#: app/views/signup/email/created.html.erb:4
+msgctxt "MultiAuth"
+msgid "Pre-registration completed"
+msgstr ""
+
+#: app/views/signup/email/_progress.html.erb:12
+#: app/views/signup/email/validated.html.erb:4
+#: app/views/signup/email/activation.html.erb:4
+msgctxt "MultiAuth"
+msgid "Registration confirmation"
+msgstr ""
+
+#: app/views/signup/email/index.html.erb:4
+msgctxt "MultiAuth"
+msgid "Signup by email address"
+msgstr ""
+
+#: app/views/signup/email/created.html.erb:9
+msgctxt "MultiAuth"
+msgid "Sent a mail to %{email}."
+msgstr ""
+
+#: app/views/signup/email/validated.html.erb:14
+msgid "EmailCredential|Password"
+msgstr ""
+
+#: app/views/signup/email/activation.html.erb:9
+msgctxt "MultiAuth"
+msgid "Valid activation token"
+msgstr ""
+
+#: app/views/signup/email/activation.html.erb:11
+msgctxt "MultiAuth"
+msgid "Activated"
+msgstr ""
+
+#: app/views/signup/email/activation.html.erb:13
+msgctxt "MultiAuth"
+msgid "Inactivated"
+msgstr ""
+
+#: app/views/signup/email/activation.html.erb:22
+msgctxt "MultiAuth"
+msgid "Regist"
+msgstr ""
+
+#: app/views/signup/email/activation.html.erb:26
+msgctxt "MultiAuth"
+msgid "Invalid activation token"
+msgstr ""
+
+#: lib/open_id_authentication/result.rb:5
+msgctxt "OpenIdAuthentication"
+msgid "Sorry, the OpenID server couldn't be found"
+msgstr ""
+
+#: lib/open_id_authentication/result.rb:6
+msgctxt "OpenIdAuthentication"
+msgid "Sorry, but this does not appear to be a valid OpenID"
+msgstr ""
+
+#: lib/open_id_authentication/result.rb:7
+msgctxt "OpenIdAuthentication"
+msgid "OpenID verification was canceled"
+msgstr ""
+
+#: lib/open_id_authentication/result.rb:8
+msgctxt "OpenIdAuthentication"
+msgid "OpenID verification failed"
+msgstr ""
+
+#: lib/open_id_authentication/result.rb:9
+msgctxt "OpenIdAuthentication"
+msgid "OpenID verification needs setup"
+msgstr ""
+
+#: lib/multi_auth/action_controller.rb:34
+msgctxt "MultiAuth"
+msgid "Session has expired. Please login again."
+msgstr ""
+
+#: lib/multi_auth/action_controller.rb:43
+msgctxt "MultiAuth"
+msgid "Login required."
+msgstr ""

data/test/functional/auth/open_id_controller_test.rb

@@ -44,7 +44,7 @@ class Auth::OpenIdControllerTest < ActionController::TestCase
     }
     assert_response(:redirect)
     assert_redirected_to(:controller => 'signup/open_id', :action => 'index')
-    assert_equal('OpenID がまだ登録されていません。', @response.flash[:notice])
+    assert_equal('この OpenID はまだ登録されていません。', @response.flash[:notice])
   end
 
   [

data/test/functional/auth_controller_test.rb

@@ -2,13 +2,16 @@
 require 'test_helper'
 
 class AuthControllerTest < ActionController::TestCase
-  test "routes" do
-    base = {:controller => "auth"}
-
-    assert_routing("/auth",            base.merge(:action => "index"))
-    assert_routing("/auth/logged_in",  base.merge(:action => "logged_in"))
-    assert_routing("/auth/logout",     base.merge(:action => "logout"))
-    assert_routing("/auth/logged_out", base.merge(:action => "logged_out"))
+  [
+   [:get,  "/auth",            "index"],
+   [:get,  "/auth/logged_in",  "logged_in"],
+   [:post, "/auth/logout",     "logout"],
+   [:get,  "/auth/logged_out", "logged_out"]
+  ].each do |method, path, action|
+    test "routes #{method} #{path}" do
+      base = {:controller => "auth"}
+      assert_routing({ :method => method, :path => path }, base.merge(:action => action))
+    end
   end
 
   test "GET index" do

data/test/functional/credentials_controller_test.rb

@@ -46,4 +46,13 @@ class CredentialsControllerTest < ActionController::TestCase
     assert_redirected_to(root_path)
     assert_flash_error
   end
+
+  test "GET index, session expired" do
+    session[:expires_at] = Time.now - 1
+
+    get :index
+
+    assert_response(:success)
+    assert_flash_error
+  end
 end

data/test/unit/activation_mailer_test.rb

@@ -59,7 +59,7 @@ class ActivationMailerTest < ActionMailer::TestCase
       :activation_url => "http://activation/url",
     }
     expected = {
-      :subject    => "[#{MultiAuth.application_name}] メールアドレス認証登録",
+      :subject    => "[#{MultiAuth.application_name}] 認証用メールアドレス登録",
       :from       => @klass::FromAddress,
       :recipients => "recipients@example.jp",
       :body       => {:activation_url => "http://activation/url"},
@@ -80,7 +80,7 @@ class ActivationMailerTest < ActionMailer::TestCase
       :recipients => "recipients@example.jp",
     }
     expected = {
-      :subject    => "[#{MultiAuth.application_name}] メールアドレス認証登録完了",
+      :subject    => "[#{MultiAuth.application_name}] 認証用メールアドレス登録完了",
       :from       => @klass::FromAddress,
       :recipients => "recipients@example.jp",
       :body       => {},