Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / include / profile_selectors.php

diff --git a/include/profile_selectors.php b/include/profile_selectors.php
old mode 100755 (executable)
new mode 100644 (file)
index 92579f6..4700bb9
--- a/include/profile_selectors.php
+++ b/include/profile_selectors.php
@@ -7,8 +7,10 @@ function gender_selector($current="",$suffix="") {
 
        $o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
        foreach($select as $selection) {
-               $selected = (($selection == $current) ? ' selected="selected" ' : '');
-               $o .= "<option value=\"$selection\" $selected >$selection</option>";
+               if($selection !== 'NOTRANSLATION') {
+                       $selected = (($selection == $current) ? ' selected="selected" ' : '');
+                       $o .= "<option value=\"$selection\" $selected >$selection</option>";
+               }
        }
        $o .= '</select>';
        return $o;
@@ -20,8 +22,10 @@ function sexpref_selector($current="",$suffix="") {
 
        $o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
        foreach($select as $selection) {
-               $selected = (($selection == $current) ? ' selected="selected" ' : '');
-               $o .= "<option value=\"$selection\" $selected >$selection</option>";
+               if($selection !== 'NOTRANSLATION') {
+                       $selected = (($selection == $current) ? ' selected="selected" ' : '');
+                       $o .= "<option value=\"$selection\" $selected >$selection</option>";
+               }
        }
        $o .= '</select>';
        return $o;
@@ -30,12 +34,14 @@ function sexpref_selector($current="",$suffix="") {
 
 function marital_selector($current="",$suffix="") {
        $o = '';
-       $select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Partners'), t('Cohabiting'), t('Happy'), t('Not Looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Widowed'), t('Uncertain'), t('Complicated'), t('Don\'t care'), t('Ask me') );
+       $select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Has crush'), t('Infatuated'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Imaginarily married'), t('Partners'), t('Cohabiting'), t('Common law'), t('Happy'), t('Not looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Imaginarily divorced'), t('Widowed'), t('Uncertain'), t('It\'s complicated'), t('Don\'t care'), t('Ask me') );
 
        $o .= "<select name=\"marital\" id=\"marital-select\" size=\"1\" >";
        foreach($select as $selection) {
-               $selected = (($selection == $current) ? ' selected="selected" ' : '');
-               $o .= "<option value=\"$selection\" $selected >$selection</option>";
+               if($selection !== 'NOTRANSLATION') {
+                       $selected = (($selection == $current) ? ' selected="selected" ' : '');
+                       $o .= "<option value=\"$selection\" $selected >$selection</option>";
+               }
        }
        $o .= '</select>';
        return $o;