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

Revert "Genderize#translate fixed and enhanced (now it accepts User objects to fix the gender)."

Browse source 
This reverts commit eb2d186a12.
This commit is contained in:
Sarah Mei 2010-12-01 22:29:27 -08:00
parent 967fcd9a52
commit d5c32b6a56
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/initializers/locale.rb
View file

@ -53,10 +53,10 @@ module I18n
module Genderize
def translate(locale, key, options = {})
subkey = options.delete(:gender)
if not (subkey.nil? || key.is_a?(Enumerable))
subkey = subkey.grammatical_gender if subkey.respond_to?(:grammatical_gender)
subkey = Genders.default unless Genders.has_key?(subkey.to_sym)
g = options.delete(:gender)
if not (g.nil? || key.is_a?(Enumerable))
g = g.to_sym
subkey = Genders[g.to_sym]
key = "#{key}.#{subkey}".to_sym
end
super(locale, key, options)

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

@ -165,10 +165,7 @@ en:
helper:
remove: "remove"
aspect_not_empty: "Aspect not empty"
are_you_sure:
masculine: "Are you sure you want to delete this aspect?"
feminine: "Are you sure you want to delete this aspect?"
neuter: "Are you sure you want to delete this aspect?"
are_you_sure: "Are you sure you want to delete this aspect?"
remove_from_aspect:
success: "Successfully removed person from aspect"
failure: "Failed to remove person from aspect"