Unscoped 'contacts' and 'new_requests' translation keys and modified en.yml accordingly.
This commit is contained in:
parent
e1a965c2fb
commit
8138473b91
3 changed files with 14 additions and 9 deletions
|
|
@ -7,7 +7,7 @@
|
||||||
= @aspect
|
= @aspect
|
||||||
|
|
||||||
%span.aspect_contact_count{:style=>"color:#999;font-size:14px;"}
|
%span.aspect_contact_count{:style=>"color:#999;font-size:14px;"}
|
||||||
= t('.contacts', :count=>@aspect_contacts.count)
|
= t('contacts', :count=>@aspect_contacts.count)
|
||||||
= link_to t('.edit_aspect'), "#", :id => "edit_aspect_trigger"
|
= link_to t('.edit_aspect'), "#", :id => "edit_aspect_trigger"
|
||||||
|
|
||||||
.span-8.append-1
|
.span-8.append-1
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@
|
||||||
- if (aspect == :all) && @request_count > 0
|
- if (aspect == :all) && @request_count > 0
|
||||||
#new_request_pane{:class => "everyone"}
|
#new_request_pane{:class => "everyone"}
|
||||||
%h1.new_request{:style => 'text-align:center'}
|
%h1.new_request{:style => 'text-align:center'}
|
||||||
= link_to t('.new_requests', :count => @request_count), aspects_manage_path
|
= link_to t('new_requests', :count => @request_count), aspects_manage_path
|
||||||
|
|
||||||
#left_pane{:class => ("everyone" if aspect == :all)}
|
#left_pane{:class => ("everyone" if aspect == :all)}
|
||||||
- if aspect == :all
|
- if aspect == :all
|
||||||
|
|
@ -96,7 +96,7 @@
|
||||||
%h4.aspect_title_right{:style => "margin-bottom:0;"}
|
%h4.aspect_title_right{:style => "margin-bottom:0;"}
|
||||||
= link_to user_aspect, user_aspect
|
= link_to user_aspect, user_aspect
|
||||||
%span{:style=>"font-size:12px;color:#888;"}
|
%span{:style=>"font-size:12px;color:#888;"}
|
||||||
= t('.contacts', :count=>user_aspect.contacts.count)
|
= t('contacts', :count=>user_aspect.contacts.count)
|
||||||
|
|
||||||
- if user_aspect.contacts.count > 0
|
- if user_aspect.contacts.count > 0
|
||||||
- for aspect_contact in user_aspect.contacts[0..8]
|
- for aspect_contact in user_aspect.contacts[0..8]
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,17 @@ en:
|
||||||
search: "Search"
|
search: "Search"
|
||||||
_home: "Home"
|
_home: "Home"
|
||||||
_comments: "Comments"
|
_comments: "Comments"
|
||||||
|
contacts:
|
||||||
|
zero: "no contacts"
|
||||||
|
one: "1 contact"
|
||||||
|
few: "%{count} contacts"
|
||||||
|
other: "%{count} contacts"
|
||||||
|
new_requests:
|
||||||
|
zero: "no new requests"
|
||||||
|
one: "new request!"
|
||||||
|
few: "%{count} new requests!"
|
||||||
|
other: "%{count} new requests!"
|
||||||
|
|
||||||
activemodel:
|
activemodel:
|
||||||
errors:
|
errors:
|
||||||
models:
|
models:
|
||||||
|
|
@ -80,11 +90,8 @@ en:
|
||||||
aspect_contacts:
|
aspect_contacts:
|
||||||
add_to: "add to %{aspect}"
|
add_to: "add to %{aspect}"
|
||||||
done_editing: "done editing"
|
done_editing: "done editing"
|
||||||
new_requests: "%{count} new requests!"
|
|
||||||
new_request: "%{count} new request!"
|
|
||||||
add_existing: "Add an existing contact"
|
add_existing: "Add an existing contact"
|
||||||
aspect_settings: "Aspect settings"
|
aspect_settings: "Aspect settings"
|
||||||
contacts: "contacts"
|
|
||||||
remove_aspect: "Remove Aspect"
|
remove_aspect: "Remove Aspect"
|
||||||
confirm_remove_aspect: "Remove aspect?"
|
confirm_remove_aspect: "Remove aspect?"
|
||||||
no_contacts: "You currently have no contacts. Find your contacts here."
|
no_contacts: "You currently have no contacts. Find your contacts here."
|
||||||
|
|
@ -117,8 +124,6 @@ en:
|
||||||
aspects:
|
aspects:
|
||||||
show:
|
show:
|
||||||
edit_aspect: "edit aspect"
|
edit_aspect: "edit aspect"
|
||||||
contact: "contact"
|
|
||||||
contacts: "contacts"
|
|
||||||
no_contacts_message:
|
no_contacts_message:
|
||||||
nobody: "Bring the people that matter in your life to Diaspora!"
|
nobody: "Bring the people that matter in your life to Diaspora!"
|
||||||
nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
|
nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue