AO3-6597 Finish up i18n of invite pages

Author: Bilka2

app/views/admin/admin_invitations/index.html.erb

@@ -10,52 +10,52 @@
 </ul>
 <!--/subnav-->
 <!--main content-->
-<%= form_tag  url_for(:controller => 'admin/admin_invitations', :action => :create) do |f| %>
+<%= form_tag url_for(controller: "admin/admin_invitations", action: :create) do %>
   <fieldset class="simple">
-    <h3 class="heading">Send to email</h3>
-    <p>Send an invite code to the following email address:
-      <%= text_field_tag "invitation[invitee_email]", (@invitation.try(:invitee_email) || ""), :title => ts("invite by email") %>
-      <span class="submit actions"><%= submit_tag ts('Invite user')  %></span>
+    <h3 class="heading"><%= t(".send_to_email.title") %></h3>
+    <p><%= t(".send_to_email.send_code_to_email") %>
+      <%= text_field_tag "invitation[invitee_email]", (@invitation.try(:invitee_email) || "") %>
+      <span class="submit actions"><%= submit_tag t(".send_to_email.submit") %></span>
     </p>
   </fieldset>
 <% end %>
 
-<%= form_tag url_for(:controller => 'admin/admin_invitations', :action => 'invite_from_queue') do %>
+<%= form_tag url_for(controller: "admin/admin_invitations", action: "invite_from_queue") do %>
   <fieldset class="simple">
-    <h3 class="heading">Send invite codes to people in our <%= link_to 'invitations queue', invite_requests_path %></h3>
-    <p>There are <%= InviteRequest.count %> requests in the queue.</p>
+    <h3 class="heading"><%= t(".send_to_queue.title_html", invitations_queue_link: link_to(t(".send_to_queue.invitations_queue"), invite_requests_path)) %></h3>
+    <p><%= t(".send_to_queue.current_request_count", count: InviteRequest.count) %></p>
     <p>
-      <%= label_tag "invitation[invite_from_queue]", ts('Number of people to invite') %>: <%= text_field_tag "invitation[invite_from_queue]" %>
-      <span class="submit actions"><%= submit_tag ts('Invite from queue')  %></span>
+      <%= label_tag "invitation[invite_from_queue]", t(".send_to_queue.invite_number") %> <%= text_field_tag "invitation[invite_from_queue]" %>
+      <span class="submit actions"><%= submit_tag t(".send_to_queue.submit") %></span>
     </p>
   </fieldset>
 <% end %>
 
-<%= form_tag  url_for(:controller => 'admin/admin_invitations', :action => 'grant_invites_to_users') do  %>
+<%= form_tag url_for(controller: "admin/admin_invitations", action: "grant_invites_to_users") do %>
   <fieldset>
-    <h3 class="heading"><%=h 'Give invite codes to current users' %></h3>
+    <h3 class="heading"><%= t(".grant_to_users.title") %></h3>
     <dl>
-      <dt><%= label_tag "invitation[number_of_invites]", ts('Number of invitations') %>:</dt>
+      <dt><%= label_tag "invitation[number_of_invites]", t(".grant_to_users.amount") %></dt>
       <dd><%= text_field_tag "invitation[number_of_invites]" %></dd>
-      <dt><%= label_tag "invitation[user_group]", ts('Users') %>:</dt>
-      <dd><%= select_tag "invitation[user_group]", "<option>All</option><option>With no unused invitations</option>".html_safe  %></dd>
-      <dt class="landmark">Submit</dt>
-      <dd class="submit actions"><%= submit_tag "Generate invitations" %></dd>
+      <dt><%= label_tag "invitation[user_group]", t(".grant_to_users.user_type") %></dt>
+      <dd><%= select_tag "invitation[user_group]", "<option>All</option><option>With no unused invitations</option>".html_safe %></dd>
+      <dt class="landmark"><%= t(".grant_to_users.submit_landmark") %></dt>
+      <dd class="submit actions"><%= submit_tag t(".grant_to_users.submit") %></dd>
   </fieldset>
 <% end %>
 
-<%= form_tag  url_for(:controller => 'admin/admin_invitations', :action => 'find'), :method => :get do  %>
+<%= form_tag url_for(controller: "admin/admin_invitations", action: "find"), method: :get do %>
   <fieldset>
-    <h3 class="heading"><%=h 'Track invitations' %></h3>
+    <h3 class="heading"><%= t(".track_invitations.title") %></h3>
     <dl>
-      <dt><%= label_tag "invitation[user_name]", ts('Enter a user name') %>:</dt>
-      <dd><%= text_field_tag "invitation[user_name]"  %></dd>
-      <dt><%= label_tag "invitation[token]", ts('Enter an invite token') %>:</dt>
-      <dd><%= text_field_tag "invitation[token]"  %></dd>
-      <dt><%= label_tag "track_invitation_invitee_email", t(".email") %>:</dt>
+      <dt><%= label_tag "invitation[user_name]", t(".track_invitations.user_name") %></dt>
+      <dd><%= text_field_tag "invitation[user_name]" %></dd>
+      <dt><%= label_tag "invitation[token]", t(".track_invitations.invite_token") %></dt>
+      <dd><%= text_field_tag "invitation[token]" %></dd>
+      <dt><%= label_tag "track_invitation_invitee_email", t(".track_invitations.email") %></dt>
       <dd><%= text_field_tag "invitation[invitee_email]", nil, id: "track_invitation_invitee_email" %></dd>
-      <dt class="landmark">Submit</dt>
-      <dd class="submit actions"><%= submit_tag "Go" %></dd>
+      <dt class="landmark"><%= t(".track_invitations.submit_landmark") %></dt>
+      <dd class="submit actions"><%= submit_tag t(".track_invitations.submit") %></dd>
     </dl>
   </fieldset>
 <% end %>

app/views/admin/settings/index.html.erb

@@ -82,7 +82,7 @@
 <% if @admin_setting.invite_from_queue_enabled? %>
   <p>
     <%= t(".queue_status",
-          number: @admin_setting.invite_from_queue_number,
+          count: @admin_setting.invite_from_queue_number,
           time: l(@admin_setting.invite_from_queue_at, format: :long)) %>
   </p>
 

app/views/invite_requests/_index_closed.html.erb

@@ -1,21 +1,16 @@
 <!--Descriptive page name, messages and instructions-->
 <h2 class="heading">
-  <%= ts("Invitation Requests") %>
+  <%= t(".page_heading") %>
 </h2>
 
 <p class="notice">
-  <%= ts("<strong>New invitation requests are currently closed.</strong> For     
-        more information, please check the %{news}.",
-      news: link_to("\"Invitations\" tag on AO3 News",
-                    admin_posts_path(tag: 143))
-      ).html_safe %>
+  <%= t(".queue_disabled.html",
+        closed_bold: tag.strong(t(".queue_disabled.closed")),
+        news_link: link_to(t(".queue_disabled.news"), admin_posts_path(tag: 143))) %>
 </p>
 <p>
-  <%= ts("If you have already requested an invitation, you can %{status}. There are %{count} people remaining on the waiting list.",
-      status: link_to("check your position on the waiting list",
-                      status_invite_requests_path),
-      count: InviteRequest.count
-  ).html_safe %>
+  <%= t(".already_requested_html", check_waitlist_position_link: link_to(t(".check_waitlist_position"), status_invite_requests_path)) %>
+  <%= t(".waiting_list_count", count: InviteRequest.count) %>
 <p>
 <!--/descriptions-->
 

config/locales/views/en.yml

@@ -86,11 +86,35 @@ en:
         token: Enter an invite token
         user_name: Enter a user name
       index:
-        email: Enter all or part of an email address
+        grant_to_users:
+          amount: 'Number of invitations:'
+          submit: Generate invitations
+          submit_landmark: Submit
+          title: Give invite codes to current users
+          user_type: 'Users:'
         navigation:
           queue: Manage Queue
           requests: Manage Requests
         page_heading: Invite New Users
+        send_to_email:
+          send_code_to_email: 'Send an invite code to the following email address:'
+          submit: Invite user
+          title: Send to email
+        send_to_queue:
+          current_request_count:
+            one: There is %{count} request in the queue.
+            other: There are %{count} requests in the queue.
+          invitations_queue: invitations queue
+          invite_number: 'Number of people to invite:'
+          submit: Invite from queue
+          title_html: Send invite codes to people in our %{invitations_queue_link}
+        track_invitations:
+          email: 'Enter all or part of an email address:'
+          invite_token: 'Enter an invite token:'
+          submit: Go
+          submit_landmark: Submit
+          title: Track invitations
+          user_name: 'Enter a user name:'
     admin_nav:
       ao3_news: AO3 News
       archive_faq: Archive FAQ
@@ -347,7 +371,9 @@ en:
           actions: Actions
           disable_support_form: Turn Off Support Form
           performance_and_misc: Performance and Misc
-        queue_status: "%{number} people are scheduled to be sent invitations at %{time}."
+        queue_status:
+          one: "%{count} person is scheduled to be sent an invitation at %{time}."
+          other: "%{count} people are scheduled to be sent invitations at %{time}."
         queue_status_help: "(The automatic task that invites people from the queue runs at most every hour. Don't be alarmed if the time you see is within the last hour. Do be alarmed if the time you see is more than one hour in the past and the queue is supposed to be active.)"
         update: Update
       update:
@@ -1384,6 +1410,17 @@ en:
     invitation:
       email_address_label: Enter an email address
   invite_requests:
+    index_closed:
+      already_requested_html: If you have already requested an invitation, you can %{check_waitlist_position_link}.
+      check_waitlist_position: check your position on the waiting list
+      page_heading: Invitation Requests
+      queue_disabled:
+        closed: New invitation requests are currently closed.
+        html: "%{closed_bold} For more information, please check the %{news_link}."
+        news: '"Invitations" tag on AO3 News'
+      waiting_list_count:
+        one: There is %{count} person remaining on the waiting list.
+        other: There are %{count} people remaining on the waiting list.
     index_open:
       add_to_list: Add me to the list
       already_requested_html: If you have already requested an invitation, you can %{check_waitlist_position_link}.

features/other_a/invite_queue.feature

@@ -57,7 +57,6 @@ Feature: Invite queue management
     # check your place in the queue - invalid address
     When I check how long "[email protected]" will have to wait in the invite request queue
     Then I should see "Invitation Request Status"
-      And I should see "We are sending out 10 invitations per 12 hours."
       And I should see "Sorry, we can't find the email address you entered."
       And I should not see "You are currently number"
 
@@ -73,6 +72,7 @@ Feature: Invite queue management
     Then I should not see "Request an invitation"
       And I should not see "invite_request_email"
       And I should see "New invitation requests are currently closed."
+      And I should see "There are 0 people remaining on the waiting list."
       And I should not see "Add me to the list"
 
   Scenario: Can still check status when queue is off