Skip to content
Extraits de code Groupes Projets
Valider a09f299c rédigé par Sarah Mei's avatar Sarah Mei
Parcourir les fichiers

Revert "Added translation scaffold for inflection of nouns by grammatical...

Revert "Added translation scaffold for inflection of nouns by grammatical gender in some languages."

This reverts commit 65c79657.
parent d5c32b6a
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -10,7 +10,7 @@ module LanguageHelper ...@@ -10,7 +10,7 @@ module LanguageHelper
def options_for_gender_select(user) def options_for_gender_select(user)
grammatical_gender = user.grammatical_gender grammatical_gender = user.grammatical_gender
genders_list = I18n::Backend::Genderize.known_genders.map do |gender| genders_list = I18n::Backend::Genderize.known_genders.map do |gender|
[t(".#{gender}"), gender] [t("#{gender}"), gender]
end end
if grammatical_gender.blank? if grammatical_gender.blank?
grammatical_gender = I18n::Backend::Genderize.guess(user.profile.gender) grammatical_gender = I18n::Backend::Genderize.guess(user.profile.gender)
......
...@@ -21,10 +21,7 @@ en: ...@@ -21,10 +21,7 @@ en:
email: "Email" email: "Email"
password: "Password" password: "Password"
password_confirmation: "Password confirmation" password_confirmation: "Password confirmation"
are_you_sure: are_you_sure: "Are you sure?"
masculine: "Are you sure?"
feminine: "Are you sure?"
neuter: "Are you sure?"
fill_me_out: "Fill me out" fill_me_out: "Fill me out"
back: "Back" back: "Back"
the_world: "the world" the_world: "the world"
...@@ -106,10 +103,7 @@ en: ...@@ -106,10 +103,7 @@ en:
your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}" your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
create_request: "Find by Diaspora handle" create_request: "Find by Diaspora handle"
diaspora_handle: "diaspora@handle.org" diaspora_handle: "diaspora@handle.org"
know_email: know_email: "Know their email address? You should invite them"
masculine: "Know their email address? You should invite them"
feminine: "Know their email address? You should invite them"
neuter: "Know their email address? You should invite them"
invitations: invitations:
invite_someone: "Invite someone" invite_someone: "Invite someone"
invitations_left: "(%{count} left)" invitations_left: "(%{count} left)"
...@@ -189,10 +183,6 @@ en: ...@@ -189,10 +183,6 @@ en:
download_photos: "download my photos" download_photos: "download my photos"
your_handle: "Your diaspora handle" your_handle: "Your diaspora handle"
your_email: "Your email" your_email: "Your email"
address_me_as: "Address me as"
masculine: "a man"
feminine: "a woman"
neuter: "a neuter"
destroy: "Account successfully closed." destroy: "Account successfully closed."
getting_started: getting_started:
welcome: "Welcome to Diaspora!" welcome: "Welcome to Diaspora!"
...@@ -251,18 +241,9 @@ en: ...@@ -251,18 +241,9 @@ en:
back_to_list: "Back to List" back_to_list: "Back to List"
post_it: "post it!" post_it: "post it!"
create: create:
runtime_error: runtime_error: "Photo upload failed. Are you sure that your seatbelt is fastened?"
masculine: "Photo upload failed. Are you sure that your seatbelt is fastened?" integrity_error: "Photo upload failed. Are you sure that was an image?"
feminine: "Photo upload failed. Are you sure that your seatbelt is fastened?" type_error: "Photo upload failed. Are you sure an image was added?"
neuter: "Photo upload failed. Are you sure that your seatbelt is fastened?"
integrity_error:
masculine: "Photo upload failed. Are you sure that was an image?"
feminine: "Photo upload failed. Are you sure that was an image?"
neuter: "Photo upload failed. Are you sure that was an image?"
type_error:
masculine: "Photo upload failed. Are you sure an image was added?"
feminine: "Photo upload failed. Are you sure an image was added?"
neuter: "Photo upload failed. Are you sure an image was added?"
update: update:
notice: "Photo successfully updated." notice: "Photo successfully updated."
error: "Failed to edit photo." error: "Failed to edit photo."
...@@ -291,20 +272,11 @@ en: ...@@ -291,20 +272,11 @@ en:
sent: "Invitations have been sent to: " sent: "Invitations have been sent to: "
rejected: "The following email addresses had problems: " rejected: "The following email addresses had problems: "
no_more: "You have no more invitations." no_more: "You have no more invitations."
already_sent: already_sent: "You already invited this person."
masculine: "You already invited this person." already_contacts: "You are already connected with this person"
feminine: "You already invited this person."
neuter: "You already invited this person."
already_contacts:
masculine: "You are already connected with this person."
feminine: "You are already connected with this person."
neuter: "You are already connected with this person."
new: new:
invite_someone_to_join: "Invite someone to join Diaspora!" invite_someone_to_join: "Invite someone to join Diaspora!"
if_they_accept_info: if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
masculine: "if they accept, they will be added to the aspect you invited them."
feminine: "if they accept, they will be added to the aspect you invited them."
neuter: "if they accept, they will be added to the aspect you invited them."
comma_seperated_plz: "You can enter multiple email addresses separated by commas." comma_seperated_plz: "You can enter multiple email addresses separated by commas."
to: "To" to: "To"
message: "Message:" message: "Message:"
...@@ -335,16 +307,10 @@ en: ...@@ -335,16 +307,10 @@ en:
incoming_request: "You have an incoming request from this person." incoming_request: "You have an incoming request from this person."
return_to_aspects: "Return to your aspects page" return_to_aspects: "Return to your aspects page"
to_accept_or_ignore: "to accept or ignore it." to_accept_or_ignore: "to accept or ignore it."
request_people: "If you'd like, you can request to place him in one of your aspects." request_people: "If you'd like, you can request to place him/her in one of your aspects."
already_requested: already_requested: "You have already sent a request to %{name}."
masculine: "You have already sent a request to %{name}."
feminine: "You have already sent a request to %{name}."
neuter: "You have already sent a request to %{name}."
does_not_exist: "Person does not exist!" does_not_exist: "Person does not exist!"
not_connected: not_connected: "You are not connected with this person"
masculine: "You are not connected with this person"
feminine: "You are not connected with this person"
neuter: "You are not connected with this person"
edit: edit:
info_available_to: "This info will be available to whomever you connect with on Diaspora." info_available_to: "This info will be available to whomever you connect with on Diaspora."
your_profile: "Your profile" your_profile: "Your profile"
...@@ -384,10 +350,7 @@ en: ...@@ -384,10 +350,7 @@ en:
ignore: "Ignored contact request." ignore: "Ignored contact request."
create: create:
sending: "Sending" sending: "Sending"
sent: sent: "You've asked to share with %{name}. They should see it next time they log in to Diaspora."
masculine: "You've asked to share with %{name}. They should see it next time they log in to Diaspora."
feminine: "You've asked to share with %{name}. They should see it next time they log in to Diaspora."
neuter: "You've asked to share with %{name}. They should see it next time they log in to Diaspora."
new_request_to_person: new_request_to_person:
sent: "sent!" sent: "sent!"
services: services:
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter