okkez-multi_auth 0.0.4 → 0.0.5

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

@@ -1,8 +1,8 @@
-<%- @title = "ログイン" -%>
+<%- @title = p_("MultiAuth", "Login") -%>
 <%- @enable_side_column = false -%>
 
 <div id="dialog">
-  <h1>OpenID によるログイン</h1>
+  <h1><%=h p_("MultiAuth", "By OpenID") %></h1>
 
   <%- form_tag(:controller => 'auth/open_id', :action => "login") do -%>
     <table>
@@ -13,12 +13,12 @@
         </td>
       </tr>
     </table>
-    <div><%= submit_tag("ログイン") %></div>
+    <div><%= submit_tag(p_("MultiAuth", "Login")) %></div>
   <%- end -%>
 
   <hr />
   
-  <h1>メールアドレスでログイン</h1>
+  <h1><%=h p_("MultiAuth", "By email address") %></h1>
   <%- form_for(:login_form, @login_form, :url => { :controller => 'auth/email', :action => "login"}) do |f| -%>
     <table id="email-login">
       <tr>
@@ -36,7 +36,7 @@
         </td>
       </tr>
     </table>
-    <%= submit_tag("ログイン") %>
+    <%= submit_tag(p_("MultiAuth", "Login")) %>
   <%- end -%>
 
 </div>

data/app/views/auth/logged_in.html.erb

@@ -1,5 +1,5 @@
 
-<%- @title = "ログインしました" -%>
+<%- @title = p_("MultiAuth", "Logged in successfully.") -%>
 <%- @enable_side_column = false -%>
 <%- @stylesheets = %[auth] -%>
 
@@ -16,6 +16,8 @@
 <%- } -%>
 
 <div id="dialog">
-  <h1>ログインしました</h1>
-  <div class="message">ページが切り替わらない場合は <%= link_to(h(@return_path), @return_path) %> をクリックしてください。</div>
+  <h1><%=h @title %></h1>
+  <div class="message">
+    <%=h p_("MultiAuth", "Please click %{link} when the page doesn't change." % { :link => link_to(h(@return_path), @return_path) }) %>
+  </div>
 </div>

data/app/views/auth/logged_out.html.erb

@@ -1,5 +1,5 @@
 
-<%- @title = "ログアウトしました" -%>
+<%- @title = p_("MultiAuth", "You have been logged out.") -%>
 <%- @enable_side_column = false -%>
 <%- @stylesheets = %[auth] -%>
 
@@ -16,6 +16,8 @@
 <%- } -%>
 
 <div id="dialog">
-  <h1>ログアウトしました</h1>
-  <div class="message">ページが切り替わらない場合は <%= link_to(h(@return_path), @return_path) %> をクリックしてください。</div>
+  <h1><%=h @title %></h1>
+  <div class="message">
+    <%=h p_("MultiAuth", "Please click %{link} when the page doesn't change." % { :link => link_to(h(@return_path), @return_path) }) %>
+  </div>
 </div>

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

@@ -1,9 +1,9 @@
 
-<%- @title = "ログイン" -%>
+<%- @title = p_("MultiAuth", "Login") -%>
 <%- @enable_side_column = false -%>
 
 <div id="dialog">
-  <h1>OpenID によるログイン</h1>
+  <h1><%=h @title %></h1>
 
   <%- form_tag(:action => "login") do -%>
     <table>
@@ -14,7 +14,7 @@
         </td>
       </tr>
     </table>
-    <div><%= submit_tag("ログイン") %></div>
+    <div><%= submit_tag(p_("MultiAuth", "Login")) %></div>
   <%- end -%>
 </div>
 

data/app/views/credentials/email/activated.html.erb

@@ -1,4 +1,7 @@
 
-<%- @title = "登録完了" -%>
+<%- @title = p_("MultiAuth", "Registration completed") -%>
 
 <h1><%=h @title %></h1>
+
+<p><%= link_to(p_("MultiAuth", "Top"), root_path) %></p>
+

data/app/views/credentials/email/activation.html.erb

@@ -1,15 +1,15 @@
 
-<%- @title = "アクティベーション" -%>
+<%- @title = p_("MultiAuth", "Activation") -%>
 
 <h1><%=h @title %></h1>
 
 <table>
   <tr>
-    <th>メールアドレス</th>
+    <th><%=h s_("EmailCredential|Email") %></th>
     <td><%=h @email_credential.email %></td>
   </tr>
 </table>
 
 <%- form_tag(:action => "activate") { -%>
-  <div><%= submit_tag("登録") %></div>
+  <div><%= submit_tag(p_("MultiAuth", "Activate")) %></div>
 <%- } -%>

data/app/views/credentials/email/created.html.erb

@@ -1,12 +1,12 @@
 
-<%- @title = "仮登録完了" -%>
+<%- @title = p_("MultiAuth", "Pre-registeration completed") -%>
 
 <h1><%=h @title %></h1>
 
-<div>指定されたメールアドレスにメールを送信しました。メールに記載されたURLにアクセスして、登録を完了してください。</div>
-<div><%= link_to(h("ログイン設定に戻る"), :controller => "/credentials", :action => "index") %></div>
+<div><%=h p_("MultiAuth", "System sent a mail to email address you specified. Please access the URL described in the mail. And complete registration.") %></div>
+<div><%= link_to(h(p_("MultiAuth", "Back")), :controller => "/credentials", :action => "index") %></div>
 
 <%- unless production? -%>
   <hr />
-  <%= link_to(h("アクティベーション"), :controller => "credentials/email", :action => "activation", :activation_token => @email_credential.activation_token) %>
+  <%= link_to(h("Activation"), :controller => "credentials/email", :action => "activation", :activation_token => @email_credential.activation_token) %>
 <%- end -%>

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

@@ -1,17 +1,20 @@
 
-<%- @title = "メールログイン情報の削除" -%>
+<%- @title = p_("MultiAuth", "Delete email authentication credential.") -%>
 
 <h1><%=h @title %></h1>
 
-<div>削除します。よろしいですか？</div>
+<div>
+  <%=h p_("MultiAuth", "Delete email authentication credential.") %>
+  <%=h p_("MultiAuth", "Are you sure?") %>
+</div>
 
 <table>
   <tr>
-    <th>メールアドレス</th>
+    <th><%=h s_("EmailCredential|Email") %></th>
     <td><%=h @email_credential.email %></td>
   </tr>
 </table>
 
 <%- form_tag(:action => "destroy") { -%>
-  <div><%= submit_tag("削除") %></div>
+  <div><%= submit_tag(p_("MultiAuth", "Delete")) %></div>
 <%- } -%>

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

@@ -1,16 +1,16 @@
 
-<%- @title = "パスワードの変更" -%>
+<%- @title = p_("MultiAuth", "Update password") -%>
 
 <h1><%=h @title %></h1>
 
 <%- form_for(:edit_form, @edit_form, :url => {:action => "update_password"}) { |f| -%>
   <table>
     <tr>
-      <th>メールアドレス</th>
+      <th><%=h f.label(:email) %></th>
       <td><%=h @email_credential.email %></td>
     </tr>
     <tr>
-      <th><%= f.label(:password) %></th>
+      <th><%=h f.label(:password) %></th>
       <td>
         <div><%= f.password_field(:password, :size => 20) %></div>
         <div><%= f.password_field(:password_confirmation, :size => 20) %></div>
@@ -18,7 +18,7 @@
       </td>
     </tr>
   </table>
- <div><%= submit_tag("変更") %></div>
+ <div><%= submit_tag(p_("MultiAuth", "Update")) %></div>
 <%- } -%>
 
 <%- unless production? -%>

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

@@ -1,5 +1,5 @@
 
-<%- @title = "メール認証情報の追加" -%>
+<%- @title = p_("MultiAuth", "Add email authentication credential") -%>
 
 <h1><%=h @title %></h1>
 
@@ -22,7 +22,7 @@
       </td>
     </tr>
   </table>
- <div><%= submit_tag("追加") %></div>
+ <div><%= submit_tag(p_("MultiAuth", "Add")) %></div>
 <%- } -%>
 
 <%- unless production? -%>

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

@@ -1,13 +1,13 @@
 
-<%- @title = "ログイン設定" -%>
+<%- @title = p_("MultiAuth", "Login setting") -%>
 
-<h2>OpenID認証</h2>
+<h2><%=h p_("MultiAuth", "OpenID authentication") %></h2>
 
 <table class="list">
   <thead>
     <tr>
-      <th>登録日</th>
-      <th>最終ログイン日時</th>
+      <th><%=h s_("OpenIdCredential|Activated on") %></th>
+      <th><%=h s_("OpenIdCredential|Loggedin at")  %></th>
       <th>OpenID</th>
       <th>&nbsp;</th>
     </tr>
@@ -16,7 +16,7 @@
     <tr>
       <td colspan="4">
         <%- can_add_open_id_credential = (@open_id_credentials.size < OpenIdCredential::MaximumRecordsPerUser) -%>
-        <%= link_to_if(can_add_open_id_credential, add_icon + h(" OpenID認証を追加する"), :controller => "credentials/open_id", :action => "new") %>
+        <%= link_to_if(can_add_open_id_credential, add_icon + h(" " + p_("MultiAuth", "Add OpenID authentication")), :controller => "credentials/open_id", :action => "new") %>
       </td>
     </tr>
   </tfoot>
@@ -24,7 +24,7 @@
     <%- if @open_id_credentials.empty? -%>
       <tr>
         <td colspan="4" style="padding: 1em;">
-          OpenID認証は、登録されていません。
+          <%=h p_("MultiAuth", "There are no OpenID authentication.") %>
         </td>
       </tr>
     <%- else -%>
@@ -33,21 +33,21 @@
           <td><%=h yyyymmdd(open_id_credential.created_at) %></td>
           <td><%=h yyyymmdd_hhmm(open_id_credential.loggedin_at) %></td>
           <td style="font-family: monospace;"><%=h open_id_credential.identity_url %></td>
-          <td><%= link_to(delete_icon + h(" 削除"), :controller => "credentials/open_id", :action => "delete", :open_id_credential_id => open_id_credential.id) %></td>
+          <td><%= link_to(delete_icon + h(" " + p_("MultiAuth", "Delete")), :controller => "credentials/open_id", :action => "delete", :open_id_credential_id => open_id_credential.id) %></td>
         </tr>
       <%- } -%>
     <%- end -%>
   </tbody>
 </table>
 
-<h2>メールアドレス認証</h2>
+<h2><%=h p_("MultiAuth", "Email address authentication") %></h2>
 
 <table class="list">
   <thead>
     <tr>
-      <th>登録日</th>
-      <th>最終ログイン日時</th>
-      <th>メールアドレス</th>
+      <th><%=h s_("EmailCredential|Activated on") %></th>
+      <th><%=h s_("EmailCredential|Loggedin at")  %></th>
+      <th><%=h s_("EmailCredential|Email") %></th>
       <th colspan="2">&nbsp;</th>
     </tr>
   </thead>
@@ -55,7 +55,7 @@
     <tr>
       <td colspan="6">
         <%- can_add_email_credential = (@email_credentials.size < EmailCredential::MaximumRecordsPerUser) -%>
-        <%= link_to_if(can_add_email_credential, add_icon + h(" メールアドレス認証を追加する"), :controller => "credentials/email", :action => "new") %>
+        <%= link_to_if(can_add_email_credential, add_icon + h(" " + p_("MultiAuth", "Add email address authentication")), :controller => "credentials/email", :action => "new") %>
       </td>
     </tr>
   </tfoot>
@@ -63,7 +63,7 @@
     <%- if @email_credentials.empty? -%>
       <tr>
         <td colspan="5" style="padding: 1em;">
-          メールアドレス認証は、登録されていません。
+          <%=h p_("MultiAuth", "There are no email address authentication.") %>
         </td>
       </tr>
     <%- else -%>
@@ -74,11 +74,11 @@
           <td>
             <div style="font-family: monospace;"><%= email_credential.email %></div>
             <%- unless email_credential.activated? -%>
-              <div>アクティベーション待ち</div>
+              <div><%=h p_("MultiAuth", "Waiting for activation") %></div>
             <%- end -%>
           </td>
-          <td><%= link_to(icon16("icons/fam/key.png", "パスワード変更") + h(" パスワード変更"), :controller => "credentials/email", :action => "edit_password", :email_credential_id => email_credential.id) %></td>
-          <td><%= link_to(delete_icon + h(" 削除"), :controller => "credentials/email", :action => "delete", :email_credential_id => email_credential.id) %></td>
+          <td><%= link_to(icon16("icons/fam/key.png", p_("MultiAuth", "Update password")) + h(" " + p_("MultiAuth", "Update password")), :controller => "credentials/email", :action => "edit_password", :email_credential_id => email_credential.id) %></td>
+          <td><%= link_to(delete_icon + h(" " + p_("MultiAuth", "Delete")), :controller => "credentials/email", :action => "delete", :email_credential_id => email_credential.id) %></td>
         </tr>
       <%- } -%>
     <%- end -%>

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

@@ -1,9 +1,12 @@
 
-<%- @title = "OpenIDログイン情報の削除" -%>
+<%- @title = p_("MultiAuth", "Delete OpenID authentication credential.") -%>
 
 <h1><%=h @title %></h1>
 
-<div>削除します。よろしいですか？</div>
+<div>
+  <%=h p_("MultiAuth", "Delete OpenID authentication credential.") %>
+  <%=h p_("MultiAuth", "Are you sure?") %>
+</div>
 
 <table>
   <tr>
@@ -13,5 +16,5 @@
 </table>
 
 <%- form_tag(:action => "destroy") { -%>
-  <div><%= submit_tag("削除") %></div>
+  <div><%= submit_tag(p_("MultiAuth", "Delete")) %></div>
 <%- } -%>

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

@@ -1,5 +1,5 @@
 
-<%- @title = "OpenID認証情報の追加" -%>
+<%- @title = p_("MultiAuth", "Add OpenID authentication credential") -%>
 
 <h1><%=h @title %></h1>
 
@@ -13,7 +13,7 @@
       </td>
     </tr>
   </table>
-  <div><%= submit_tag("追加") %></div>
+  <div><%= submit_tag(p_("MultiAuth", "Add")) %></div>
 <%- } -%>
 
 <%- unless production? -%>

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

@@ -1,14 +1,14 @@
-
-<%-
-item = proc { |num, html|
-  %|<li class="#{step == num ? "active" : "inactive"}">| + html + %|</li>|
-}
--%>
-
-<ol id="email-signup-progress">
- <%= item[1, "ログイン情報の入力"] %>
- <%= item[2, "ログイン情報の確認"] %>
- <%= item[3, "仮登録の完了"] %>
- <%= item[4, "本登録の確認"] %>
- <%= item[5, "本登録の完了"] %>
-</ol>
+
+<%-
+item = proc { |num, html|
+  %|<li class="#{step == num ? "active" : "inactive"}">| + html + %|</li>|
+}
+-%>
+
+<ol id="email-signup-progress">
+ <%= item[1, p_("MultiAuth", "Input login info")] %>
+ <%= item[2, p_("MultiAuth", "Confirm login info")] %>
+ <%= item[3, p_("MultiAuth", "Pre-registration completed")] %>
+ <%= item[4, p_("MultiAuth", "Registration confirmation")] %>
+ <%= item[5, p_("MultiAuth", "Registration completed")] %>
+</ol>

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

@@ -1,9 +1,9 @@
 
-<%- @title = "サインアップ" -%>
+<%- @title = p_("MultiAuth", "Signup") -%>
 
-<h1>本登録完了</h1>
+<h1><%=h p_("MultiAuth", "Registration completed") %></h1>
 
 <%= render(:partial => "progress", :locals => {:step => 5}) %>
 
-<div>登録が完了しました。</div>
-<div><%= link_to(h("ログインする"), :controller => "auth/email") %></div>
+<div><%=h p_("MultiAuth", "Registration completed") %></div>
+<div><%= link_to(h(p_("MultiAuth", "Login")), :controller => "auth/email") %></div>

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

@@ -1,27 +1,27 @@
 
-<%- @title = "サインアップ" -%>
+<%- @title = p_("MultiAuth", "Signup") -%>
 
-<h1>本登録確認</h1>
+<h1><%=h p_("MultiAuth", "Registration confirmation") %></h1>
 
 <%= render(:partial => "progress", :locals => {:step => 4}) %>
 
 <%- if @credential -%>
- <div>有効なアクティベーションキー</div>
+ <div><%=h p_("MultiAuth", "Valid activation token") %></div>
  <%- if @activated -%>
-  <div>アクティベート済み</div>
+  <div><%=h p_("MultiAuth", "Activated") %></div>
  <%- else -%>
-  <div>未アクティベート</div>
+  <div><%=h p_("MultiAuth", "Inactivated") %></div>
   <table>
     <tr>
-      <th>メールアドレス</th>
+      <th><%=h s_("EmailCredential|Email") %></th>
       <td><%=h @credential.email %></td>
     </tr>
   </table>
   <%- form_tag(:action => "activate") { -%>
    <%= hidden_field_tag("activation_token", @credential.activation_token) %>
-   <%= submit_tag("本登録") %>
+   <%= submit_tag(p_("MultiAuth", "Regist")) %>
   <%- } -%>
  <%- end -%>
 <%- else -%>
- <div>無効なアクティベーションキー</div>
+ <div><%=h p_("MultiAuth", "Invalid activation token") %></div>
 <%- end -%>

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

@@ -1,14 +1,16 @@
 
-<%- @title = "サインアップ" -%>
+<%- @title = p_("MultiAuth", "Signup") -%>
 
-<h1>仮登録完了</h1>
+<h1><%=h p_("MultiAuth", "Pre-registration completed") %></h1>
 
 <%= render(:partial => "progress", :locals => {:step => 3}) %>
 
-<%=h @signup_form.email %>宛にメールを送信しました。
+<p>
+  <%=h p_("MultiAuth", "Sent a mail to %{email}." % { :email => @signup_form.email } ) %>
+</p>
 
 <%- unless production? -%>
   <div class="debug">
-    <%= link_to(h("アクティベーション"), :action => "activation", :activation_token => @credential.activation_token) %>
+    <%= link_to(h("Activation"), :action => "activation", :activation_token => @credential.activation_token) %>
   </div>
 <%- end -%>