okkez-multi_auth 0.0.4 → 0.0.5

data/app/views/signup/email/index.html.erb

@@ -1,7 +1,7 @@
 
-<%- @title = "サインアップ" -%>
+<%- @title = p_("MultiAuth", "Signup") -%>
 
-<h1>メールアドレスによるサインアップ</h1>
+<h1><%=h p_("MultiAuth", "Signup by email address") %></h1>
 
 <%= render(:partial => "progress", :locals => {:step => 1}) %>
 
@@ -24,7 +24,7 @@
       </td>
     </tr>
   </table>
- <div><%= submit_tag("確認画面へ") %></div>
+ <div><%= submit_tag(p_("MultiAuth", "Confirm")) %></div>
 <%- } -%>
 
 <%- unless production? -%>

data/app/views/signup/email/validated.html.erb

@@ -1,21 +1,21 @@
 
-<%- @title = "サインアップ" -%>
+<%- @title = p_("MultiAuth", "Signup") -%>
 
-<h1>登録確認</h1>
+<h1><%=h p_("MultiAuth", "Registration confirmation") %></h1>
 
 <%= render(:partial => "progress", :locals => {:step => 2}) %>
 
 <table>
   <tr>
-    <th>メールアドレス</th>
+    <th><%=h s_("EmailCredential|Email") %></th>
     <td><%=h @signup_form.email %></td>
   </tr>
   <tr>
-    <th>パスワード</th>
+    <th><%=h s_("EmailCredential|Password") %></th>
     <td><%=h @signup_form.masked_password %></td>
   </tr>
 </table>
 
 <%- form_tag(:action => "create") { -%>
-  <div><%= submit_tag("登録") %></div>
+  <div><%= submit_tag(p_("MultiAuth", "Register")) %></div>
 <%- } -%>

data/app/views/signup/index.html.erb

@@ -1,15 +1,21 @@
 
-<%- @title = "アカウント登録" -%>
+<%- @title = p_("MultiAuth", "Register your account") -%>
 <%- @enable_side_column = false -%>
 
-<h1>さあ、<%= MultiAuth.application_name %>をはじめよう</h1>
+<h1><%=h p_("MultiAuth", "Let's start %{app}!" % { :app => MultiAuth.application_name } ) %></h1>
 
-<div><%= MultiAuth.application_name %>のアカウント登録はとても簡単！</div>
+<div><%=h p_("MultiAuth", "Registration is very easy.") %></div>
 
 <div>
   <div style="float: left; width: 45%; margin-right: 10px;">
-    <h2>OpenIDで登録！</h2>
-    <div>登録の流れ: OpenIDを入力 → OpenID認証 → 確認 → 登録完了！</div>
+    <h2><%=h p_("MultiAuth", "Register by OpenID!") %></h2>
+    <div>
+      <%- steps = [p_("MultiAuth", "Input OpenID"),
+                   p_("MultiAuth", "OpenID Authentication"),
+                   p_("MultiAuth", "Confirmation"),
+                   p_("MultiAuth", "Registration completed!")] -%>
+      <%=h p_("MultiAuth", "Flow") %>: <%=h steps.join(" -> ") %>
+    </div>
     <%- form_tag(:controller => "signup/open_id", :action => "authenticate") { -%>
       <table>
         <tr>
@@ -19,12 +25,19 @@
           </td>
         </tr>
       </table>
-      <div><%= submit_tag("次へ") %></div>
+      <div><%= submit_tag(p_("MultiAuth", "Next")) %></div>
     <%- } -%>
   </div>
   <div style="float: left; width: 45%;">
-    <h2>メールアドレスで登録！</h2>
-    <div>登録の流れ: メールアドレスとパスワードを入力 → 確認 → 確認メール受信 → 確認 → 登録完了！</div>
+    <h2><%=h p_("MultiAuth", "Register by email address") %></h2>
+    <div>
+      <%- steps = [p_("MultiAuth", "Input email address and password"),
+                   p_("MultiAuth", "Confirmation"),
+                   p_("MultiAuth", "Recieve confirmation mail"),
+                   p_("MultiAuth", "Confirmation"),
+                   p_("MultiAuth", "Registration completed!")] -%>
+      <%=h p_("MultiAuth", "Flow") %>: <%=h steps.join(" -> ") %>
+    </div>
     <%- form_for(:signup_form, @signup_form, :url => {:controller => "signup/email", :action => "validate"}) { |f| -%>
       <table>
         <tr>
@@ -44,7 +57,7 @@
           </td>
         </tr>
       </table>
-     <div><%= submit_tag("確認画面へ") %></div>
+     <div><%= submit_tag(p_("MultiAuth", "Confirm")) %></div>
     <%- } -%>
   </div>
   <div style="clear: left;"></div>

data/app/views/signup/open_id/authenticated.html.erb

@@ -1,7 +1,7 @@
 
-<%- @title = "サインアップ" -%>
+<%- @title = p_("MultiAuth", "Signup") -%>
 
-<h1>認証完了</h1>
+<h1><%=h p_("MultiAuth", "Authentication completed") %></h1>
 
 <table>
   <tr>
@@ -11,5 +11,5 @@
 </table>
 
 <%- form_tag(:action => "create") { -%>
-  <div><%= submit_tag("登録") %></div>
+  <div><%= submit_tag(p_("MultiAuth", "Register")) %></div>
 <%- } -%>

data/app/views/signup/open_id/created.html.erb

@@ -1,6 +1,6 @@
 
-<%- @title = "サインアップ" -%>
+<%- @title = p_("MultiAuth", "Signup") -%>
 
-<h1>登録完了</h1>
+<h1><%=h p_("MultiAuth", "Registration completed") %></h1>
 
-<p><%= link_to('ログイン', :controller => "auth/open_id") %></p>
+<p><%= link_to(h(p_("MultiAuth", "Login")), :controller => "auth/open_id") %></p>

data/app/views/signup/open_id/index.html.erb

@@ -1,7 +1,7 @@
 
-<%- @title = "サインアップ" -%>
+<%- @title = p_("MultiAuth", "Signup") -%>
 
-<h1>サインアップ</h1>
+<h1><%=h @title %></h1>
 
 <%- form_tag(:action => "authenticate") { -%>
   <table>
@@ -12,5 +12,5 @@
       </td>
     </tr>
   </table>
-  <div><%= submit_tag("次へ") %></div>
+  <div><%= submit_tag(p_("MultiAuth", "Next")) %></div>
 <%- } -%>

data/config/cucumber.yml

@@ -0,0 +1,7 @@
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "#{rerun_opts} --format rerun --out rerun.txt --strict --tags ~@wip"
+%>
+default: <%= std_opts %>
+wip: --tags @wip:3 --wip features

data/config/database.yml

@@ -9,7 +9,7 @@ development:
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
-test:
+test: &TEST
   adapter: sqlite3
   database: db/test.sqlite3
   pool: 5
@@ -20,3 +20,6 @@ production:
   database: db/production.sqlite3
   pool: 5
   timeout: 5000
+
+cucumber:
+  <<: *TEST

data/config/environment.rb

@@ -2,7 +2,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

data/config/routes.rb

@@ -5,25 +5,32 @@ ActionController::Routing::Routes.draw do |map|
   TokenPattern = /[0-9a-f]+/
 
   if Rails.root.to_s == File.expand_path(File.join(File.dirname(__FILE__), '..'))
-    map.root :controller => "home", :action => "index"
+    map.root :controller => "home", :conditions => { :method => :get }
   end
 
-  map.connect "signup", :controller => "signup", :action => "index"
+  map.signup "signup", :controller => "signup", :conditions => { :method => :get }
 
-  map.with_options :controller => "signup/email" do |email|
-    email.connect "signup/email/:action",                      :action => /(index|validate|validated|create|created|activate|activated)/
-    email.connect "signup/email/activation/:activation_token", :action => "activation", :activation_token => TokenPattern
+  map.namespace :signup do |signup|
+    signup.with_options :controller => "email" do |email|
+      email.connect "email/:action",                      :action => /(index|validate|validated|create|created|activate|activated)/
+      email.connect "email/activation/:activation_token", :action => "activation", :activation_token => TokenPattern
+    end
+    signup.with_options :controller => "open_id" do |open_id|
+      open_id.connect "open_id/:action", :action => /(index|authenticate|authenticated|create|created)/
+    end
   end
 
-  map.with_options :controller => "signup/open_id" do |open_id|
-    open_id.connect "signup/open_id/:action", :action => /(index|authenticate|authenticated|create|created)/
+  map.with_options :controller => "auth" do |auth|
+    auth.auth "auth", :action => "index", :conditions => { :method => :get }
+    auth.logout "auth/logout", :action => "logout", :conditions => { :method => :post }
+    auth.connect "auth/:action", :action => /(logged_in|logged_out)/, :conditions => { :method => :get }
+  end
+  map.namespace :auth do |auth|
+    auth.connect "email/:action", :controller => "email", :action => /(index|login)/
+    auth.connect "open_id/:action", :controller => "open_id", :action => /(index|login)/
   end
 
-  map.connect "auth/:action", :controller => "auth", :action => /(logged_in|logout|logged_out)/
-  map.connect "auth/email/:action", :controller => "auth/email", :action => /(index|login)/
-  map.connect "auth/open_id/:action", :controller => "auth/open_id", :action => /(index|login)/
-
-  map.connect "credentials/:action", :controller => "credentials", :action => /(index)/
+  map.credentials "credentials",  :controller => "credentials", :conditions => { :method => :get }
 
   map.with_options :controller => "credentials/email" do |email|
     email.connect "credentials/email/:action",                        :action => /(new|create)/
@@ -36,16 +43,10 @@ ActionController::Routing::Routes.draw do |map|
     open_id.connect "credential/open_id/:open_id_credential_id/:action", :action => /(delete|destroy)/, :open_id_credential_id => IdPattern
   end
 
-  map.with_options :controller => "emails" do |emails|
-    emails.connect "emails/:action",                        :action => /(new|create)/
-    emails.connect "email/:email_address_id/:action",       :action => /(created|delete|destroy)/, :email_address_id => IdPattern
-    emails.connect "email/token/:activation_token/:action", :action => /(activation|activate|activated)/, :activation_token => TokenPattern
-  end
-
   # MEMO: 下記2行のデフォルトルールをコメントアウトしてrake test:functionalsを
   #       実行することにより、リンクチェックを行うことができる
   # NOTE: この二行を有効にするとアプリケーション側の config/routes.rb で定義した
   #       ルートが有効にならない
-  map.connect ":controller/:action/:id"
-  map.connect ":controller/:action/:id.:format"
+  # map.connect ":controller/:action/:id"
+  # map.connect ":controller/:action/:id.:format"
 end

data/lib/multi_auth.rb

@@ -6,6 +6,7 @@ module MultiAuth
     attr_accessor_with_default :application_name, 'app'
     attr_accessor_with_default :from_address, 'noreply@example.com'
     attr_accessor_with_default :user_model, 'User'
+    attr_accessor_with_default :session_times_out_in, 1.hour
     def setup
       yield self
     end
@@ -14,6 +15,10 @@ module MultiAuth
   def self.user_model_class
     user_model.constantize
   end
+
+  def self.root
+    Pathname.new(File.join(File.dirname(__FILE__), '../'))
+  end
 end
 
 require 'multi_auth/action_controller'

data/lib/multi_auth/action_controller.rb

@@ -11,6 +11,14 @@ module MultiAuth
       end
     end
     module InstanceMethods
+
+      def self.included(base)
+        base.class_eval{
+          init_gettext("multi_auth",
+                       :locale_path => MultiAuth.root + 'locale')
+        }
+      end
+
       private
 
       def authentication(user_id = session[:user_id])
@@ -19,15 +27,38 @@ module MultiAuth
       end
 
       def authentication_required
+        if session[:expires_at]
+          if session_expired?
+            logger.info "[MultiAuth] Session has expired, resetting session"
+            reset_login_session
+            set_error(p_("MultiAuth", "Session has expired. Please login again."))
+            return false
+          end
+          update_session_expiry
+        end
+
         if @login_user
           return true
         else
-          set_error("ログインが必要です。")
+          set_error(p_("MultiAuth", "Login required."))
           redirect_to(root_path)
           return false
         end
       end
 
+      def update_session_expiry
+        return unless MultiAuth.session_times_out_in
+        session[:expires_at] = Time.now + MultiAuth.session_times_out_in
+      end
+
+      def session_expired?
+        Time.now > session[:expires_at]
+      end
+
+      def reset_login_session
+        session[:user_id] = nil
+      end
+
       def set_notice(message)
         flash[:notice] = @flash_notice = message
         flash[:error]  = @flash_error  = nil

data/lib/open_id_authentication/result.rb

@@ -2,11 +2,11 @@
 module OpenIdAuthentication
   class Result
     ERROR_MESSAGES.update({
-      :missing      => "OpenID サーバが見つかりませんでした。",
-      :invalid      => "OpenID が不正です。",
-      :canceled     => "OpenID の検証がキャンセルされました。",
-      :failed       => "OpenID の検証が失敗しました。",
-      :setup_needed => "OpenID の検証には準備が必要です。",
+      :missing      => p_("OpenIdAuthentication", "Sorry, the OpenID server couldn't be found"),
+      :invalid      => p_("OpenIdAuthentication", "Sorry, but this does not appear to be a valid OpenID"),
+      :canceled     => p_("OpenIdAuthentication", "OpenID verification was canceled"),
+      :failed       => p_("OpenIdAuthentication", "OpenID verification failed"),
+      :setup_needed => p_("OpenIdAuthentication", "OpenID verification needs setup"),
     })
   end
 end

data/po/ja/multi_auth.po

@@ -0,0 +1,639 @@
+# Japanese translations for PACKAGE package
+# PACKAGE パッケージに対する英訳.
+# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# okkez <okkez000@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: multi_auth 1.0.0\n"
+"POT-Creation-Date: 2010-01-06 15:47+0900\n"
+"PO-Revision-Date: 2010-01-06 16:00+0900\n"
+"Last-Translator: okkez <okkez000@gmail.com>\n"
+"Language-Team: Japanese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\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 "OpenID 認証情報を追加しました。"
+
+#: app/controllers/credentials/open_id_controller.rb:41
+msgctxt "MultiAuth"
+msgid "This OpenID has been already registered."
+msgstr "この OpenID は既に本登録されています。"
+
+#: app/controllers/credentials/open_id_controller.rb:61
+msgctxt "MultiAuth"
+msgid "OpenID authentication credential was successfully deleted."
+msgstr "OpenID 認証情報を削除しました。"
+
+#: 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 "OpenID 認証情報が正しくありません。"
+
+#: 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 "この OpenID はまだ登録されていません。"
+
+#: 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 "指定された OpenID は既に登録されているため、利用できません。"
+
+#: 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 "OpenID URL"
+
+#: 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 "OpenID 認証"
+
+#: app/views/credentials/index.html.erb:19
+msgctxt "MultiAuth"
+msgid "Add OpenID authentication"
+msgstr "OpenID 認証情報を追加"
+
+#: app/views/credentials/index.html.erb:27
+msgctxt "MultiAuth"
+msgid "There are no OpenID authentication."
+msgstr "OpenID 認証情報が登録されていません。"
+
+#: 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 "OpenID 認証情報を削除する。"
+
+#: 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 "OpenID 認証情報を追加"
+
+#: 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 ""
+"指定されたメールアドレスにメールを送信しました。\n"
+"メールに記載してある URL にアクセスして登録を完了してください。"
+
+#: 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 "ページが切り替わらない場合は %{link} をクリックしてください。"
+
+#: 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 "OpenID によるログイン"
+
+#: 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 "以下の URL にアクセスすると登録は完了します。"
+
+#: 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 "現時点では、Cookieに対応していない携帯電話等からは登録を行うことができません。"
+
+#: 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 "お手数ではございますが、本メールをPC等に転送した上で、登録をお願いいたします。"
+
+#: app/views/activation_mailer/request_for_signup.erb:1
+msgctxt "MultiAuth"
+msgid "Thank you for the user registration to %{app}."
+msgstr "%{app} へのユーザ登録、ありがとうございます。"
+
+#: 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} をはじめよう！"
+
+#: 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 "OpenID による登録"
+
+#: app/views/signup/index.html.erb:13
+msgctxt "MultiAuth"
+msgid "Input OpenID"
+msgstr "OpenID を入力"
+
+#: app/views/signup/index.html.erb:14
+msgctxt "MultiAuth"
+msgid "OpenID Authentication"
+msgstr "OpenID 認証"
+
+#: 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 "%{email} にメールを送信しました。"
+
+#: 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 "OpenID サーバが見つかりませんでした。"
+
+#: lib/open_id_authentication/result.rb:6
+msgctxt "OpenIdAuthentication"
+msgid "Sorry, but this does not appear to be a valid OpenID"
+msgstr "OpenID が不正です。"
+
+#: lib/open_id_authentication/result.rb:7
+msgctxt "OpenIdAuthentication"
+msgid "OpenID verification was canceled"
+msgstr "OpenID の検証がキャンセルされました。"
+
+#: lib/open_id_authentication/result.rb:8
+msgctxt "OpenIdAuthentication"
+msgid "OpenID verification failed"
+msgstr "OpenID の検証が失敗しました。"
+
+#: lib/open_id_authentication/result.rb:9
+msgctxt "OpenIdAuthentication"
+msgid "OpenID verification needs setup"
+msgstr "OpenID の検証には準備が必要です。"
+
+#: 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 "ログインが必要です。"