Remove unused translations

app/assets/templates/single-post-viewer/single-post-actions_tpl.jst.hbs

@@ -1,6 +1,6 @@
 <div class='pull-right'>
   {{#if loggedIn}}
-    <a href="#" class="like" title="{{#if userLike}} {{t "viewer.unlike"}} {{else}} {{t "viewer.like"}} {{/if}}">
+    <a href="#" class="like" title="{{#if userLike}} {{t "stream.unlike"}} {{else}} {{t "stream.like"}} {{/if}}">
     {{#if userLike}}
       <i class="entypo-heart red large"></i>
     {{else}}
@@ -8,12 +8,12 @@
     {{/if}}
     </a>
 
-    <a href="#" class="focus-comment" title="{{t "viewer.comment"}}">
+    <a href="#" class="focus-comment" title="{{t "stream.comment"}}">
       <i class="entypo-comment gray large"></i>
     </a>
 
     {{#if userCanReshare}}
-      <a href="#" class="reshare" title="{{t "viewer.reshare"}}">
+      <a href="#" class="reshare" title="{{t "stream.reshare"}}">
         <i class="entypo-reshare gray large"></i>
       </a>
     {{else}}

app/views/admins/user_search.html.haml

@@ -46,7 +46,7 @@
                 = text_field_tag "identifier", nil, class: "form-control"
             .form-group
               .clearfix.col-md-12
-                = submit_tag t("services.remote_friend.invite"), class: "btn btn-default pull-right"
+                = submit_tag t(".invite"), class: "btn btn-default pull-right"
 
       .row
         .col-md-12

config/locales/diaspora/en.yml

@@ -21,9 +21,6 @@ en:
   delete: "Delete"
   hide: "Hide"
   ignore: "Ignore"
-  undo: "Undo?"
-  or: "or"
-  ago: "%{time} ago"
   username: "Username"
   email: "Email"
   password: "Password"
@@ -39,8 +36,6 @@ en:
   find_people: "Find people or #tags"
   _home: "Home"
   more: "More"
-  next: "Next"
-  previous: "Previous"
   _comments: "Comments"
   all_aspects: "All aspects"
   no_results: "No results found"
@@ -123,6 +118,7 @@ en:
       account_locking_scheduled: "The account of %{name} is scheduled to be locked. It will be processed in a few moments..."
       account_unlocking_scheduled: "The account of %{name} is scheduled to be unlocked. It will be processed in a few moments..."
       email_to: "Email to invite"
+      invite: "Invite"
       under_13: "Show users that are under 13 (COPPA)"
       users:
         zero: "%{count} users found"
@@ -174,11 +170,6 @@ en:
       tag_name: "Tag name: <b>%{name_tag}</b> Count: <b>%{count_tag}</b>"
     pods:
       pod_network: "Pod network"
-  application:
-    helper:
-      unknown_person: "Unknown person"
-      video_title:
-        unknown: "Unknown video title"
   aspects:
     contacts_visible: "Contacts in this aspect will be able to see each other."
     contacts_not_visible: "Contacts in this aspect will not be able to see each other."
@@ -195,8 +186,6 @@ en:
       aspect_chat_is_not_enabled: "Contacts in this aspect are not able to chat with you."
       update: "Update"
       updating: "Updating"
-    no_posts_message:
-      start_talking: "Nobody has said anything yet!"
     no_contacts_message:
       you_should_add_some_more_contacts: "You should add some more contacts!"
       try_adding_some_more_contacts: "You can search or %{invite_link} more contacts."
@@ -233,13 +222,6 @@ en:
       donate: "Donate"
       keep_pod_running: "Keep %{pod} running fast and buy servers their coffee fix with a monthly donation!"
       keep_diaspora_running: "Keep diaspora* development fast with a monthly donation!"
-      no_tags: "+ Find a tag to follow"
-      unfollow_tag: "Stop following #%{tag}"
-      handle_explanation: "This is your diaspora* ID. Like an email address, you can give this to people to reach you."
-      no_contacts: "No contacts"
-      post_a_message: "Post a message >>"
-      people_sharing_with_you: "People sharing with you"
-
       welcome_to_diaspora: "Welcome to diaspora*, %{name}!"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
 
@@ -265,10 +247,6 @@ en:
         any_problem: "Got a problem?"
         contact_podmin: "Contact the administrator of your pod!"
         mail_podmin: "Podmin email"
-      diaspora_id:
-        heading: "diaspora* ID"
-        content_1: "Your diaspora* ID is:"
-        content_2: "Give it to anyone and they’ll be able to find you on diaspora*."
       services:
         heading: "Connect services"
         content: "You can connect the following services to diaspora*:"
@@ -311,11 +289,9 @@ en:
     sharing:
       people_sharing: "People sharing with you:"
     index:
-      add_to_aspect: "Add contacts to %{name}"
       start_a_conversation: "Start a conversation"
       add_a_new_aspect: "Add a new aspect"
       title: "Contacts"
-      your_contacts: "Your contacts"
       no_contacts: "Looks like you need to add some contacts!"
       no_contacts_message: "Check out %{community_spotlight}"
       community_spotlight: "Community spotlight"
@@ -334,12 +310,9 @@ en:
     index:
       conversations_inbox: "Conversations – Inbox"
       new_conversation: "New conversation"
-      no_conversation_selected: "No conversation selected"
       create_a_new_conversation: "Start a new conversation"
       no_messages: "No messages"
       inbox: "Inbox"
-    conversation:
-      participants: "Participants"
     show:
       reply: "Reply"
       replying: "Replying..."
@@ -353,12 +326,6 @@ en:
       message: "Message"
       send: "Send"
       sending: "Sending..."
-      abandon_changes: "Abandon changes?"
-    helper:
-      new_messages:
-        zero: "No new messages"
-        one: "1 new messages"
-        other: "%{count} new messages"
     create:
       sent: "Message sent"
       fail: "Invalid message"
@@ -624,7 +591,6 @@ en:
       report_bugs: "report them"
 
   invitation_codes:
-    excited: "%{name} is excited to see you here."
     not_valid: "That invite code is no longer valid"
 
   invitations:
@@ -632,17 +598,12 @@ en:
       sent: "Invitations have been sent to: %{emails}"
       rejected: "The following email addresses had problems: "
       no_more: "You have no more invitations."
-      already_sent: "You already invited this person."
-      already_contacts: "You are already connected with this person"
-      own_address: "You can’t send an invitation to your own address."
       empty: "Please enter at least one email address."
       note_already_sent: "Invitations have already been sent to: %{emails}"
     new:
       language: "Language"
       invite_someone_to_join: "Invite someone to join diaspora*!"
-      if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       comma_separated_plz: "You can enter multiple email addresses separated by commas."
-      check_out_diaspora: "Hey! You should check out diaspora*"
       to: "To"
       personal_message: "Personal message"
       send_an_invitation: "Send an invitation"
@@ -653,15 +614,8 @@ en:
         zero:  "No invites left on this code"
         one:  "One invite left on this code"
         other:  "%{count} invites left on this code"
-      aspect: "Aspect"
-      already_invited: "The following people have not accepted your invitation:"
-      resend: "Resend"
-      check_out_diaspora: "Check out diaspora*!"
     check_token:
       not_found: "Invitation token not found"
-    edit:
-      your_account_awaits: "Your account awaits!"
-      accept_your_invitation: "Accept your invitation"
     a_facebook_user: "A Facebook user"
 
   layouts:
@@ -670,7 +624,6 @@ en:
       settings: "Settings"
       help: "Help"
       logout: "Log out"
-      blog: "Blog"
       login: "Log in"
       code: "Code"
       admin: "Admin"
@@ -693,10 +646,6 @@ en:
         zero: "No likes"
         one: "%{count} like"
         other: "%{count} likes"
-      people_like_this_comment:
-        zero: "No likes"
-        one: "%{count} like"
-        other: "%{count} likes"
 
   notifications:
     started_sharing:
@@ -718,7 +667,7 @@ en:
     mentioned:
       zero: "%{actors} have mentioned you in the post %{post_link}."
       one: "%{actors} has mentioned you in the post %{post_link}."
-      other: "%{actors} have mentioned you in the %{post_link}."
+      other: "%{actors} have mentioned you in the post %{post_link}."
     liked:
       zero: "%{actors} have liked your post %{post_link}."
       one: "%{actors} has liked your post %{post_link}."
@@ -958,10 +907,7 @@ en:
     one: "1 person"
     other: "%{count} people"
     person:
-      pending_request: "Pending request"
-      already_connected: "Already connected"
       thats_you: "That’s you!"
-      add_contact: "Add contact"
     index:
       results_for: "Users matching %{search_term}"
       no_results: "Hey! You need to search for something."
@@ -975,54 +921,23 @@ en:
       fail: "Sorry, we couldn’t find %{handle}."
     show:
       has_not_shared_with_you_yet: "%{name} has not shared any posts with you yet!"
-      incoming_request: "%{name} wants to share with you"
       return_to_aspects: "Return to your aspects page"
       to_accept_or_ignore: "to accept or ignore it."
       does_not_exist: "Person does not exist!"
-      not_connected: "You are not sharing with this person"
-      recent_posts: "Recent posts"
-      recent_public_posts: "Recent public posts"
-      see_all: "See all"
-      start_sharing: "Start sharing"
       message: "Message"
       mention: "Mention"
       closed_account: "This account has been closed."
-    sub_header:
-      you_have_no_tags: "You have no tags!"
-      add_some: "Add some"
-      edit: "Edit"
     profile_sidebar:
-      remove_contact: "Remove contact"
-      edit_my_profile: "Edit my profile"
       bio: "Bio"
       location: "Location"
       gender: "Gender"
       born: "Birthday"
-      photos: "Photos"
-      in_aspects: "In aspects"
-      remove_from: "Remove %{name} from %{aspect}?"
-    helper:
-      results_for: " results for %{params}"
-      is_sharing: "%{name} is sharing with you"
-      is_not_sharing: "%{name} is not sharing with you"
-    aspect_list:
-      edit_membership: "Edit aspect membership"
-    add_contact_small:
-      add_contact_from_tag: "Add contact from tag"
     add_contact:
       invited_by: "You were invited by"
 
   photos:
     show:
-      delete_photo: "Delete photo"
-      make_profile_photo: "Make profile photo"
-      update_photo: "Update photo"
-      edit: "Edit"
-      edit_delete_photo: "Edit photo description / delete photo"
-      collection_permalink: "Collection permalink"
       show_original_post: "Show original post"
-    edit:
-      editing: "Editing"
     photo:
       view_all: "View all of %{name}’s photos"
     new:
@@ -1033,9 +948,6 @@ en:
       runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
       integrity_error: "Photo upload failed.  Are you sure that was an image?"
       type_error: "Photo upload failed.  Are you sure an image was added?"
-    update:
-      notice: "Photo successfully updated."
-      error: "Failed to edit photo."
     destroy:
       notice: "Photo deleted."
     new_photo:
@@ -1044,8 +956,6 @@ en:
       empty: "{file} is empty, please select files again without it."
     new_profile_photo:
       upload: "Upload a new profile photo!"
-      or_select_one_existing: "or select one from your already existing %{photos}"
-    comment_email_subject: "%{name}’s photo"
 
   polls:
     votes:
@@ -1085,11 +995,6 @@ en:
       created: "A report was created"
       failed: "Something went wrong"
 
-  share_visibilites:
-    update:
-      post_hidden_and_muted: "%{name}’s post has been hidden, and notifications have been muted."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}’s profile page."
-
   profiles:
     edit:
       basic: "My basic profile"
@@ -1124,11 +1029,6 @@ en:
 
   registrations:
     new:
-      create_my_account: "Create my account!"
-
-      join_the_movement: "Join the movement!"
-      sign_up_message: "Social networking with a ♥"
-
       enter_email: "Enter your email address"
       enter_username: "Pick a username (only letters, numbers, and underscores)"
       enter_password: "Enter a password (six character minimum)"
@@ -1143,43 +1043,16 @@ en:
       terms_link: "terms of service"
     create:
       success: "You’ve joined diaspora*!"
-    edit:
-      edit: "Edit %{name}"
-      leave_blank: "(leave blank if you don’t want to change it)"
-      password_to_confirm: "(we need your current password to confirm your changes)"
-      unhappy: "Unhappy?"
-      update: "Update"
-      cancel_my_account: "Cancel my account"
     closed: "Signups are closed on this diaspora* pod."
     invalid_invite: "The invite link you provided is no longer valid!"
 
-  requests:
-    manage_aspect_contacts:
-      manage_within: "Manage contacts within"
-      existing: "Existing contacts"
-    destroy:
-      success: "You are now sharing."
-      error: "Please select an aspect!"
-      ignore: "Ignored contact request."
-    create:
-      sending: "Sending"
-      sent: "You’ve asked to share with %{name}.  They should see it next time they log in to diaspora*."
-    new_request_to_person:
-      sent: "Sent!"
-    helper:
-      new_requests:
-        zero: "No new requests"
-        one: "New request!"
-        other: "%{count} new requests!"
   reshares:
     reshare:
       reshared_via: "Reshared via"
-      reshare_original: "Reshare original"
       reshare:
         zero: "Reshare"
         one: "1 reshare"
         other: "%{count} reshares"
-      show_original: "Show original"
       reshare_confirmation: "Reshare %{author}’s post?"
       deleted: "Original post deleted by author."
     create:
@@ -1211,25 +1084,14 @@ en:
       success: "Successfully deleted authentication."
     failure:
       error: "There was an error connecting to that service"
-    inviter:
-      join_me_on_diaspora: "Join me on diaspora*"
-      click_link_to_accept_invitation: "Follow this link to accept your invitation"
-    finder:
-      fetching_contacts: "diaspora* is populating your %{service} friends, please check back in a few minutes."
-      service_friends: "%{service} friends"
-      no_friends: "No Facebook friends found."
-    remote_friend:
-      resend: "Resend"
-      invite: "Invite"
-      not_on_diaspora: "Not yet on diaspora*"
 
   blocks:
     create:
       success: "All right, you won’t see that user in your stream again. #silencio!"
-      failure: "I couldn’t ignore that user.  #evasion"
+      failure: "I couldn’t ignore that user. #evasion"
     destroy:
       success: "Let’s see what they have to say! #sayhello"
-      failure: "I couldn’t stop ignoring that user.  #evasion"
+      failure: "I couldn’t stop ignoring that user. #evasion"
 
   shared:
     aspect_dropdown:
@@ -1245,16 +1107,12 @@ en:
       posting: "Posting..."
       share: "Share"
       preview: "Preview"
-      post_a_message_to: "Post a message to %{aspect}"
-      make_public: "Make public"
       all: "All"
       upload_photos: "Upload photos"
       get_location: "Get your location"
       remove_location: "Remove location"
       all_contacts: "All contacts"
-      share_with: "Share with"
       whats_on_your_mind: "What’s on your mind?"
-      publishing_to: "Publishing to: "
       discard_post: "Discard post"
       new_user_prefill:
         newhere: "newhere"
@@ -1267,21 +1125,10 @@ en:
         add_a_poll: "Add a poll"
         question: "Question"
         option: "Option 1"
-    add_contact:
-      enter_a_diaspora_username: "Enter a diaspora* username:"
-      your_diaspora_username_is: "Your diaspora* username is: %{diaspora_handle}"
-      create_request: "Find by diaspora* ID"
-      diaspora_handle: "diaspora@pod.org"
-      know_email: "Know their email address? You should invite them"
-      add_new_contact: "Add a new contact"
     invitations:
       invites: "Invites"
-      invite_someone: "Invite someone"
       invitations_left: "%{count} left"
-      dont_have_now: "You don’t have any right now, but more invites are coming soon!"
-      invites_closed: "Invites are currently closed on this diaspora* pod"
       invite_your_friends: "Invite your friends"
-      from_facebook: "From Facebook"
       by_email: "By email"
       share_this: "Share this link via email, blog, or social networks!"
     reshare:
@@ -1296,14 +1143,7 @@ en:
       logged_in: "Logged in to %{service}"
       manage: "Manage connected services"
       atom_feed: "Atom feed"
-    notification:
-      new: "New %{type} from %{from}"
-    contact_list:
-      all_contacts: "All contacts"
     stream_element:
-      viewable_to_anyone: "This post is viewable to anyone on the web"
-      connect_to_comment: "Connect to this user to comment on their post"
-      currently_unavailable: "Commenting currently unavailable"
       via: "Via %{link}"
       via_mobile: "Via mobile"
       ignore_user: "Ignore %{name}"
@@ -1311,19 +1151,12 @@ en:
       hide_and_mute: "Hide and mute post"
       like: "Like"
       unlike: "Unlike"
-      shared_with: "Shared with: %{aspect_names}"
-      nsfw: "This post has been flagged as NSFW by its author. %{link}"
       show: "Show"
-    footer:
-      logged_in_as: "Logged in as %{name}"
-      your_aspects: "Your aspects"
   status_messages:
     new:
       mentioning: "Mentioning: %{person}"
     create:
       success: "Successfully mentioned: %{names}"
-    helper:
-      no_message_to_display: "No message to display."
     destroy:
       failure: "Failed to delete post"
     too_long: "Please make your status message fewer than %{count} characters. Right now it is %{current_length} characters"
@@ -1471,7 +1304,6 @@ en:
       what_are_you_in_to: "What are you into?"
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They’re also a great way to find new people on diaspora*."
       hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
-      saved: "Saved!"
 
     update:
       password_changed: "Password changed.  You can now log in with your new password."
@@ -1500,13 +1332,6 @@ en:
     previous_label: "&laquo; previous"
     next_label: "next &raquo;"
 
-  webfinger:
-    fetch_failed: "Failed to fetch webfinger profile for %{profile_url}"
-    hcard_fetch_failed: "There was a problem fetching the hcard for %{account}"
-    xrd_fetch_failed: "There was an error getting the xrd from account %{account}"
-    not_enabled: "Webfinger does not seem to be enabled for %{account}’s host"
-    no_person_constructed: "No person could be constructed from this hcard."
-
   simple_captcha:
     placeholder: "Enter the image value"
     label: "Enter the code in the box:"

config/locales/javascript/javascript.en.yml

@@ -118,12 +118,7 @@ en:
     my_stream: "Stream"
     my_aspects: "My aspects"
 
-    videos:
-      watch: "Watch this video on <%= provider %>"
-      unknown: "Unknown video type"
-    search_for: "Search for <%= name %>"
     publisher:
-      at_least_one_aspect: "You must publish to at least one aspect"
       limited: "Limited: your post will only be seen by people you are sharing with"
       public: "Public: your post will be visible to everyone and found by search engines"
       near_from: "Posted from: <%= location %>"
@@ -134,9 +129,6 @@ en:
       post_something: "Post to diaspora*"
       post_submit: "Submitting post..."
       post_success: "Posted! Closing popup window..."
-    infinite_scroll:
-      no_more: "No more posts."
-      no_more_contacts: "No more contacts."
     aspect_dropdown:
       add_to_aspect: "Add contact"
       select_aspects: "Select aspects"
@@ -207,7 +199,6 @@ en:
       posts: "Posts"
 
     conversation:
-      participants: "Participants"
       new:
         no_contacts: "You need to add some contacts before you can start a conversation."
 
@@ -290,14 +281,7 @@ en:
       close: "Close"
 
     viewer:
-      stop_following_post: "Stop following post"
-      follow_post: "Follow post"
-      like: "Like"
-      unlike: "Unlike"
-      reshare: "Reshare"
       reshared: "Reshared"
-      comment: "Comment"
-      home: "Home"
 
     poll:
       vote: "Vote"

spec/lib/i18n_interpolation_fallbacks_spec.rb

@@ -15,15 +15,15 @@ describe "i18n interpolation fallbacks" do
   end
   describe "when string requires interpolation arguments" do
     context "current locale has no fallbacks" do
-      # ago: "%{time} ago" (in en.yml)
+      # tags.show.follow: "Follow #%{tag}" (in en.yml)
       it "returns the translation when all arguments are provided" do
-        expect(I18n.t('ago', :time => "2 months")).to eq("2 months ago")
+        expect(I18n.t("tags.show.follow", tag: "cats")).to eq("Follow #cats")
       end
       it "returns the translation without substitution when all arguments are omitted" do
-        expect(I18n.t('ago')).to eq("%{time} ago")
+        expect(I18n.t("tags.show.follow")).to eq("Follow #%{tag}")
       end
       it "raises a MissingInterpolationArgument when arguments are wrong" do
-        expect { I18n.t('ago', :not_time => "2 months") }.to raise_exception(I18n::MissingInterpolationArgument)
+        expect { I18n.t("tags.show.follow", not_tag: "cats") }.to raise_exception(I18n::MissingInterpolationArgument)
       end
     end
     context "current locale falls back to English" do