multi_auth 0.1.0 → 0.2.0

data/app/views/credentials/name/delete.html.erb

@@ -0,0 +1,19 @@
+<%- @title = p_("MultiAuth", "Delete name authentication credential.") -%>
+
+<h1><%=h @title %></h1>
+
+<div>
+  <%=h p_("MultiAuth", "Delete name authentication credential.") %>
+  <%=h p_("MultiAuth", "Are you sure?") %>
+</div>
+
+<table>
+  <tr>
+    <th><%=h s_("NameCredential|Name") %></th>
+    <td><%=h @name_credential.name %></td>
+  </tr>
+</table>
+
+<%- form_tag(:action => "destroy") { -%>
+  <div><%= submit_tag(p_("MultiAuth", "Delete")) %></div>
+<%- } -%>

data/app/views/credentials/name/edit_password.html.erb

@@ -0,0 +1,27 @@
+<%- @title = p_("MultiAuth", "Update password") -%>
+
+<h1><%=h @title %></h1>
+
+<%- form_for(:edit_form, @edit_form, :url => {:action => "update_password"}) { |f| -%>
+  <table>
+    <tr>
+      <th><%= f.label(:name) %></th>
+      <td><%=h @name_credential.name %></td>
+    </tr>
+    <tr>
+      <th><%= f.label(:password) %></th>
+      <td>
+        <div><%= f.password_field(:password, :size => 20) %></div>
+        <div><%= f.password_field(:password_confirmation, :size => 20) %></div>
+        <%= error_message_on(:edit_form, :password) %>
+      </td>
+    </tr>
+  </table>
+ <div><%= submit_tag(p_("MultiAuth", "Update")) %></div>
+<%- } -%>
+
+<%- unless production? -%>
+  <div class="debug">
+    <%= error_messages_for(:edit_form) %>
+  </div>
+<%- end -%>

data/app/views/credentials/name/new.html.erb

@@ -0,0 +1,32 @@
+<%- @title = p_("MultiAuth", "Add name authentication credential") -%>
+
+<h1><%=h @title %></h1>
+
+<%- form_for(:edit_form, @edit_form, :url => {:action => "create"}) { |f| -%>
+  <table>
+    <tr>
+      <th><%= f.label(:name) %></th>
+      <td>
+        <%= f.text_field(:name, :size => 30) %>
+        <%= error_message_on(:edit_form, :name) %>
+        <%= error_message_on(:name_credential, :name) %>
+      </td>
+    </tr>
+    <tr>
+      <th><%= f.label(:password) %></th>
+      <td>
+        <div><%= f.password_field(:password, :size => 20) %></div>
+        <div><%= f.password_field(:password_confirmation, :size => 20) %></div>
+        <%= error_message_on(:edit_form, :password) %>
+      </td>
+    </tr>
+  </table>
+ <div><%= submit_tag(p_("MultiAuth", "Add")) %></div>
+<%- } -%>
+
+<%- unless production? -%>
+  <div class="debug">
+    <%= error_messages_for(:edit_form) %>
+    <%= error_messages_for(:name_credential) %>
+  </div>
+<%- end -%>

data/config/routes.rb

@@ -28,6 +28,7 @@ ActionController::Routing::Routes.draw do |map|
   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)/
+    auth.connect "name/:action", :controller => "name", :action => /(index|login)/
   end
 
   map.credentials "credentials",  :controller => "credentials", :conditions => { :method => :get }
@@ -43,6 +44,13 @@ 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 => "credentials/name" do |name|
+    name.connect "credentials/name/:action", :action => /(new|create)/
+    name.connect("credential/name/:name_credential_id/:action",
+                 :action => /(edit_password|update_password|delete|destroy)/,
+                 :name_credential_id => IdPattern)
+  end
+
   # MEMO: 下記2行のデフォルトルールをコメントアウトしてrake test:functionalsを
   #       実行することにより、リンクチェックを行うことができる
   # NOTE: この二行を有効にするとアプリケーション側の config/routes.rb で定義した

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20090415163347) do
+ActiveRecord::Schema.define(:version => 20100813091052) do
 
   create_table "email_credentials", :force => true do |t|
     t.datetime "created_at",                      :null => false
@@ -27,6 +27,18 @@ ActiveRecord::Schema.define(:version => 20090415163347) do
   add_index "email_credentials", ["email"], :name => "index_email_credentials_on_email", :unique => true
   add_index "email_credentials", ["user_id"], :name => "index_email_credentials_on_user_id"
 
+  create_table "name_credentials", :force => true do |t|
+    t.datetime "created_at",                     :null => false
+    t.integer  "user_id",                        :null => false
+    t.string   "name",            :limit => 200, :null => false
+    t.string   "hashed_password", :limit => 73,  :null => false
+    t.datetime "loggedin_at"
+  end
+
+  add_index "name_credentials", ["created_at"], :name => "index_name_credentials_on_created_at"
+  add_index "name_credentials", ["name"], :name => "index_name_credentials_on_name", :unique => true
+  add_index "name_credentials", ["user_id"], :name => "index_name_credentials_on_user_id"
+
   create_table "open_id_authentication_associations", :force => true do |t|
     t.integer "issued"
     t.integer "lifetime"

data/generators/multi_auth_migration/templates/migration.rb

@@ -26,10 +26,23 @@ class <%= class_name %> < ActiveRecord::Migration
     add_index :email_credentials, :user_id
     add_index :email_credentials, :email, :unique => true
     add_index :email_credentials, :activated_at
+
+    create_table :name_credentials do |t|
+      t.datetime :created_at,       :null => false
+      t.integer  :user_id,          :null => false
+      t.string   :name,             :null => false, :limit => 200
+      t.string   :hashed_password,  :null => false, :limit => 8 + 1 + 64
+      t.datetime :loggedin_at,      :null => true
+    end
+
+    add_index :name_credentials, :created_at
+    add_index :name_credentials, :user_id
+    add_index :name_credentials, :name, :unique => true
   end
 
   def self.down
     drop_table :open_id_credentials
     drop_table :email_credentials
+    drop_table :name_credentials
   end
 end

data/generators/multi_auth_migration/templates/upgrade_migration.rb

@@ -0,0 +1,19 @@
+class <%= class_name %> < ActiveRecord::Migration
+  def self.up
+    create_table :name_credentials do |t|
+      t.datetime :created_at,       :null => false
+      t.integer  :user_id,          :null => false
+      t.string   :name,             :null => false, :limit => 200
+      t.string   :hashed_password,  :null => false, :limit => 8 + 1 + 64
+      t.datetime :loggedin_at,      :null => true
+    end
+
+    add_index :name_credentials, :created_at
+    add_index :name_credentials, :user_id
+    add_index :name_credentials, :name, :unique => true
+  end
+
+  def self.down
+    drop_table :name_credentials
+  end
+end

data/generators/multi_auth_migration/upgrade_multi_auth_tables_generator.rb

@@ -0,0 +1,11 @@
+class UpgradeMultiAuthTablesGenerator < Rails::Generator::NamedBase
+  def initialize(runtime_args, runtime_options = { })
+    super
+  end
+
+  def manifest
+    record do |m|
+      m.migration_template('upgrade_migration.rb', 'db/migrate')
+    end
+  end
+end

data/lib/multi_auth.rb

@@ -7,6 +7,7 @@ module MultiAuth
     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
+    attr_accessor_with_default :credentials, { :open_id => true, :email => true, :name => true }
     def setup
       yield self
     end

data/lib/multi_auth/active_record.rb

@@ -6,6 +6,7 @@ module MultiAuth
         class_eval do
           has_many :open_id_credentials, :foreign_key => 'user_id', :dependent => :destroy
           has_many :email_credentials, :foreign_key => 'user_id', :dependent => :destroy
+          has_many :name_credentials, :foreign_key => 'user_id', :dependent => :destroy
         end
       end
     end

data/po/ja/multi_auth.po

@@ -7,10 +7,11 @@
 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"
+"POT-Creation-Date: 2010-08-16 18:38+0900\n"
+"PO-Revision-Date: 2010-08-16 18:45+0900\n"
 "Last-Translator: okkez <okkez000@gmail.com>\n"
 "Language-Team: Japanese\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,6 +24,8 @@ msgstr "メール認証情報を追加しました。"
 
 #: app/controllers/credentials/email_controller.rb:46
 #: app/controllers/credentials/email_controller.rb:73
+#: app/controllers/credentials/name_controller.rb:29
+#: app/controllers/credentials/name_controller.rb:51
 #: app/controllers/credentials/open_id_controller.rb:22
 #: app/controllers/signup/email_controller.rb:27
 #: app/controllers/signup/email_controller.rb:39
@@ -32,6 +35,7 @@ msgid "Please confirm your input."
 msgstr "入力内容を確認してください。"
 
 #: app/controllers/credentials/email_controller.rb:68
+#: app/controllers/credentials/name_controller.rb:46
 msgctxt "MultiAuth"
 msgid "Password was changed."
 msgstr "パスワードを変更しました。"
@@ -57,6 +61,22 @@ msgctxt "MultiAuth"
 msgid "This email authentication credential has been already activated."
 msgstr "このメール認証情報は既に有効になっています。"
 
+#: app/controllers/credentials/name_controller.rb:24
+msgctxt "MultiAuth"
+msgid "Name authentication credential was successfully added."
+msgstr "名前による認証情報を追加しました。"
+
+#: app/controllers/credentials/name_controller.rb:65
+msgctxt "MultiAuth"
+msgid "Name authentication credential was successfully deleted."
+msgstr "名前による認証情報を削除しました。"
+
+#: app/controllers/credentials/name_controller.rb:77
+#: app/controllers/credentials/name_controller.rb:87
+msgctxt "MultiAuth"
+msgid "It is invalid name authentication credential."
+msgstr "名前による認証情報が正しくありません。"
+
 #: app/controllers/credentials/open_id_controller.rb:37
 msgctxt "MultiAuth"
 msgid "OpenID authentication credential was successfully added."
@@ -78,11 +98,33 @@ msgctxt "MultiAuth"
 msgid "It is invalid OpenID authentication credential."
 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/controllers/auth/email_controller.rb:30
 msgctxt "MultiAuth"
 msgid "The email address or the password is wrong."
 msgstr "メールアドレスかパスワードが間違っています。"
 
+#: app/controllers/auth/name_controller.rb:27
+msgctxt "MultiAuth"
+msgid "The name or the password is wrong."
+msgstr "名前かパスワードが間違っています。"
+
 #: app/controllers/auth/open_id_controller.rb:24
 #: app/views/auth/logged_in.html.erb:2
 msgctxt "MultiAuth"
@@ -94,22 +136,13 @@ 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/models/email_login_form.rb:15
+msgid "EmailLoginForm|Email"
+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_login_form.rb:16
+msgid "EmailLoginForm|Password"
+msgstr "パスワード"
 
 #: app/models/email_credential_edit_form.rb:21
 msgid "EmailCredentialEditForm|Email"
@@ -127,6 +160,69 @@ msgstr "パスワード (確認)"
 msgid "OpenIdLoginForm|Openid url"
 msgstr "OpenID URL"
 
+#: app/models/name_credential_edit_form.rb:11
+msgid "NameCredentialEditForm|Name"
+msgstr "名前"
+
+#: app/models/name_credential_edit_form.rb:12
+msgid "NameCredentialEditForm|Password"
+msgstr "パスワード"
+
+#: app/models/name_credential_edit_form.rb:13
+msgid "NameCredentialEditForm|Password confirmation"
+msgstr "パスワード (確認)"
+
+#: app/models/name_credential.rb:-
+msgid "name credential"
+msgstr ""
+
+#: app/models/name_credential.rb:-
+#: app/views/credentials/name/delete.html.erb:12
+#: app/views/credentials/index.html.erb:99
+msgid "NameCredential|Name"
+msgstr "名前"
+
+#: app/models/name_credential.rb:- app/views/credentials/index.html.erb:98
+msgid "NameCredential|Loggedin at"
+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/email/delete.html.erb:13
+#: app/views/credentials/email/activation.html.erb:8
+#: app/views/credentials/index.html.erb:53
+#: app/views/signup/email/activation.html.erb:16
+#: app/views/signup/email/validated.html.erb:10
+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:52
+msgid "EmailCredential|Loggedin at"
+msgstr "最終ログイン日時"
+
+#: app/models/email_credential.rb:22 app/views/credentials/index.html.erb:51
+msgid "EmailCredential|Activated on"
+msgstr "登録日時"
+
+#: app/models/password_edit_form.rb:7
+msgid "EmailPasswordEditForm|Password"
+msgstr "パスワード"
+
+#: app/models/password_edit_form.rb:8
+msgid "EmailPasswordEditForm|Password confirmation"
+msgstr "パスワード (確認)"
+
 #: app/models/activation_mailer.rb:17
 msgctxt "MultiAuth"
 msgid "User registration"
@@ -157,33 +253,13 @@ msgctxt "MultiAuth"
 msgid "Email address registration for notification completed"
 msgstr "通知先メールアドレス登録完了"
 
-#: app/models/email_credential.rb:-
-msgid "email credential"
-msgstr ""
+#: app/models/name_login_form.rb:5
+msgid "NameLoginForm|Name"
+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/name_login_form.rb:6
+msgid "NameLoginForm|Password"
+msgstr "パスワード"
 
 #: app/models/open_id_credential.rb:-
 msgid "open id credential"
@@ -193,117 +269,139 @@ msgstr ""
 msgid "OpenIdCredential|Identity url"
 msgstr ""
 
-#: app/models/open_id_credential.rb:- app/views/credentials/index.html.erb:10
+#: app/models/open_id_credential.rb:- app/views/credentials/index.html.erb:11
 msgid "OpenIdCredential|Loggedin at"
 msgstr "ログイン日時"
 
-#: app/models/open_id_credential.rb:19 app/views/credentials/index.html.erb:9
+#: app/models/open_id_credential.rb:19 app/views/credentials/index.html.erb:10
 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
+#: app/views/activation_mailer/complete_for_credential.erb:1
 msgctxt "MultiAuth"
-msgid "Login setting"
-msgstr "ログイン設定"
+msgid "The registration of the email address authentication was completed."
+msgstr "メールアドレス認証の登録は完了しました。"
 
-#: app/views/credentials/index.html.erb:4
+#: app/views/activation_mailer/request_for_notice.erb:1
 msgctxt "MultiAuth"
-msgid "OpenID authentication"
-msgstr "OpenID 認証"
+msgid "Email address for notification will be registered."
+msgstr "通知用メールアドレスを登録します。"
 
-#: app/views/credentials/index.html.erb:19
+#: app/views/activation_mailer/request_for_notice.erb:2
+#: app/views/activation_mailer/request_for_signup.erb:2
+#: app/views/activation_mailer/request_for_credential.erb:2
 msgctxt "MultiAuth"
-msgid "Add OpenID authentication"
-msgstr "OpenID 認証情報を追加"
+msgid "Registration is completed by accessing following URL."
+msgstr "以下の URL にアクセスすると登録は完了します。"
 
-#: app/views/credentials/index.html.erb:27
+#: app/views/activation_mailer/request_for_notice.erb:6
+#: app/views/activation_mailer/request_for_signup.erb:6
+#: app/views/activation_mailer/request_for_credential.erb:6
 msgctxt "MultiAuth"
-msgid "There are no OpenID authentication."
-msgstr "OpenID 認証情報が登録されていません。"
+msgid "- For access with cellular phone etc."
+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
+#: app/views/activation_mailer/request_for_notice.erb:7
+#: app/views/activation_mailer/request_for_signup.erb:7
+#: app/views/activation_mailer/request_for_credential.erb:7
 msgctxt "MultiAuth"
-msgid "Delete"
-msgstr "削除"
+msgid ""
+"It is not possible to register from the cellular phone etc. that do not "
+"correspond to Cookie now."
+msgstr ""
+"現時点では、Cookieに対応していない携帯電話等からは登録を行うことができませ"
+"ん。"
 
-#: app/views/credentials/index.html.erb:43
+#: app/views/activation_mailer/request_for_notice.erb:8
+#: app/views/activation_mailer/request_for_signup.erb:8
+#: app/views/activation_mailer/request_for_credential.erb:8
 msgctxt "MultiAuth"
-msgid "Email address authentication"
-msgstr "メールアドレス認証情報"
+msgid ""
+"Please register after forwarding this mail to PC etc. though it is time."
+msgstr ""
+"お手数ではございますが、本メールをPC等に転送した上で、登録をお願いいたしま"
+"す。"
 
-#: app/views/credentials/index.html.erb:58
+#: app/views/activation_mailer/request_for_signup.erb:1
 msgctxt "MultiAuth"
-msgid "Add email address authentication"
-msgstr "メールアドレス認証情報を追加"
+msgid "Thank you for the user registration to %{app}."
+msgstr "%{app} へのユーザ登録、ありがとうございます。"
 
-#: app/views/credentials/index.html.erb:66
+#: app/views/activation_mailer/complete_for_notice.erb:1
 msgctxt "MultiAuth"
-msgid "There are no email address authentication."
-msgstr "メールアドレス認証情報が登録されていません。"
+msgid "The email address registration was completed."
+msgstr "メールアドレスの登録が完了しました。"
 
-#: app/views/credentials/index.html.erb:77
+#: app/views/activation_mailer/request_for_credential.erb:1
 msgctxt "MultiAuth"
-msgid "Waiting for activation"
-msgstr "アクティベーション待ち"
+msgid "Email address for authentication will be registered."
+msgstr "認証用メールアドレスを登録します。"
 
-#: app/views/credentials/index.html.erb:80
-#: app/views/credentials/email/edit_password.html.erb:2
+#: app/views/activation_mailer/complete_for_signup.erb:1
 msgctxt "MultiAuth"
-msgid "Update password"
-msgstr "パスワード変更"
+msgid "The user registration was completed."
+msgstr "ユーザ登録が完了しました。"
 
-#: app/views/credentials/open_id/delete.html.erb:2
-#: app/views/credentials/open_id/delete.html.erb:7
+#: app/views/credentials/name/delete.html.erb:1
+#: app/views/credentials/name/delete.html.erb:6
 msgctxt "MultiAuth"
-msgid "Delete OpenID authentication credential."
-msgstr "OpenID 認証情報を削除する。"
+msgid "Delete name authentication credential."
+msgstr "名前による認証情報を削除する。"
 
-#: app/views/credentials/open_id/delete.html.erb:8
+#: app/views/credentials/name/delete.html.erb:7
 #: app/views/credentials/email/delete.html.erb:8
+#: app/views/credentials/open_id/delete.html.erb:8
 msgctxt "MultiAuth"
 msgid "Are you sure?"
 msgstr "よろしいですか？"
 
-#: app/views/credentials/open_id/new.html.erb:2
+#: app/views/credentials/name/delete.html.erb:18
+#: app/views/credentials/email/delete.html.erb:19
+#: app/views/credentials/index.html.erb:37
+#: app/views/credentials/index.html.erb:84
+#: app/views/credentials/index.html.erb:126
+#: app/views/credentials/open_id/delete.html.erb:19
 msgctxt "MultiAuth"
-msgid "Add OpenID authentication credential"
-msgstr "OpenID 認証情報を追加"
+msgid "Delete"
+msgstr "削除"
 
-#: app/views/credentials/open_id/new.html.erb:16
+#: app/views/credentials/name/new.html.erb:1
+msgctxt "MultiAuth"
+msgid "Add name authentication credential"
+msgstr "名前による認証情報を追加"
+
+#: app/views/credentials/name/new.html.erb:24
 #: app/views/credentials/email/new.html.erb:25
+#: app/views/credentials/open_id/new.html.erb:16
 msgctxt "MultiAuth"
 msgid "Add"
 msgstr "追加"
 
+#: app/views/credentials/name/edit_password.html.erb:1
+#: app/views/credentials/email/edit_password.html.erb:2
+#: app/views/credentials/index.html.erb:83
+#: app/views/credentials/index.html.erb:125
+msgctxt "MultiAuth"
+msgid "Update password"
+msgstr "パスワード変更"
+
+#: app/views/credentials/name/edit_password.html.erb:20
 #: app/views/credentials/email/edit_password.html.erb:21
 msgctxt "MultiAuth"
 msgid "Update"
 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/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
+#: app/views/signup/email/_progress.html.erb:13
+#: app/views/signup/open_id/created.html.erb:4
 msgctxt "MultiAuth"
 msgid "Registration completed"
 msgstr "登録完了"
@@ -313,11 +411,15 @@ msgctxt "MultiAuth"
 msgid "Top"
 msgstr "トップ"
 
-#: app/views/credentials/email/delete.html.erb:2
-#: app/views/credentials/email/delete.html.erb:7
+#: app/views/credentials/email/activation.html.erb:2
 msgctxt "MultiAuth"
-msgid "Delete email authentication credential."
-msgstr "メール認証情報を削除する。"
+msgid "Activation"
+msgstr "アクティベーション"
+
+#: app/views/credentials/email/activation.html.erb:14
+msgctxt "MultiAuth"
+msgid "Activate"
+msgstr "アクティベーションする"
 
 #: app/views/credentials/email/new.html.erb:2
 msgctxt "MultiAuth"
@@ -343,108 +445,169 @@ msgctxt "MultiAuth"
 msgid "Back"
 msgstr "戻る"
 
-#: app/views/credentials/email/activation.html.erb:2
+#: app/views/credentials/index.html.erb:2
 msgctxt "MultiAuth"
-msgid "Activation"
-msgstr "アクティベーション"
+msgid "Login setting"
+msgstr "ログイン設定"
 
-#: app/views/credentials/email/activation.html.erb:14
+#: app/views/credentials/index.html.erb:5
 msgctxt "MultiAuth"
-msgid "Activate"
-msgstr "アクティベーションする"
+msgid "OpenID authentication"
+msgstr "OpenID 認証"
 
-#: app/views/auth/logged_out.html.erb:2
+#: app/views/credentials/index.html.erb:20
 msgctxt "MultiAuth"
-msgid "You have been logged out."
-msgstr "ログアウトしました。"
+msgid "Add OpenID authentication"
+msgstr "OpenID 認証情報を追加"
 
-#: app/views/auth/logged_out.html.erb:21 app/views/auth/logged_in.html.erb:21
+#: app/views/credentials/index.html.erb:28
 msgctxt "MultiAuth"
-msgid "Please click %{link} when the page doesn't change."
-msgstr "ページが切り替わらない場合は %{link} をクリックしてください。"
+msgid "There are no OpenID authentication."
+msgstr "OpenID 認証情報が登録されていません。"
+
+#: app/views/credentials/index.html.erb:46
+msgctxt "MultiAuth"
+msgid "Email address authentication"
+msgstr "メールアドレス認証情報"
+
+#: app/views/credentials/index.html.erb:61
+msgctxt "MultiAuth"
+msgid "Add email address authentication"
+msgstr "メールアドレス認証情報を追加"
+
+#: app/views/credentials/index.html.erb:69
+msgctxt "MultiAuth"
+msgid "There are no email address authentication."
+msgstr "メールアドレス認証情報が登録されていません。"
+
+#: app/views/credentials/index.html.erb:80
+msgctxt "MultiAuth"
+msgid "Waiting for activation"
+msgstr "アクティベーション待ち"
+
+#: app/views/credentials/index.html.erb:93
+msgctxt "MultiAuth"
+msgid "Name authentication"
+msgstr "名前による認証"
+
+#: app/views/credentials/index.html.erb:107
+msgctxt "MultiAuth"
+msgid "Add name authentication"
+msgstr "名前による認証情報を追加"
+
+#: app/views/credentials/index.html.erb:115
+msgctxt "MultiAuth"
+msgid "There are no name authentication."
+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/new.html.erb:2
+msgctxt "MultiAuth"
+msgid "Add OpenID authentication credential"
+msgstr "OpenID 認証情報を追加"
+
+#: app/views/signup/email/activated.html.erb:2
+#: app/views/signup/email/activation.html.erb:2
+#: app/views/signup/email/validated.html.erb:2
+#: app/views/signup/email/index.html.erb:2
+#: app/views/signup/email/created.html.erb:2
+#: 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
+msgctxt "MultiAuth"
+msgid "Signup"
+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
+#: app/views/signup/open_id/created.html.erb:6
+#: app/views/auth/name/index.html.erb:1 app/views/auth/name/index.html.erb:63
+#: app/views/auth/name/index.html.erb:81 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/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
 msgctxt "MultiAuth"
 msgid "Login"
 msgstr "ログイン"
 
-#: app/views/auth/index.html.erb:5
+#: app/views/signup/email/activation.html.erb:4
+#: app/views/signup/email/validated.html.erb:4
+#: app/views/signup/email/_progress.html.erb:12
 msgctxt "MultiAuth"
-msgid "By OpenID"
-msgstr "OpenID によるログイン"
+msgid "Registration confirmation"
+msgstr "登録確認"
 
-#: app/views/auth/index.html.erb:21
+#: app/views/signup/email/activation.html.erb:9
 msgctxt "MultiAuth"
-msgid "By email address"
-msgstr "メールアドレスによるログイン"
+msgid "Valid activation token"
+msgstr "有効なアクティベーショントークン"
 
-#: app/views/activation_mailer/request_for_credential.erb:1
+#: app/views/signup/email/activation.html.erb:11
 msgctxt "MultiAuth"
-msgid "Email address for authentication will be registered."
-msgstr "認証用メールアドレスを登録します。"
+msgid "Activated"
+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
+#: app/views/signup/email/activation.html.erb:13
 msgctxt "MultiAuth"
-msgid "Registration is completed by accessing following URL."
-msgstr "以下の URL にアクセスすると登録は完了します。"
+msgid "Inactivated"
+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
+#: app/views/signup/email/activation.html.erb:22
 msgctxt "MultiAuth"
-msgid "- For access with cellular phone etc."
-msgstr "※ 携帯電話等でのアクセスに関して"
+msgid "Regist"
+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
+#: app/views/signup/email/activation.html.erb:26
 msgctxt "MultiAuth"
-msgid ""
-"It is not possible to register from the cellular phone etc. that do not "
-"correspond to Cookie now."
-msgstr "現時点では、Cookieに対応していない携帯電話等からは登録を行うことができません。"
+msgid "Invalid activation token"
+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
+#: app/views/signup/email/validated.html.erb:14
+msgid "EmailCredential|Password"
+msgstr "パスワード"
+
+#: app/views/signup/email/validated.html.erb:20
+#: app/views/signup/open_id/authenticated.html.erb:14
 msgctxt "MultiAuth"
-msgid ""
-"Please register after forwarding this mail to PC etc. though it is time."
-msgstr "お手数ではございますが、本メールをPC等に転送した上で、登録をお願いいたします。"
+msgid "Register"
+msgstr "登録"
 
-#: app/views/activation_mailer/request_for_signup.erb:1
+#: app/views/signup/email/index.html.erb:4
 msgctxt "MultiAuth"
-msgid "Thank you for the user registration to %{app}."
-msgstr "%{app} へのユーザ登録、ありがとうございます。"
+msgid "Signup by email address"
+msgstr "メールアドレスによる登録"
 
-#: app/views/activation_mailer/complete_for_notice.erb:1
+#: app/views/signup/email/index.html.erb:27 app/views/signup/index.html.erb:60
 msgctxt "MultiAuth"
-msgid "The email address registration was completed."
-msgstr "メールアドレスの登録が完了しました。"
+msgid "Confirm"
+msgstr "確認"
 
-#: app/views/activation_mailer/request_for_notice.erb:1
+#: app/views/signup/email/created.html.erb:4
+#: app/views/signup/email/_progress.html.erb:11
 msgctxt "MultiAuth"
-msgid "Email address for notification will be registered."
-msgstr "通知用メールアドレスを登録します。"
+msgid "Pre-registration completed"
+msgstr "仮登録完了"
 
-#: app/views/activation_mailer/complete_for_credential.erb:1
+#: app/views/signup/email/created.html.erb:9
 msgctxt "MultiAuth"
-msgid "The registration of the email address authentication was completed."
-msgstr "メールアドレス認証の登録は完了しました。"
+msgid "Sent a mail to %{email}."
+msgstr "%{email} にメールを送信しました。"
 
-#: app/views/activation_mailer/complete_for_signup.erb:1
+#: app/views/signup/email/_progress.html.erb:9
 msgctxt "MultiAuth"
-msgid "The user registration was completed."
-msgstr "ユーザ登録が完了しました。"
+msgid "Input login info"
+msgstr "ログイン情報入力"
+
+#: app/views/signup/email/_progress.html.erb:10
+msgctxt "MultiAuth"
+msgid "Confirm login info"
+msgstr "ログイン情報確認"
 
 #: app/views/signup/index.html.erb:2
 msgctxt "MultiAuth"
@@ -513,95 +676,40 @@ 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
+#: app/views/auth/logged_out.html.erb:2
 msgctxt "MultiAuth"
-msgid "Sent a mail to %{email}."
-msgstr "%{email} にメールを送信しました。"
-
-#: app/views/signup/email/validated.html.erb:14
-msgid "EmailCredential|Password"
-msgstr "パスワード"
+msgid "You have been logged out."
+msgstr "ログアウトしました。"
 
-#: app/views/signup/email/activation.html.erb:9
+#: app/views/auth/logged_out.html.erb:10 app/views/auth/logged_in.html.erb:10
 msgctxt "MultiAuth"
-msgid "Valid activation token"
-msgstr "有効なアクティベーショントークン"
+msgid "Please click %{link} when the page doesn't change."
+msgstr "ページが切り替わらない場合は %{link} をクリックしてください。"
 
-#: app/views/signup/email/activation.html.erb:11
+#: app/views/auth/index.html.erb:5
 msgctxt "MultiAuth"
-msgid "Activated"
-msgstr "アクティベーション済"
+msgid "By OpenID"
+msgstr "OpenID によるログイン"
 
-#: app/views/signup/email/activation.html.erb:13
+#: app/views/auth/index.html.erb:21
 msgctxt "MultiAuth"
-msgid "Inactivated"
-msgstr "未アクティベーション"
+msgid "By email address"
+msgstr "メールアドレスによるログイン"
 
-#: app/views/signup/email/activation.html.erb:22
+#: lib/multi_auth/action_controller.rb:34
 msgctxt "MultiAuth"
-msgid "Regist"
-msgstr "登録"
+msgid "Session has expired. Please login again."
+msgstr "セッションがタイムアウトしました。再度ログインしてください。"
 
-#: app/views/signup/email/activation.html.erb:26
+#: lib/multi_auth/action_controller.rb:43
 msgctxt "MultiAuth"
-msgid "Invalid activation token"
-msgstr "無効なアクティベーショントークン"
+msgid "Login required."
+msgstr "ログインが必要です。"
 
 #: lib/open_id_authentication/result.rb:5
 msgctxt "OpenIdAuthentication"
@@ -627,13 +735,3 @@ msgstr "OpenID の検証が失敗しました。"
 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 "ログインが必要です。"