From d57f35147b06f036e327601a2056699673b65920 Mon Sep 17 00:00:00 2001 From: sarken Date: Sat, 14 Jul 2012 09:22:34 +0000 Subject: [PATCH] First pass at adding captions and summaries to tables; also add ts --- app/views/abuse_reports/index.html.erb | 4 +- app/views/abuse_reports/show.html.erb | 6 +- .../admin/admin_users/_user_history.html.erb | 17 ++-- app/views/admin/admin_users/index.html.erb | 4 +- app/views/admin/admin_users/notify.html.erb | 6 +- app/views/admin/skins/index.html.erb | 22 ++--- app/views/admin/skins/index_approved.html.erb | 4 +- app/views/admin/skins/index_rejected.html.erb | 16 ++-- .../admin/stats/_invitation_stats.html.erb | 8 +- app/views/admin/stats/_user_stats.html.erb | 4 +- app/views/admin/stats/_work_stats.html.erb | 4 +- app/views/admins/index.html.erb | 12 +-- app/views/archive_faqs/_admin_index.html.erb | 24 +++--- app/views/devmode/index.html.erb | 33 ++++++-- app/views/devmode/list_controllers.html.erb | 13 +-- app/views/devmode/seedusers.html.erb | 7 +- app/views/devmode/seedworks.html.erb | 10 ++- app/views/gifts/index_for_collection.html.erb | 20 ++--- .../invitations/_user_invitations.html.erb | 18 ++--- app/views/invite_requests/manage.html.erb | 14 ++-- app/views/potential_matches/index.html.erb | 76 +++++++++--------- app/views/tag_wranglers/show.html.erb | 42 +++++----- app/views/tag_wranglings/discuss.html.erb | 18 ++--- app/views/tag_wranglings/index.html.erb | 80 +++++++++---------- app/views/tags/wrangle.html.erb | 66 +++++++-------- app/views/translators/index.html.erb | 16 ++-- app/views/translators/new.html.erb | 14 ++-- app/views/user_invite_requests/index.html.erb | 20 ++--- 28 files changed, 301 insertions(+), 277 deletions(-) diff --git a/app/views/abuse_reports/index.html.erb b/app/views/abuse_reports/index.html.erb index a1203fa3608..0b2a478ec1a 100644 --- a/app/views/abuse_reports/index.html.erb +++ b/app/views/abuse_reports/index.html.erb @@ -7,8 +7,8 @@
- - +
<%=ts("Listing all the abuse reports made on the archive.") %>
"> +diff --git a/app/views/abuse_reports/show.html.erb b/app/views/abuse_reports/show.html.erb index 370136eccdb..2ac7fcc46fe 100644 --- a/app/views/abuse_reports/show.html.erb +++ b/app/views/abuse_reports/show.html.erb @@ -1,4 +1,4 @@ -

<%=h t('.abuse_report', :default => "Abuse Report") %> <%= @abuse_report.id %>

+

<%= ts("Abuse Report") %> <%= @abuse_report.id %>

@@ -11,8 +11,8 @@
-
<%=ts("All Abuse Reports Made on the Archive") %>
- +
<%=ts("Detailed abuse report") %>
"> + diff --git a/app/views/admin/admin_users/_user_history.html.erb b/app/views/admin/admin_users/_user_history.html.erb index 7cec4bae0ec..450efad224c 100644 --- a/app/views/admin/admin_users/_user_history.html.erb +++ b/app/views/admin/admin_users/_user_history.html.erb @@ -1,13 +1,12 @@ -

<%= t('.history', :default => 'User History') %>

- +

<%= ts('User History') %>

-
<%=ts("Detailed Abuse Report") %>
<%=ts("From") %> <%= @abuse_report.email.blank? ? ts("Anonymous") : mail_to(@abuse_report.email) %>
- +
<%= t('.user_history_caption', :default => 'History of user actions') %>
+ - - - + + + @@ -22,8 +21,8 @@ <% end %> - - + +
<%= ts('History of User Actions') %>
<%= t('.log_date', :default => 'Date / Time') %><%= t('.log_action', :default => 'Action') %><%= t('.log_details', :default => 'Details') %><%= ts('Date / Time') %><%= ts('Action') %><%= ts('Details') %>
<%= @user.created_at %><%= t('.log_created', :default => 'Account Created') %><%= t('.log_system', :default => 'System Generated') %><%= ts('Account Created') %><%= ts('System Generated') %>
diff --git a/app/views/admin/admin_users/index.html.erb b/app/views/admin/admin_users/index.html.erb index 0c7bc4d795d..cf7fffec40e 100644 --- a/app/views/admin/admin_users/index.html.erb +++ b/app/views/admin/admin_users/index.html.erb @@ -27,8 +27,8 @@

<%= ts("#{pluralize(@users.total_entries, 'user')} found") %>

<% if @users.size > 0 %>
- - +
<%= ts("List of users") %>
"> + diff --git a/app/views/admin/admin_users/notify.html.erb b/app/views/admin/admin_users/notify.html.erb index 58b255bcbee..9999d4796a8 100644 --- a/app/views/admin/admin_users/notify.html.erb +++ b/app/views/admin/admin_users/notify.html.erb @@ -32,14 +32,14 @@

<%= ts("Or Select Users To Notify") %>

<%= alpha_paginated_section %>
-
<%= ts("List of Users") %>
+
"> diff --git a/app/views/admin/skins/index.html.erb b/app/views/admin/skins/index.html.erb index 1009fdcd61d..e0a7446ca29 100644 --- a/app/views/admin/skins/index.html.erb +++ b/app/views/admin/skins/index.html.erb @@ -17,18 +17,18 @@

<%= ts('Approval Queue') %>

-
<%= ts("Select Users To Notify") %>
<%= ts("Select") %> - All - None + <%= ts("All") %> + <%= ts("None") %>
- +
+ - - - - - - - - + + + + + + + + @@ -58,7 +58,7 @@ -

<%= submit_tag "Update" %>

+

<%= submit_tag ts('Update') %>

<% end %> diff --git a/app/views/admin/skins/index_approved.html.erb b/app/views/admin/skins/index_approved.html.erb index bb0a4b7e6de..2c799ee77a0 100644 --- a/app/views/admin/skins/index_approved.html.erb +++ b/app/views/admin/skins/index_approved.html.erb @@ -14,8 +14,8 @@ <%= ts('Approved Skins') %>

<%= ts('Approved Skins') %>

-
<%= ts('Approval Queue for Skins') %>
SkinTypeCreatorPreviewDescriptionAdmin NoteApproveReject<%= ts('Skin') %><%= ts('Type') %><%= ts('Creator') %><%= ts('Preview') %><%= ts('Description') %><%= ts('Admin Note') %><%= ts('Approve') %><%= ts('Reject') %>
- +
+ diff --git a/app/views/admin/skins/index_rejected.html.erb b/app/views/admin/skins/index_rejected.html.erb index b63eaf9010c..d8d44785b55 100644 --- a/app/views/admin/skins/index_rejected.html.erb +++ b/app/views/admin/skins/index_rejected.html.erb @@ -12,15 +12,15 @@
<%= ts('Rejected Skins') %>

<%= ts('Rejected Skins') %>

-
<%= ts('Approved Skins') %>
<%= ts('Skin') %>
- +
+ - - - - - + + + + + @@ -38,7 +38,7 @@
<%= ts('Rejected Skins') %>
SkinTypeCreatorAdmin NoteUnreject<%= ts('Skin') %><%= ts('Type') %><%= ts('Creator') %><%= ts('Admin Note') %><%= ts('Unreject') %>
-

<%= submit_tag "Update" %>

+

<%= submit_tag ts('Update') %>

<% end %> diff --git a/app/views/admin/stats/_invitation_stats.html.erb b/app/views/admin/stats/_invitation_stats.html.erb index 8e80bee23b2..219bbf6f2a0 100644 --- a/app/views/admin/stats/_invitation_stats.html.erb +++ b/app/views/admin/stats/_invitation_stats.html.erb @@ -1,7 +1,7 @@ - - +
Invitations: by status
+ @@ -20,8 +20,8 @@ -
<%= ts('Invitations by Status') %>
- +
Invitations: by week
+ diff --git a/app/views/admin/stats/_user_stats.html.erb b/app/views/admin/stats/_user_stats.html.erb index b3b7afa3381..58bcd07fc15 100644 --- a/app/views/admin/stats/_user_stats.html.erb +++ b/app/views/admin/stats/_user_stats.html.erb @@ -1,7 +1,7 @@ -
<%= ts('Invitations by Week') %>
- +
Invitations: by week
+ diff --git a/app/views/admin/stats/_work_stats.html.erb b/app/views/admin/stats/_work_stats.html.erb index 2abf0c1c3d1..8ae9f875a9b 100644 --- a/app/views/admin/stats/_work_stats.html.erb +++ b/app/views/admin/stats/_work_stats.html.erb @@ -1,5 +1,5 @@ -
<%= ts('Invitations by Week') %>
- +
Works: by week
+ diff --git a/app/views/admins/index.html.erb b/app/views/admins/index.html.erb index 0b1c7711fa1..9f115bec7a9 100644 --- a/app/views/admins/index.html.erb +++ b/app/views/admins/index.html.erb @@ -1,20 +1,22 @@ -

<%=h t('.listing', :default => "Listing admins") %>

+

<%= ts('Listing Admins') %>

-
<%= ts('Works by Week') %>
- +
<%=h t('.a_list_of', :default => "All the administrator accounts in the archive.") %>
+ + + <% for admin in @admins %> - - + + <% end %>
<%= ts('All Administrator Accounts in the Archive') %>
<%= ts('Account') %><%= ts('Destroy Account') %>
<%= link_to t('.show_link', :default => 'Show'), admin %><%= link_to t('.destroy_link', :default => 'Destroy'), admin, :confirm => 'Are you sure?', :method => :delete %><%= link_to ts('Show'), admin %><%= link_to ts('Destroy'), admin, :confirm => 'Are you sure?', :method => :delete %>
diff --git a/app/views/archive_faqs/_admin_index.html.erb b/app/views/archive_faqs/_admin_index.html.erb index 361856c9925..a89420b790e 100644 --- a/app/views/archive_faqs/_admin_index.html.erb +++ b/app/views/archive_faqs/_admin_index.html.erb @@ -1,30 +1,30 @@ -

<%= t("archive_faq", :default => "Archive FAQ") %>

+

<%= ts("Archive FAQ") %>

<%= render :partial => 'admin/admin_nav' %>
- - +
Manage Archive FAQs
"> + - - - - + + + + @@ -33,9 +33,9 @@ - - - + + + <% end %> diff --git a/app/views/devmode/index.html.erb b/app/views/devmode/index.html.erb index 93b5fce240c..81c4e660aef 100644 --- a/app/views/devmode/index.html.erb +++ b/app/views/devmode/index.html.erb @@ -1,8 +1,27 @@ -

<%= t('.devmode', :default => "Devmode") %>

-
<%= ts("Manage Archive FAQs") %>
<%=h 'Title' %><%=h 'Posted' %><%=h 'Updated' %><%=h 'Actions' %><%= ts("Title") %><%= ts("Posted") %><%= ts("Updated") %><%= ts("Actions") %>
<%= link_to archive_faq.title, archive_faq %> <%=h archive_faq.created_at %> <%=h archive_faq.updated_at %><%= link_to "Show", archive_faq %><%= link_to "Edit", edit_archive_faq_path(archive_faq) %><%= link_to "Delete", archive_faq, :confirm => 'Are you sure?', :method => :delete %><%= link_to ts("Show"), archive_faq %><%= link_to ts("Edit"), edit_archive_faq_path(archive_faq) %><%= link_to ts("Delete"), archive_faq, :confirm => 'Are you sure?', :method => :delete %>
- - - - - +

<%= ts('Devmode') %>

+
Generate usersCreate seed users
Generate worksCreate seed works, comments, etc. - Don't do it on a database you value!
Inspect controllers/viewsSee a dynamic list of active controllers, and drill down through views.
Unregister all imported worksUnregister all imported works - Causes the archive to forget every URL that's ever been imported, so they can be imported again.
Show profiling logsShow profile logs
+ + + + + + + + + + + + + + + + + + + + + + + +
<%= ts('Shortcuts for Development Mode') %>
<%= ts('Task') %><%= ts('Page') %>
Generate usersCreate seed users
Generate worksCreate seed works, comments, etc. - Don't do it on a database you value!
Inspect controllers/viewsSee a dynamic list of active controllers, and drill down through views.
Unregister all imported worksUnregister all imported works - Causes the archive to forget every URL that's ever been imported, so they can be imported again.
Show profiling logsShow profile logs
diff --git a/app/views/devmode/list_controllers.html.erb b/app/views/devmode/list_controllers.html.erb index 5dfbe6e6bac..702e3b5f2e3 100644 --- a/app/views/devmode/list_controllers.html.erb +++ b/app/views/devmode/list_controllers.html.erb @@ -1,16 +1,17 @@ - -

<%= t('.controller_info', :default => "Controller info") %>

+ +

<%= ts("Controller Info") %>

<% if @errors %>
<%= @errors %>
<% end %>
- +
+ - - - + + + <% for controller_info in @controllers %> diff --git a/app/views/devmode/seedusers.html.erb b/app/views/devmode/seedusers.html.erb index 4b555fc1335..611d41e2fc0 100644 --- a/app/views/devmode/seedusers.html.erb +++ b/app/views/devmode/seedusers.html.erb @@ -1,5 +1,5 @@ -<%= link_to "Devmode top", devmode_path %> -

<%= t('.seed_users', :default => "Seed users") %>

+<%= link_to ts("Devmode top"), devmode_path %> +

<%= ts("Seed Users") %>

<% if @errors %>
<%= @errors %> @@ -16,7 +16,8 @@
  • If you select the {prevalidate} option, then users will be activated automatically, and e-mail addresses can be falsified.

    -
    • <%= ts('') %>
    Controller nameView methodsOther methods<%= ts('Controller name') %><%= ts('View methods') %><%= ts('Other methods') %>
    +
    + <% for name, (type_name, default) in @params %> <% end %> diff --git a/app/views/devmode/seedworks.html.erb b/app/views/devmode/seedworks.html.erb index f1f650949b6..f5ac8177a8a 100644 --- a/app/views/devmode/seedworks.html.erb +++ b/app/views/devmode/seedworks.html.erb @@ -1,5 +1,5 @@ - -

    <%= t('.seed_works', :default => "Seed works") %>

    + +

    <%= ts("Seed Works") %>

    <% if @errors %>
    <%= @errors %> @@ -11,12 +11,14 @@

    -
    <%= ts('') %>
    <%= name %> <%= ""%>
    +
    + <% for name, l in @params %> <% if l.nil? %>
    <%= ts('') %>

    <%=h name %>

    - +
    + <% else %> <% display_name = name %> <% input_type, default = l[0], l[1] %> diff --git a/app/views/gifts/index_for_collection.html.erb b/app/views/gifts/index_for_collection.html.erb index f0849d0a29c..9dd464c504d 100644 --- a/app/views/gifts/index_for_collection.html.erb +++ b/app/views/gifts/index_for_collection.html.erb @@ -1,5 +1,5 @@ -

    <%= t('.gifts.gifts_in_collection', :default => "Gifts in %{collection}", :collection => h(@collection.title)) %>

    +

    <%= ts('Gifts in %{collection}', :collection => h(@collection.title)) %>

    @@ -8,14 +8,14 @@ -
    <%= ts('') %>
    -
    Gifts and givers + + - - - - + + + + @@ -38,12 +38,12 @@ <% end %>
    <%= ts('Gifts and Givers') %>
    GiftRecipientAuthorAuthor Has Received?<%= ts('Gift') %><%= ts('Recipient') %><%= ts('Author') %><%= ts('Author Has Received?') %>
    -

    Note

    +

    <%= ts('Note') %>

    - M* - Manual: This means that this creator has received a story in this collection, but under a different pseudonym. + <%= ts("M* - Manual: This means that this creator has received a story in this collection, but under a different pseudonym. That might happen if the creator used a different pseud to post their story than the one their author used as the recipient name, or it might be the case that the creator has also posted a story for a different user (eg as a proxy for someone who doesn't have an archive account), and has not gotten a story - for herself. + for herself.") %>

    diff --git a/app/views/invitations/_user_invitations.html.erb b/app/views/invitations/_user_invitations.html.erb index b0628c32a16..17081994380 100644 --- a/app/views/invitations/_user_invitations.html.erb +++ b/app/views/invitations/_user_invitations.html.erb @@ -1,14 +1,14 @@ <% unless invitations.blank? %> - - +
    + - - - - - + + + + + @@ -21,9 +21,9 @@ <% if logged_in_as_admin? && invitation.redeemed_at.blank? %> diff --git a/app/views/invite_requests/manage.html.erb b/app/views/invite_requests/manage.html.erb index d5ecd37c6ab..0790bfea0ea 100644 --- a/app/views/invite_requests/manage.html.erb +++ b/app/views/invite_requests/manage.html.erb @@ -1,20 +1,20 @@ -

    Manage the invite queue

    +

    <%= ts("Manage the Invite Queue") %>

    <%= form_tag reorder_invite_requests_url do %> -

    <%= submit_tag ts('Fix the order of the queue') %>

    +

    <%= submit_tag ts('Fix the order of the queue') %>

    <% end %> -
    <%= ts('Invitation Information') %>
    TokenSent ToUser NameExternal AuthorCopy Link<%= ts('Token') %><%= ts('Sent To') %><%= ts('User Name') %><%= ts('External Author') %><%= ts('Copy Link') %>
    <% unless invitation.redeemed_at %> <% if invitation.external_author %> - <%= link_to "copy and use", claim_path(:invitation_token => invitation.token) %> + <%= link_to ts("copy and use"), claim_path(:invitation_token => invitation.token) %> <% else %> - <%= link_to "copy and use", signup_path(:invitation_token => invitation.token) %><% end %> + <%= link_to ts("copy and use"), signup_path(:invitation_token => invitation.token) %><% end %> <% end %>
    - +
    Manage the Invite Queue
    + - - - + + + <% @invite_requests.each do |request| %> diff --git a/app/views/potential_matches/index.html.erb b/app/views/potential_matches/index.html.erb index cc3a69b0276..620239ff08d 100644 --- a/app/views/potential_matches/index.html.erb +++ b/app/views/potential_matches/index.html.erb @@ -1,23 +1,23 @@ -

    Matching for <%= @collection.title %>

    +

    <%= ts('Matching for %{collection_title}', :collection_title => @collection.title) %>

    <% if @challenge.signup_open %>

    - You can't generate matches while signup is still open. After you have closed signup (in Challenge Settings), - you will be able to generate potential matches here. + <%= ts("You can't generate matches while signup is still open. After you have closed signup (in Challenge Settings), + you will be able to generate potential matches here.") %>

    <% elsif @collection.signups.count < 2 %>

    - You need at least two people to sign up before you can make assignments. :) + <%= ts("You need at least two people to sign up before you can make assignments. :)") %>

    <% elsif @in_progress %>

    - The archive is generating potential matches for this challenge. This can take a long time, + <%= ts("The archive is generating potential matches for this challenge. This can take a long time, especially for a large challenge! We'll send an email to the collection maintainers when - all potential matches have been generated. + all potential matches have been generated.") %>

    - Currently generating potential matches for: <%= @current_position %> (<%= @progress %>%) + <%= ts("Currently generating potential matches for: ") %> <%= @current_position %> (<%= @progress %>%)

    <%= link_to ts("Cancel Potential Match Generation"), cancel_generate_collection_potential_matches_path(@collection) %>

    @@ -27,16 +27,16 @@ <%= render "match_navigation", :top => true %>

    - No potential matches generated yet! + <%= ts("No potential matches generated yet!") %>

    <% if !@settings || @settings.no_match_required? %>

    - Your challenge doesn't have any match settings defined, so the matching + <%= ts("Your challenge doesn't have any match settings defined, so the matching will be purely random. (You can adjust the assignments by hand afterwards, though!) If you want participants matched up on the tags they signed up with, - please update your + please update your ") %> <%= link_to ts("challenge match settings"), eval("edit_collection_#{challenge_class_name(@collection)}_path(@collection, :anchor => 'match_settings')") %>.

    @@ -45,10 +45,10 @@ <% elsif @assignments_with_no_potential_requests.size > 0 %>
    -

    No Potential Recipients

    +

    <%= ts("No Potential Recipients") %>

    <%= link_to ts("Regenerate Potential Matches"), generate_collection_potential_matches_path(@collection) %>

    -

    Warning! No one has requested anything that matches what these people have offered.

    -

    Everyone needs at least one potential recipient. Either edit your match settings or edit their signups (or delete them). Then regenerate potential matches to continue.

    +

    <%= ts("Warning!") %> <%= ts("No one has requested anything that matches what these people have offered.") %>

    +

    <%= ts("Everyone needs at least one potential recipient. Either edit your match settings or edit their signups (or delete them). Then regenerate potential matches to continue.") %>

    <% @assignments_with_no_potential_requests.each do |assignment| %>
    <%= link_to assignment.offer_byline, collection_signup_path(@collection, assignment.offer_signup) %> @@ -73,12 +73,12 @@ <% # the people with no one to write for - this is the hardest problem to solve %> <% if @assignments_with_no_request.size > 0 %>
    -

    Missing Recipients

    +

    <%= ts("Missing Recipients") %>

    - These people could not be assigned a recipient. - Try shuffling the assigned givers in the - main assignments (the newly matched will disappear from this section after you update), - or manually assign a pinch recipient <%= link_to_help "challenge-pinch-recipient" %>

    + <%= ts("These people could not be assigned a recipient. + Try shuffling the assigned givers in the ") %> + <%= ts("main assignments ") %> <%= ts("(the newly matched will disappear from this section after you update), + or manually assign a pinch recipient ") %> <%= link_to_help "challenge-pinch-recipient" %>

    <% @assignments_with_no_request.each do |assignment| %> <%= render :partial => "assignment_with_no_request", :locals => {:assignment => assignment} %> @@ -89,21 +89,21 @@ <% # the people with no-one writing for them %> <% if @assignments_with_no_offer.size > 0 %> -

    Missing Givers

    +

    <%= ts("Missing Givers") %>

    - These people could not be assigned a giver. You can shuffle the main assignments to free someone up, or you can assign a pinch hitter. - (Note: the form will allow you to double-assign people, but remember to make sure they can write two assignments first!) + <%= ts("These people could not be assigned a giver. You can shuffle the ") %> <%= ts("main assignments") %> <%= ts(" to free someone up, or you can assign a pinch hitter. + (Note: the form") %> <%= ts("will") %> <%= ts(" allow you to double-assign people, but remember to make sure they can write two assignments first!)") %>

    -
    <%= ts('Manage the Invite Queue') %>
    Queue PositionEmail AddressAction<%= ts('Queue Position') %><%= ts('Email Address') %><%= ts('Action') %>
    - +
    Lists assignments with no giver.
    "> + - - - - - + + + + + @@ -116,22 +116,22 @@ <% # the successful assignments %> <% if @assignments_with_request_and_offer.count > 0 %> -

    Main Assignments

    +

    <%= ts("Main Assignments") %>

    - You can shuffle these assignments around as much as you want. + <%= ts("You can shuffle these assignments around as much as you want. Circular matches (where A is assigned to B and B is assigned to A) - will happen sometimes randomly. + will happen sometimes randomly.") %>

    -
    <%= ts("Assignments with No Giver") %>
    PseudGiving Gift ToAssigned GiverPotential Givers <%= link_to_help "challenge-potential-giver" %>Write-In Pinch Hitter <%= link_to_help "challenge-pinch-hitter" %><%= ts("Pseud") %><%= ts("Giving Gift To") %><%= ts("Assigned Giver") %><%= ts("Potential Givers") %> <%= link_to_help "challenge-potential-giver" %><%= ts("Write-In Pinch Hitter") %> <%= link_to_help "challenge-pinch-hitter" %>
    - +
    Lists assignments with an assigned giver.
    "> + - - - - - + + + + + diff --git a/app/views/tag_wranglers/show.html.erb b/app/views/tag_wranglers/show.html.erb index aab918b1c42..f3562ca9136 100644 --- a/app/views/tag_wranglers/show.html.erb +++ b/app/views/tag_wranglers/show.html.erb @@ -20,36 +20,36 @@ feedback needed from realuse (is it annoying having the announcement on every cell, and is it doubling up, basically?)--> <% unless @fandoms.empty? %>
    -

    Assigned Fandoms

    -

    Fandoms assigned to you via the <%= link_to 'tag wranglers page', tag_wranglers_path %>. The unwrangled count is the number of - unwrangled tags which were used on works in the given fandom.

    -
    <%= ts("Assignments with an Assigned Giver") %>
    PseudGiving Gift ToAssigned GiverPotential Givers <%= link_to_help "challenge-potential-giver" %>Write-In Pinch Hitter <%= link_to_help "challenge-pinch-hitter" %><%= ts("Pseud") %><%= ts("Giving Gift To") %><%= ts("Assigned Giver") %><%= ts("Potential Givers") %> <%= link_to_help "challenge-potential-giver" %><%= ts("Write-In Pinch Hitter") %> <%= link_to_help "challenge-pinch-hitter" %>
    - +

    <%= ts('Assigned Fandoms') %>

    +

    <%= ts('Fandoms assigned to you via the ') %> <%= link_to ts('tag wranglers page'), tag_wranglers_path %>. <%= ts('The unwrangled count is the number of + unwrangled tags which were used on works in the given fandom.') %>

    +
    + - - - + + + - - - - - - + + + + + + <% for fandom in @fandoms %> - - - - - - - + + + + + + + <% end %> diff --git a/app/views/tag_wranglings/discuss.html.erb b/app/views/tag_wranglings/discuss.html.erb index 3c15f10152f..a9e04ed5e82 100644 --- a/app/views/tag_wranglings/discuss.html.erb +++ b/app/views/tag_wranglings/discuss.html.erb @@ -1,19 +1,19 @@ -

    Tag Wrangling Discussion

    +

    <%= ts('Tag Wrangling Discussion') %>

    <%= will_paginate(@comments) %>
    -
    <%= ts('Unfilterable and Unwrangled Tag Counts for Your Assigned Fandoms') %>
    FandomUnfilterableUnwrangled<%= ts('Fandom') %><%= ts('Unfilterable') %><%= ts('Unwrangled') %>
    CharactersRelationshipsFreeformsCharactersRelationshipsFreeforms<%= ts('Characters') %><%= ts('Relationships') %><%= ts('Freeforms') %><%= ts('Characters') %><%= ts('Relationships') %><%= ts('Freeforms') %>
    <%= link_to fandom.name, {:controller => :tags, :action => :wrangle, :id => fandom} %><%= (tag_count = fandom.characters.unfilterable.size) > 0 ? link_to(tag_count, {:controller => :tags, :action => :wrangle, :id => fandom, :show => :characters, :status => :unfilterable}) : " " %><%= (tag_count = fandom.relationships.unfilterable.size) > 0 ? link_to(tag_count, {:controller => :tags, :action => :wrangle, :id => fandom, :show => :relationships, :status => :unfilterable}) : " " %><%= (tag_count = fandom.freeforms.unfilterable.size) > 0 ? link_to(tag_count, {:controller => :tags, :action => :wrangle, :id => fandom, :show => :freeforms, :status => :unfilterable}) : " " %><%= (tag_count = fandom.same_work_tags.unwrangled.by_type("Character").size) > 0 ? link_to(tag_count, {:controller => :tags, :action => :wrangle, :id => fandom, :show => :characters, :status => :unwrangled}) : " " %><%= (tag_count = fandom.same_work_tags.unwrangled.by_type("Relationship").size) > 0 ? link_to(tag_count, {:controller => :tags, :action => :wrangle, :id => fandom, :show => :relationships, :status => :unwrangled}) : " " %><%= (tag_count = fandom.same_work_tags.unwrangled.by_type("Freeform").size) > 0 ? link_to(tag_count, {:controller => :tags, :action => :wrangle, :id => fandom, :show => :freeforms, :status => :unwrangled}) : " " %><%= link_to fandom.name, {:controller => :tags, :action => :wrangle, :id => fandom} %><%= (tag_count = fandom.characters.unfilterable.size) > 0 ? link_to(tag_count, {:controller => :tags, :action => :wrangle, :id => fandom, :show => :characters, :status => :unfilterable}) : " " %><%= (tag_count = fandom.relationships.unfilterable.size) > 0 ? link_to(tag_count, {:controller => :tags, :action => :wrangle, :id => fandom, :show => :relationships, :status => :unfilterable}) : " " %><%= (tag_count = fandom.freeforms.unfilterable.size) > 0 ? link_to(tag_count, {:controller => :tags, :action => :wrangle, :id => fandom, :show => :freeforms, :status => :unfilterable}) : " " %><%= (tag_count = fandom.same_work_tags.unwrangled.by_type("Character").size) > 0 ? link_to(tag_count, {:controller => :tags, :action => :wrangle, :id => fandom, :show => :characters, :status => :unwrangled}) : " " %><%= (tag_count = fandom.same_work_tags.unwrangled.by_type("Relationship").size) > 0 ? link_to(tag_count, {:controller => :tags, :action => :wrangle, :id => fandom, :show => :relationships, :status => :unwrangled}) : " " %><%= (tag_count = fandom.same_work_tags.unwrangled.by_type("Freeform").size) > 0 ? link_to(tag_count, {:controller => :tags, :action => :wrangle, :id => fandom, :show => :freeforms, :status => :unwrangled}) : " " %>
    - +
    + - - - - - - + + + + + + diff --git a/app/views/tag_wranglings/index.html.erb b/app/views/tag_wranglings/index.html.erb index 77ec74521f1..28d73d3e84e 100755 --- a/app/views/tag_wranglings/index.html.erb +++ b/app/views/tag_wranglings/index.html.erb @@ -2,12 +2,12 @@

    <%= ts("Tag Wrangling") %>

    <% unless params[:show] %> -

    Notes

    +

    <%= ts("Notes") %>

      -
    • When users create new tags, they're not 'canonical', or official, and they don't have any associations with other tags.
      • -
    • Use mass wrangling pages to manage new tags as they come in, and to edit multiple tags at once.
      • -
    • The counts (47) are the number of unwrangled tags in each category.
      • -
    • To associate relationships with characters, first choose a fandom to narrow down the scope. Choose a category to get started.
      • +
    • <%= ts("When users create new tags, they're not 'canonical', or official, and they don't have any associations with other tags.") %>
      • +
    • <%= ts("Use mass wrangling pages to manage new tags as they come in, and to edit multiple tags at once.") %>
      • +
    • <%= ts("The counts (47) are the number of unwrangled tags in each category.") %>
      • +
    • <%= ts("To associate relationships with characters, first choose a fandom to narrow down the scope. Choose a category to get started.") %>
    <% end %> @@ -23,17 +23,17 @@ <% if params[:show] == "character_relationships" %> -

    First, choose a canonical fandom:

    +

    <%= ts("First, choose a canonical fandom:") %>

    <%= form_tag url_for(:controller => 'tag_wranglings', :action => 'index'), :method => :get do %>
    - Choose fandom + <%= ts("Choose fandom") %>
    -
    +
    "> <%= label_tag :fandom_string, ts("Fandom:") %>
    <%= text_field_tag 'fandom_string', params[:fandom_string], autocomplete_options("fandom", :autocomplete_token_limit => 1) %>
    -
    Submit
    -
    <%= hidden_field_tag :show, 'character_relationships' %><%= submit_tag "Go" %>
    +
    <%= ts("Submit") %>
    +
    <%= hidden_field_tag :show, 'character_relationships' %><%= submit_tag ts("Go") %>
    <% end %> @@ -42,39 +42,39 @@ <% if @tags && @tags.empty? %> <% if params[:show] == "character_relationships" %> -

    There are no canonical relationships in this fandom at the moment.

    +

    <%= ts("There are no canonical relationships in this fandom at the moment.") %>

    <% else %> -

    There are no unwrangled tags in this category at the moment.

    +

    <%= ts("There are no unwrangled tags in this category at the moment.") %>

    <% end %> <% elsif @tags %> <%= will_paginate @tags %> <%= form_tag url_for(:controller => 'tag_wranglings', :action => 'wrangle'), :method => :post, :id => 'wrangulator' do %>
    - Assign and Mass Select + <%= ts("Assign and Mass Select") %>
    <% if params[:show] == "fandoms" %>
    <%= label_tag :media, ts("Wrangle to Media") %>
    <%= select_tag :media, options_for_select(@media_names) %>
    <% elsif params[:show] == "character_relationships" %>
    <%= label_tag :character_string, ts("Wrangle to Character") %>
    -
    <%= text_field_tag 'character_string', params[:character_string], autocomplete_options("character", :autocomplete_token_limit => 1) %>
    +
    "><%= text_field_tag 'character_string', params[:character_string], autocomplete_options("character", :autocomplete_token_limit => 1) %>
    <% else %>
    <%= label_tag :fandom_string, ts("Wrangle to Fandom") %>
    <%= text_field_tag 'fandom_string', params[:fandom_string], autocomplete_options("fandom", :autocomplete_token_limit => 1) %>
    <% end %> -
    Submit
    -
    <%= submit_tag "Wrangle" %>
    +
    <%= ts("Submit") %>
    +
    <%= submit_tag ts("Wrangle") %>
    - Choose tags from a table -

    Individual Selection Table

    + <%= ts("Choose tags from a table") %> +

    <%= ts("Individual Selection Table") %>

    -
    <%= ts('Tag Wrangling Discussions') %>
    TagCommentRepliesThread Started ByLast Reply ByLast Updated At<%= ts('Tag') %><%= ts('Comment') %><%= ts('Replies') %><%= ts('Thread Started By') %><%= ts('Last Reply By') %><%= ts('Last Updated At') %>
    - +
    <%= @tags.first.class.to_s.pluralize %> to be wrangled
    " id="wrangulise"> + @@ -85,65 +85,65 @@ <%= sort_link ts('Tag Name'), :name, {:sort_default => true} %> <% if params[:show] == 'character_relationships' %> - + <% end %> - - + - - + + <% for tag in @tags %> - - - + + <% if params[:show] == 'character_relationships' %> - <% end %> - - + diff --git a/app/views/tags/wrangle.html.erb b/app/views/tags/wrangle.html.erb index 69039c2e8f1..e6f3fc8b66b 100644 --- a/app/views/tags/wrangle.html.erb +++ b/app/views/tags/wrangle.html.erb @@ -3,7 +3,7 @@ @@ -22,21 +22,21 @@ <% end %> <% if @tag.is_a?(Fandom) && params[:show] == "relationships" %> -

    <%= link_to "wrangle relationships to characters", tag_wranglings_path(:show => 'character_relationships', :fandom_string => @tag.name) %>

    +

    <%= link_to ts('wrangle relationships to characters'), tag_wranglings_path(:show => 'character_relationships', :fandom_string => @tag.name) %>

    <% end %> <% if params[:show] && params[:show] !~ /suggested/ %>
    -

    Add new <%= params[:show] %>

    +

    <%= ts('Add new') %> <%= params[:show] %>

    <%= form_for :tag, @tag, :url => { :action => "update", :id => @tag}, :html => { :method => :put } do |f| %> -
    +
    <%= f.text_field "#{params[:show].singularize}_string", autocomplete_options("tag?type=#{params[:show].singularize}") %> <%= hidden_field_tag :show, params[:show] %> <%= hidden_field_tag :sort_column, params[:sort_column] %> <%= hidden_field_tag :sort_direction, params[:sort_direction] %> <%= hidden_field_tag :page, params[:page] %> <%= hidden_field_tag :status, params[:status] %> - <%= f.submit 'Wrangle' %> + <%= f.submit ts('Wrangle') %>
    <% end %>
    @@ -44,41 +44,41 @@ <% if params[:show] %> <% end %> <% if @tags && @tags.empty? %> -

    There are no tags in this category at the moment.

    +

    <%= ts('There are no tags in this category at the moment.') %>

    <% elsif @tags %> <%= will_paginate @tags %> <%= form_tag url_for(:controller => 'tags', :action => 'mass_update'), :method => :post, :id => 'wrangulator' do %> -

    <%= submit_tag "Wrangle" %>

    +

    <%= submit_tag ts("Wrangle") %>

    <% sort_url_options = {:show => params[:show], :status => params[:status], :sort_column => params[:sort_column]} %> -
    <%= @tags.first.class.to_s.pluralize %> <%= ts("to be Wrangled") %>
    - Mass Wrangle + <%= ts("Mass Wrangle") %> <%= sort_link ts('Created'), :created_at, {:desc_default => true} %> Characters<%= ts("Characters") %> - Canonical + <%= ts("Canonical") %> + "> <%= sort_link ts('Taggings'), :taggings_count, {:desc_default => true} %> Manage<%= ts("Manage") %>
    Action:<%= submit_tag "Wrangle" %><%= ts("Action:") %><%= submit_tag ts("Wrangle") %>
    + "> <%= label_tag "selected_tags_#{tag.id}", "#{tag.name}" %> <%= check_box_tag "selected_tags[]", tag.id, nil, :id => "selected_tags_#{tag.id}" %><%= l(tag.created_at.to_date) %>"><%= check_box_tag "selected_tags[]", tag.id, nil, :id => "selected_tags_#{tag.id}" %>"><%= l(tag.created_at.to_date) %> + "> <% unless tag.characters.empty? %>
      <%= tag_link_list(tag.characters) %>
    <% end %>     		+ "> <% if tag.canonical? %> Yes <% else %> <%= check_box_tag "canonicals[]", tag.id, tag.canonical?, :id => "canonicals_#{tag.id}" %> <% end %> <%= tag.taggings_count %>"><%= tag.taggings_count %>
    - +
    + <% if params[:show] == "relationships" %> - + <% end %> - + <% if params[:status] == "canonical" %> - + <% else %> - + <% end %> - + <% for tag in @tags %> - <% if params[:show] == "relationships" %> - <% end %> - - - - + + @@ -147,7 +147,7 @@ <%= hidden_field_tag :page, params[:page] %> <%= hidden_field_tag :status, params[:status] %> -

    <%= submit_tag "Wrangle" %>

    +

    <%= submit_tag ts("Wrangle") %>

    <% end %> diff --git a/app/views/translators/index.html.erb b/app/views/translators/index.html.erb index f6532604e6a..9d2d6ee65ca 100644 --- a/app/views/translators/index.html.erb +++ b/app/views/translators/index.html.erb @@ -1,9 +1,9 @@

    <% if @locale %> - <%= t('.translators_for_locale', :default => 'Translators for %{current_locale}', :current_locale => @locale.name) %> + <%= ts('Translators for %{current_locale}', :current_locale => @locale.name) %> <% else %> - <%= t('.translators_header', :default => 'Translators') %> + <%= ts('Translators') %> <% end %>

    @@ -11,21 +11,21 @@ <% if current_user.is_a?(User) && current_user.is_translation_admin? %> <% end %> -
    <%= ts('') %>
    <%= sort_link ts('Tag Name'), :name, {:sort_default => true} %> Characters<%= ts('Characters') %>Canonical<%= ts('Canonical') %>Metatag<%= ts('Metatag') %>Synonym<%= ts('Synonym') %> <%= sort_link ts('Created'), :created_at, {:desc_default => true} %> @@ -86,41 +86,41 @@ <%= sort_link ts('Taggings'), :taggings_count, {:desc_default => true} %> Manage<%= ts('Manage') %>
    + <%= label_tag "canonicals_#{tag.id}", tag.name %> + <% unless !tag.canonical? || tag.characters.empty? %>
      <%= tag_link_list(tag.characters) %>
    <% end %>     		+ <% if tag.canonical? %> - Yes + <%= ts('Yes') %> <% elsif tag.unwrangleable? %> - Unwrangleable + <%= ts('Unwrangleable') %> <% else %> <%= check_box_tag "canonicals[]", tag.id, tag.canonical?, :id => "canonicals_#{tag.id}" %> <% end %> + <% if params[:status] == "canonical" %> <% unless tag.direct_meta_tags.blank? %><%= tag_link_list(tag.direct_meta_tags) %><% end %> <% else %> <% if tag.merger %><%= link_to_tag(tag.merger) %><% end %> <% end %> <%= tag.created_at.to_date %><%= tag.taggings_count %><%= tag.created_at.to_date %><%= tag.taggings_count %>
    - +
    <%=h t('.list', :default => "List of active translators") %>
    + - - + + <% if @locale.blank? %> - + <% end %> diff --git a/app/views/translators/new.html.erb b/app/views/translators/new.html.erb index 6f42ddd4950..b07f6959260 100644 --- a/app/views/translators/new.html.erb +++ b/app/views/translators/new.html.erb @@ -1,5 +1,5 @@ -

    <%= t('.add_new_translator', :default => 'Add new translators:') %>

    +

    <%= ts(''Add New Translators') %>

    @@ -8,12 +8,12 @@ <%= form_tag url_for({:controller => :translators, :action => 'create', :method => :post}) do %> -
    <%= ts("Active Translators") %>
    <%=h t('.name', :default => "Name") %><%=h t('.email', :default => "Email") %><%= ts("Name") %><%= ts("Email") %><%=h t('.current_locale', :default => "Locale") %><%= ts("Locale") %>
    - +
    Add new translators
    + - - + + @@ -30,8 +30,8 @@ - - + +
    <%= ts('Add New Translators') %>
    <%= t('.translator_email', :default => 'Email Address') %><%= t('.translator_locale', :default => 'Locale') %><%= ts('Email Address') %><%= ts('Locale') %>
    Add translator<%= submit_tag t('.forms.submit', :default => "Submit") %><%= ts('Add translator') %><%= submit_tag ts('Submit') %>
    diff --git a/app/views/user_invite_requests/index.html.erb b/app/views/user_invite_requests/index.html.erb index d0f370fbd0d..a518479e43e 100644 --- a/app/views/user_invite_requests/index.html.erb +++ b/app/views/user_invite_requests/index.html.erb @@ -1,5 +1,5 @@ <% # this page is for administrators only, they cannot navigate to individual user pages %> -

    <%= ts("User invite requests") %>

    +

    <%= ts("User Invite Requests") %>

    <%= ts("Enter \"0\" under quantity to deny the request. Clear the box to delay your decision for now.") %>

    <%= ts("To give a user more invitations without a request, visit their individual invitations page.") %>

    @@ -7,15 +7,15 @@ <%= form_tag url_for(:controller => 'user_invite_requests', :action => 'update') do %> - - +
    Allot invites to users
    + - - - - - + + + + + @@ -31,8 +31,8 @@ - - + +
    <%= ts('Allot Invites to Users') %>
    UserReasonQuantityCreated atPrevious<%= ts('User') %><%= ts('Reason') %><%= ts'(Quantity') %><%= ts('Created at') %><%= ts('Previous') %>
    Submit:<%= submit_tag "Update" %><%= ts('Submit:') %><%= submit_tag ts("Update") %>