Updating morechoice addon to reflect changes in core

diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php
index 15cee0d159075e121646000e4a218d431655b8fd..3ab7eac16e66c1630032965afa5c6ba82ad72670 100644 (file)
--- a/morechoice/morechoice.php
+++ b/morechoice/morechoice.php
@@ -32,90 +32,90 @@ function morechoice_uninstall() {
 }
 
 function morechoice_gender_selector($a,&$b) {
-       $b[] = L10n::t('Androgyne');
-       $b[] = L10n::t('Bear');
-       $b[] = L10n::t('Bigender');
-       $b[] = L10n::t('Cross dresser');
-       $b[] = L10n::t('Drag queen');
-       $b[] = L10n::t('Eunuch');
-       $b[] = L10n::t('Faux queen');
-       $b[] = L10n::t('Gender fluid');
-       $b[] = L10n::t('Kathoey');
-       $b[] = L10n::t('Lady');
-       $b[] = L10n::t('Lipstick lesbian');
-       $b[] = L10n::t('Metrosexual');
-       $b[] = L10n::t('Monk');
-       $b[] = L10n::t('Nun');
-       $b[] = L10n::t('Soft butch');
-       $b[] = L10n::t('Stone femme');
-       $b[] = L10n::t('Tomboy');
-       $b[] = L10n::t('Transman');
-       $b[] = L10n::t('Transwoman');
-       $b[] = L10n::t('Transvesti');
-       $b[] = L10n::t('Trigender');
-       $b[] = L10n::t('Can\'t remember');
-       $b[] = L10n::t('Hard to tell these days');
+       $b['Androgyne'] = L10n::t('Androgyne');
+       $b['Bear'] = L10n::t('Bear');
+       $b['Bigender'] = L10n::t('Bigender');
+       $b['Cross dresser'] = L10n::t('Cross dresser');
+       $b['Drag queen'] = L10n::t('Drag queen');
+       $b['Eunuch'] = L10n::t('Eunuch');
+       $b['Faux queen'] = L10n::t('Faux queen');
+       $b['Gender fluid'] = L10n::t('Gender fluid');
+       $b['Kathoey'] = L10n::t('Kathoey');
+       $b['Lady'] = L10n::t('Lady');
+       $b['Lipstick lesbian'] = L10n::t('Lipstick lesbian');
+       $b['Metrosexual'] = L10n::t('Metrosexual');
+       $b['Monk'] = L10n::t('Monk');
+       $b['Nun'] = L10n::t('Nun');
+       $b['Soft butch'] = L10n::t('Soft butch');
+       $b['Stone femme'] = L10n::t('Stone femme');
+       $b['Tomboy'] = L10n::t('Tomboy');
+       $b['Transman'] = L10n::t('Transman');
+       $b['Transwoman'] = L10n::t('Transwoman');
+       $b['Transvesti'] = L10n::t('Transvesti');
+       $b['Trigender'] = L10n::t('Trigender');
+       $b['Can\'t remember'] = L10n::t('Can\'t remember');
+       $b['Hard to tell these days'] = L10n::t('Hard to tell these days');
 }
 
 function morechoice_sexpref_selector($a,&$b) {
-       $b[] = L10n::t('Girls with big tits');
-       $b[] = L10n::t('Millionaires');
-       $b[] = L10n::t('Guys with big schlongs');
-       $b[] = L10n::t('Easy women');
-       $b[] = L10n::t('People with impaired mobility');
-       $b[] = L10n::t('Amputees');
-       $b[] = L10n::t('Statues, mannequins and immobility');
-       $b[] = L10n::t('Pain');
-       $b[] = L10n::t('Trans men');
-       $b[] = L10n::t('Older women');
-       $b[] = L10n::t('Asphyxiation');
-       $b[] = L10n::t('In public');
-       $b[] = L10n::t('In danger');
-       $b[] = L10n::t('Pretending to be male');
-       $b[] = L10n::t('Pretending to be female');
-       $b[] = L10n::t('Breats');
-       $b[] = L10n::t('Scat');
-       $b[] = L10n::t('Crying');
-       $b[] = L10n::t('Nappies/Diapers');
-       $b[] = L10n::t('Trees');
-       $b[] = L10n::t('Vomit');
-       $b[] = L10n::t('Murder');
-       $b[] = L10n::t('Fat people');
-       $b[] = L10n::t('Feet');
-       $b[] = L10n::t('Covered in insects');
-       $b[] = L10n::t('Turning a human being into furniture');
-       $b[] = L10n::t('Elderly people');
-       $b[] = L10n::t('Transgender people');
-       $b[] = L10n::t('Criminals');
-       $b[] = L10n::t('Stealing');
-       $b[] = L10n::t('Breast milk');
-       $b[] = L10n::t('Immersing genitals in liquids');
-       $b[] = L10n::t('Giants');
-       $b[] = L10n::t('Masochism');
-       $b[] = L10n::t('Cars');
-       $b[] = L10n::t('Menstruation');
-       $b[] = L10n::t('Mucus');
-       $b[] = L10n::t('Obscene language');
-       $b[] = L10n::t('Noses');
-       $b[] = L10n::t('Navels');
-       $b[] = L10n::t('Corpses');
-       $b[] = L10n::t('Smells');
-       $b[] = L10n::t('Buttocks');
-       $b[] = L10n::t('Nonliving objects');
-       $b[] = L10n::t('Sleeping people');
-       $b[] = L10n::t('Urination');
-       $b[] = L10n::t('Eating people');
-       $b[] = L10n::t('Being eaten');
-       $b[] = L10n::t('Animals');
-       $b[] = L10n::t('I\'d rather just have some chocolate');
+       $b['Girls with big tits'] = L10n::t('Girls with big tits');
+       $b['Millionaires'] = L10n::t('Millionaires');
+       $b['Guys with big schlongs'] = L10n::t('Guys with big schlongs');
+       $b['Easy women'] = L10n::t('Easy women');
+       $b['People with impaired mobility'] = L10n::t('People with impaired mobility');
+       $b['Amputees'] = L10n::t('Amputees');
+       $b['Statues, mannequins and immobility'] = L10n::t('Statues, mannequins and immobility');
+       $b['Pain'] = L10n::t('Pain');
+       $b['Trans men'] = L10n::t('Trans men');
+       $b['Older women'] = L10n::t('Older women');
+       $b['Asphyxiation'] = L10n::t('Asphyxiation');
+       $b['In public'] = L10n::t('In public');
+       $b['In danger'] = L10n::t('In danger');
+       $b['Pretending to be male'] = L10n::t('Pretending to be male');
+       $b['Pretending to be female'] = L10n::t('Pretending to be female');
+       $b['Breats'] = L10n::t('Breats');
+       $b['Scat'] = L10n::t('Scat');
+       $b['Crying'] = L10n::t('Crying');
+       $b['Nappies/Diapers'] = L10n::t('Nappies/Diapers');
+       $b['Trees'] = L10n::t('Trees');
+       $b['Vomit'] = L10n::t('Vomit');
+       $b['Murder'] = L10n::t('Murder');
+       $b['Fat people'] = L10n::t('Fat people');
+       $b['Feet'] = L10n::t('Feet');
+       $b['Covered in insects'] = L10n::t('Covered in insects');
+       $b['Turning a human being into furniture'] = L10n::t('Turning a human being into furniture');
+       $b['Elderly people'] = L10n::t('Elderly people');
+       $b['Transgender people'] = L10n::t('Transgender people');
+       $b['Criminals'] = L10n::t('Criminals');
+       $b['Stealing'] = L10n::t('Stealing');
+       $b['Breast milk'] = L10n::t('Breast milk');
+       $b['Immersing genitals in liquids'] = L10n::t('Immersing genitals in liquids');
+       $b['Giants'] = L10n::t('Giants');
+       $b['Masochism'] = L10n::t('Masochism');
+       $b['Cars'] = L10n::t('Cars');
+       $b['Menstruation'] = L10n::t('Menstruation');
+       $b['Mucus'] = L10n::t('Mucus');
+       $b['Obscene language'] = L10n::t('Obscene language');
+       $b['Noses'] = L10n::t('Noses');
+       $b['Navels'] = L10n::t('Navels');
+       $b['Corpses'] = L10n::t('Corpses');
+       $b['Smells'] = L10n::t('Smells');
+       $b['Buttocks'] = L10n::t('Buttocks');
+       $b['Nonliving objects'] = L10n::t('Nonliving objects');
+       $b['Sleeping people'] = L10n::t('Sleeping people');
+       $b['Urination'] = L10n::t('Urination');
+       $b['Eating people'] = L10n::t('Eating people');
+       $b['Being eaten'] = L10n::t('Being eaten');
+       $b['Animals'] = L10n::t('Animals');
+       $b['I\'d rather just have some chocolate'] = L10n::t('I\'d rather just have some chocolate');
 }
 
 function morechoice_marital_selector($a,&$b) {
-       $b[] = L10n::t('Married to my job');
-       $b[] = L10n::t('Polygamist');
-       $b[] = L10n::t('Half married');
-       $b[] = L10n::t('Living in the past');
-       $b[] = L10n::t('Pretending to be over my ex');
-       $b[] = L10n::t('Hurt in the past');
-       $b[] = L10n::t('Wallowing in self-pity');
+       $b['Married to my job'] = L10n::t('Married to my job');
+       $b['Polygamist'] = L10n::t('Polygamist');
+       $b['Half married'] = L10n::t('Half married');
+       $b['Living in the past'] = L10n::t('Living in the past');
+       $b['Pretending to be over my ex'] = L10n::t('Pretending to be over my ex');
+       $b['Hurt in the past'] = L10n::t('Hurt in the past');
+       $b['Wallowing in self-pity'] = L10n::t('Wallowing in self-pity');
 }