jff

OpenVK · Nov 12, 2023 · 6794d64 · 6794d64
1 parent 784b19a
commit 6794d64
Show file tree

Hide file tree

Showing 24 changed files with 68 additions and 22 deletions.
diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php
@@ -783,7 +783,29 @@ function getNsfwTolerance(): int
 
     function isFemale(): bool
     {
-        return (bool) $this->getRecord()->sex;
+        return (bool) $this->getRecord()->sex == 1;
+    }
+
+    function isNeutral(): bool
+    {
+        return (bool) $this->getRecord()->sex == 2;
+    }
+
+    function getLocalizedPronouns(): string
+    {
+        switch ($this->getRecord()->sex) {
+            case 0:
+                return tr('male');
+            case 1:
+                return tr('female');
+            case 2:
+                return tr('neutral');
+        }
+    }
+
+    function getPronouns(): int
+    {
+        return $this->getRecord()->sex;
     }
 
     function isVerified(): bool

diff --git a/Web/Presenters/AuthPresenter.php b/Web/Presenters/AuthPresenter.php
@@ -95,7 +95,17 @@ function renderRegister(): void
                 $user = new User;
                 $user->setFirst_Name($this->postParam("first_name"));
                 $user->setLast_Name($this->postParam("last_name"));
-                $user->setSex((int)($this->postParam("sex") === "female"));
+                switch ($this->postParam("pronouns")) {
+                    case 'male':
+                        $user->setSex(0);
+                        break;
+                    case 'female':
+                        $user->setSex(1);
+                        break;
+                    case 'neutral':
+                        $user->setSex(2);
+                        break;
+                }
                 $user->setEmail($this->postParam("email"));
                 $user->setSince(date("Y-m-d H:i:s"));
                 $user->setRegistering_Ip(CONNECTING_IP);

diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php
@@ -170,8 +170,18 @@ function renderEdit(): void
                 if ($this->postParam("politViews") <= 9 && $this->postParam("politViews") >= 0)
                 $user->setPolit_Views($this->postParam("politViews"));
 
-                if ($this->postParam("gender") <= 1 && $this->postParam("gender") >= 0)
-                $user->setSex($this->postParam("gender"));
+                if ($this->postParam("pronouns") <= 2 && $this->postParam("pronouns") >= 0)
+                switch ($this->postParam("pronouns")) {
+                    case 'male':
+                        $user->setSex(0);
+                        break;
+                    case 'female':
+                        $user->setSex(1);
+                        break;
+                    case 'neutral':
+                        $user->setSex(2);
+                        break;
+                }
                 $user->setAudio_broadcast_enabled($this->checkbox("broadcast_music"));
 
                 if(!empty($this->postParam("phone")) && $this->postParam("phone") !== $user->getPhone()) {

diff --git a/Web/Presenters/templates/Auth/Register.xml b/Web/Presenters/templates/Auth/Register.xml
@@ -91,13 +91,13 @@
                     </tr>
                     <tr>
                         <td class="regform-left">
-                            <span class="nobold">{_gender}: </span>
+                            <span class="nobold">{_pronouns}: </span>
                         </td>
                         <td class="regform-right">
-                            {var $femalePreferred = OPENVK_ROOT_CONF["openvk"]["preferences"]["femaleGenderPriority"]}
-                            <select name="sex" required>
-                                <option n:attr="selected => !$femalePreferred" value="male">{_male}</option>
-                                <option n:attr="selected => $femalePreferred" value="female">{_female}</option>
+                            <select name="pronouns" required>
+                                <option value="male">{_male}</option>
+                                <option value="female">{_female}</option>
+                                <option value="neutral">{_neutral}</option>
                             </select>
                         </td>
                     </tr>

diff --git a/Web/Presenters/templates/User/Edit.xml b/Web/Presenters/templates/User/Edit.xml
@@ -139,12 +139,13 @@
                     </tr>
                     <tr>
                         <td width="120" valign="top">
-                            <span class="nobold">{_gender}: </span>
+                            <span class="nobold">{_pronouns}: </span>
                         </td>
                         <td>
-                            <select name="gender">
-                                <option value="1" {if $user->isFemale() == true}selected{/if}>{_female}</option>
-                                <option value="0" {if $user->isFemale() == false}selected{/if}>{_male}</option>
+                            <select name="pronouns">
+                                <option value="0" {if $user->getPronouns() == 0}selected{/if}>{_male}</option>
+                                <option value="1" {if $user->getPronouns() == 1}selected{/if}>{_female}</option>
+                                <option value="2" {if $user->getPronouns() == 2}selected{/if}>{_neutral}</option>
                             </select>
                         </td>
                     </tr>

diff --git a/locales/README.md b/locales/README.md
diff --git a/locales/by.strings b/locales/by.strings
diff --git a/locales/by_lat.strings b/locales/by_lat.strings
diff --git a/locales/de.strings b/locales/de.strings
diff --git a/locales/en.strings b/locales/en.strings
@@ -72,9 +72,10 @@
 "change_status" = "change status";
 "name" = "Name";
 "surname" = "Surname";
-"gender" = "Sex";
-"male" = "male";
-"female" = "female";
+"pronouns" = "Pronouns";
+"male" = "he/him";
+"female" = "she/her";
+"neutral" = "they/them";
 "description" = "Description";
 "save" = "Save";
 "main_information" = "Main information";

diff --git a/locales/eo.strings b/locales/eo.strings
diff --git a/locales/hy.strings b/locales/hy.strings
diff --git a/locales/id.strings b/locales/id.strings
diff --git a/locales/kk.strings b/locales/kk.strings
diff --git a/locales/pl.strings b/locales/pl.strings
diff --git a/locales/qqx.strings b/locales/qqx.strings
diff --git a/locales/ru.strings b/locales/ru.strings
@@ -62,9 +62,10 @@
 "change_status" = "изменить статус";
 "name" = "Имя";
 "surname" = "Фамилия";
-"gender" = "Пол";
-"male" = "мужской";
-"female" = "женский";
+"pronouns" = "Местоимения";
+"male" = "он/его";
+"female" = "она/её";
+"neutral" = "они/их";
 "description" = "Описание";
 "save" = "Сохранить";
 "main_information" = "Основная информация";

diff --git a/locales/ru_old.strings b/locales/ru_old.strings
diff --git a/locales/ru_sov.strings b/locales/ru_sov.strings
diff --git a/locales/sr_cyr.strings b/locales/sr_cyr.strings
diff --git a/locales/sr_lat.strings b/locales/sr_lat.strings
diff --git a/locales/tr.strings b/locales/tr.strings
diff --git a/locales/udm.strings b/locales/udm.strings
diff --git a/locales/uk.strings b/locales/uk.strings
@@ -64,9 +64,10 @@
 "change_status" = "змінити статус";
 "name" = "Ім’я";
 "surname" = "Прізвище";
-"gender" = "Стать";
-"male" = "Чоловіча";
-"female" = "Жіноча";
+"pronouns" = "Займенники";
+"male" = "він/його";
+"female" = "вона/її";
+"neutral" = "вони/їх";
 "description" = "Опис";
 "save" = "Зберегти";
 "main_information" = "Основна інформація";