nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'more-translatable' of https://github.com/MrZYX/diaspora into MrZYX-more-translatable

Browse source
This commit is contained in:
Hexagon 2010-11-19 22:04:39 +01:00
commit d6695501f7
13 changed files with 79 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/aspects/_new_aspect.haml
View file

@ -4,7 +4,7 @@
.span-12.last
.modal_title_bar
%h4= t('.add_a_new_aspect')
%h4= t('aspects.manage.add_a_new_aspect')
= form_for Aspect.new do |aspect|
= aspect.error_messages

6
app/views/home/show.html.haml
View file

@ -8,14 +8,14 @@
#diaspora_description.section
%p
Share what you want, with who you want.
= t('.share_what_you_want')
#signup_field.section
= render 'shared/mail_signup_form'
#login_field.section
already have an account?
= link_to "log in here", new_user_session_path
= t('.already_account')
= link_to t('.login_here'), new_user_session_path
.span-24.last{:style=>"text-align:center;"}
%ul#press_logos

2
app/views/invitations/_new.haml
View file

@ -14,7 +14,7 @@
= invite.select(:aspects, @aspects_dropdown_array)
- else
= invite.select(:aspects, @aspects_dropdown_array, :selected => @aspect.id)
%br
= t('.message')
= invite.text_area :invite_messages, :value => ""

6
app/views/layouts/_header.html.haml
View file

@ -11,9 +11,9 @@
- unless current_user
.right
%ul#landing_nav
%li= link_to "blog", "http://blog.joindiaspora.com"
%li= link_to "developers", "https://github.com/diaspora/diaspora"
%li= link_to "login", new_user_session_path
%li= link_to t('.blog'), "http://blog.joindiaspora.com"
%li= link_to t('.developers'), "https://github.com/diaspora/diaspora"
%li= link_to t('.login'), new_user_session_path
- else
#global_search
= form_tag(people_path, :method => 'get') do

6
app/views/layouts/application.html.haml
View file

@ -76,10 +76,10 @@
%footer
.container
.brandon POWERED BY DIASPORA*
.brandon= t('.powered_by')
%ul#footer_nav
%li= link_to "blog", "http://blog.joindiaspora.com"
%li= link_to "developers", "https://github.com/diaspora/diaspora"
%li= link_to t('layouts.header.blog'), "http://blog.joindiaspora.com"
%li= link_to t('layouts.header.developers'), "https://github.com/diaspora/diaspora"
:javascript
var is_ssl = ("https:" == document.location.protocol);

2
app/views/people/_profile_sidebar.html.haml
View file

@ -16,7 +16,7 @@
- if is_contact
%li
%ul#aspects_for_person
%b in aspects
%b= t('.in_aspects')
%br
- for aspect in @aspects_with_person
%li= link_to aspect.name, aspect

19
app/views/photos/_new_photo.haml
View file

@ -8,7 +8,24 @@
element: document.getElementById('file-upload'),
params: {'photo' : { 'to' : "#{aspect_id}"}, 'set_profile_image' : "#{set_profile_image if defined?(set_profile_image)}"},
allowedExtensions: ['jpg', 'jpeg', 'png', 'gif'],
action: "#{photos_path}"
action: "#{photos_path}",
template: '<div class="qq-uploader">' +
'<div class="qq-upload-drop-area"><span>#{t('.drop')}</span></div>' +
'<div class="qq-upload-button">#{t('.upload')}</div>' +
'<ul class="qq-upload-list"></ul>' +
'</div>',
fileTemplate: '<li>' +
'<span class="qq-upload-file"></span>' +
'<span class="qq-upload-spinner"></span>' +
'<span class="qq-upload-size"></span>' +
'<a class="qq-upload-cancel" href="#">#{t('cancel')}</a>' +
'<span class="qq-upload-failed-text">#{t('.failed')}</span>' +
'</li>',
messages: {
typeError: "#{t('.invalid_ext')}",
sizeError: "#{t('.size_error')}",
emptyError: "#{t('.empty')}"
}
});
}
window.onload = createUploader;

8
app/views/requests/_manage_aspect_contacts.haml
View file

@ -5,14 +5,14 @@
.span-15.last
.modal_title_bar
%h4
Manage contacts within
= t('.manage_within')
%i= aspect.name
.span-6.append-1.last
%h3 Existing contacts
%h3= t('.existing')
= render 'shared/contact_list', :aspect => aspect, :contacts => @contacts, :manage => defined?(manage)
.span-7.last
%h3 Add a new contact
%h3= t('aspects.manage.add_a_new_contact')
= form_tag(person_by_handle_path, :id => "new_request_to_#{aspect.id}", :class => "webfinger_form", :remote => true) do
=t('.enter_a_diaspora_username')
%br
@ -34,7 +34,7 @@
%ul#request_result{:aspect_id => aspect.id}
%li.error.hidden
#message
= link_to "Know their email address? You should invite them", "#invite_user_pane", :class => "invite_user_button"
= link_to t('.know_email'), "#invite_user_pane", :class => "invite_user_button"
%br
.yo{ :style => "display:none;"}
#invite_user_pane

2
app/views/shared/_aspect_contacts.haml
View file

@ -13,7 +13,7 @@
= person_image_link(contact.person)
-unless (aspect == :all)
= link_to (image_tag('add_contact_button.png', :title => "manage #{@aspect}")), "#manage_aspect_contacts_pane", :class => 'manage_aspect_contacts_button'
= link_to (image_tag('add_contact_button.png', :title => t('.manage', :aspect => @aspect))), "#manage_aspect_contacts_pane", :class => 'manage_aspect_contacts_button'
.fancybox_content
#manage_aspect_contacts_pane

9
app/views/shared/_author_info.html.haml
View file

@ -16,4 +16,11 @@
= link_to t('.view_profile'), person_path(person)
= link_to t('_photos'), person_photos_path(person)
= link_to t('.status_messages'), person_status_messages_path(person)
= "#{t('.viewing')}: #{@post_type.to_s.titleize}" if defined?(@post_type)
- if defined?(@post_type)
- case @post_type
- when :all
= "#{t('.viewing')}: #{t('.all')}"
- when :photos
= "#{t('.viewing')}: #{t('_photos')}"
- when :status_messages
= "#{t('.viewing')}: #{t('.status_messages')}"

6
app/views/shared/_contact_list.html.haml
View file

@ -23,7 +23,7 @@
.contact_list
= search_field_tag :contact_search, "", :class => 'contact_list_search', :results => 5, :placeholder => "Search contacts"
= search_field_tag :contact_search, "", :class => 'contact_list_search', :results => 5, :placeholder => t('.search_contacts')
%ul
- for contact in contacts
@ -38,7 +38,7 @@
= hidden_field_tag :person_id, contact.person.id
- if defined?(manage) && manage
= hidden_field_tag :manage, true
= submit_tag '+', :class => 'add', :title => "Add #{contact.person.real_name} to #{aspect}"
= submit_tag '+', :class => 'add', :title => t('.add_to', :name => contact.person.real_name, :aspect => aspect)
- else
= form_tag '/aspects/remove_from_aspect' do
= person_image_tag contact.person
@ -49,5 +49,5 @@
= hidden_field_tag :person_id, contact.person.id
- if defined?(manage) && manage
= hidden_field_tag :manage, true
= submit_tag 'x', :class => 'remove', :title => "Remove #{contact.person.real_name} from #{aspect}"
= submit_tag 'x', :class => 'remove', :title => t('.remove_from', :name => contact.person.real_name, :aspect => aspect)

8
app/views/users/getting_started/_step_4.html.haml
View file

@ -23,17 +23,17 @@
%p
= t('.change_profile')
%b #{t('.edit_profile')}
%b #{t('layouts.header.edit_profile')}
= t('.user_menu')
%p
= t('.connect_disconnect')
%b #{t('.edit_account')}
%b #{t('layouts.header.account_settings')}
= t('.user_menu')
%p
= t('.manage_aspects')
%b #{t('.manage')}
%b #{t('shared.aspect_nav.manage')}
= t('.tab_also_added')
.submit_block
= link_to "Finish →", root_url, :class => "button"
= link_to "#{t('.finish')} →", root_url, :class => "button"

36
config/locales/diaspora/en.yml
View file

@ -57,6 +57,11 @@ en:
edit_profile: "edit profile"
account_settings: "account settings"
logout: "logout"
blog: "blog"
developers: "developers"
login: "login"
application:
powered_by: "POWERED BY DIASPORA*"
shared:
stream_element:
show_comments: "show comments"
@ -77,6 +82,7 @@ en:
add_contacts: "add contacts"
everyone: "Everyone"
add_to: "add to %{aspect}"
manage: "manage %{aspect}"
invitations:
invites: "Invites"
invite_someone: "Invite someone"
@ -87,6 +93,7 @@ en:
view_profile: "View profile"
status_messages: "status messages"
viewing: "viewing"
all: "all"
public_explain:
title: "You are about to post a public message!"
outside: "Public messages will be available for others outside of Diaspora to see."
@ -94,6 +101,10 @@ en:
manage: "manage connected services"
notification:
new: "New %{type} from %{from}"
contact_list:
search_contacts: "Search contacts"
add_to: "Add %{name} to %{aspect}"
remove_from: "Remove %{name} from %{aspect}"
aspects:
no_contacts_message:
nobody: "We know you know people — bring them to Diaspora!"
@ -111,7 +122,6 @@ en:
manage_aspects: "Manage aspects"
drag_to_add: "Drag to add people"
new_aspect:
add_a_new_aspect: "Add a new aspect"
name: "Name"
create: "Create"
create:
@ -169,13 +179,11 @@ en:
ready_to_share: "You're now ready to start sharing with "
continue: "Continue on to your everyone page, an overview of all of your aspects."
change_profile: "You can change your profile any time by clicking"
edit_profile: "edit profile"
user_menu: "in your user menu (top right)."
connect_disconnect: "You can connect/disconnect your services any time by clicking"
edit_account: "edit account"
manage_aspects: "You can manage your aspects any time by clicking the"
manage: "manage"
tab_also_added: "tab. Your contacts can also be added while on a particular aspect page, as well."
finish: "Finish"
update:
password_changed: "Password Changed"
password_not_changed: "Password Change Failed"
@ -214,6 +222,13 @@ en:
error: "Failed to edit photo."
destroy:
notice: "Photo deleted."
new_photo:
drop: "Drop photos here to upload"
upload: "Upload a photo"
failed: "Failed"
invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
size_error: "{file} is too large, maximum file size is {sizeLimit}."
empty: "{file} is empty, please select files again without it."
registrations:
new:
sign_up: "Sign up"
@ -233,7 +248,7 @@ en:
sent: "Your invitation has been sent."
no_more: "You have no more invitations."
already_sent: "You already invited this person."
already_friends: "You are already friends with this person"
already_contacts: "You are already connected with this person"
new:
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"
@ -261,7 +276,6 @@ en:
results_for: "search results for"
show:
no_posts: "no posts to display!"
not_friends: "You're currently not friends with %{name}"
request_people: "If you'd like, you can request to place him/her in one of your aspects."
already_requested: "You have already sent a request to %{name}."
does_not_exist: "Person does not exist!"
@ -290,16 +304,19 @@ en:
bio: "bio"
gender: "gender"
born: "born"
in_aspects: "in aspects"
helper:
results_for: " results for %{params}"
people_on_pod_are_aware_of: " people on pod are aware of"
requests:
manage_aspect_contacts:
add_a_new_contact_to: "Add a new contact to"
enter_a_diaspora_username: "Enter a Diaspora username:"
your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
contact_username: "Contact's username"
create_request: "Create request"
manage_within: "Manage contacts within"
existing: "Existing contacts"
know_email: "Know their email address? You should invite them"
destroy:
success: "You are now friends."
error: "Please select an aspect!"
@ -335,3 +352,8 @@ en:
subject: "%{name} has accepted your contact request on Diaspora*"
accepted: "has accepted your contact request. They are now in your"
aspect: "aspect."
home:
show:
share_what_you_want: "Share what you want, with who you want."
already_account: "already have an account?"
login_here: "log in here"