Merge pull request #139 from MahjongRepository/ng-mainline

sync with prod

Author: unStatiK

server/account/urls.py

@@ -6,8 +6,14 @@
 
 from account.views import account_settings, do_login, request_player_and_user_connection
 
+
+class CustomLogoutView(auth_views.LogoutView):
+    def dispatch(self, request, *args, **kwargs):
+        return self.post(request, *args, **kwargs)
+
+
 urlpatterns = [
-    url(r"^logout/$", auth_views.LogoutView.as_view(), name="logout"),
+    url(r"^logout/$", CustomLogoutView.as_view(), name="logout"),
     url(r"^login/$", do_login, name="do_login"),
     url(r"^settings/$", account_settings, name="account_settings"),
     path(

server/locale/ru/LC_MESSAGES/django.mo

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-26 19:55+0000\n"
+"POT-Creation-Date: 2025-03-17 21:28+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -509,19 +509,19 @@ msgstr ""
 msgid "Substitution player"
 msgstr "Игрок замены"
 
-#: player/tenhou/models.py:144
+#: player/tenhou/models.py:150
 msgid "Ippan"
 msgstr "Кю-лобби"
 
-#: player/tenhou/models.py:145
+#: player/tenhou/models.py:151
 msgid "Joukyuu"
 msgstr "Перводан"
 
-#: player/tenhou/models.py:146
+#: player/tenhou/models.py:152
 msgid "Tokujou"
 msgstr "Втородан"
 
-#: player/tenhou/models.py:147
+#: player/tenhou/models.py:153
 msgid "Houou"
 msgstr "Феникс"
 
@@ -748,7 +748,7 @@ msgstr "Последние 5 турниров"
 msgid "all tournaments"
 msgstr "все турниры"
 
-#: templates/club/details.html:33 templates/player/details.html:262
+#: templates/club/details.html:33 templates/player/details.html:275
 msgid "Club statistics"
 msgstr "Клубная статистика"
 
@@ -778,8 +778,8 @@ msgid "Name"
 msgstr "Имя"
 
 #: templates/club/details.html:52 templates/ms/ms_accounts.html:31
-#: templates/player/details.html:144 templates/player/details.html:154
-#: templates/player/details.html:271 templates/player/ms.html:122
+#: templates/player/details.html:157 templates/player/details.html:167
+#: templates/player/details.html:284 templates/player/ms.html:122
 #: templates/player/ms.html:216 templates/player/tenhou.html:166
 #: templates/player/tenhou.html:176 templates/player/tenhou.html:229
 #: templates/player/tenhou.html:240
@@ -790,37 +790,37 @@ msgstr "Имя"
 msgid "Games"
 msgstr "Игр"
 
-#: templates/club/details.html:55 templates/player/details.html:144
-#: templates/player/details.html:157 templates/player/details.html:274
+#: templates/club/details.html:55 templates/player/details.html:157
+#: templates/player/details.html:170 templates/player/details.html:287
 #: templates/player/ms.html:125 templates/player/ms.html:219
 #: templates/player/tenhou.html:166 templates/player/tenhou.html:179
 #: templates/player/tenhou.html:229 templates/player/tenhou.html:243
 msgid "Avg. place"
 msgstr "Ср. место"
 
-#: templates/club/details.html:58 templates/player/details.html:160
-#: templates/player/details.html:277 templates/player/ms.html:128
+#: templates/club/details.html:58 templates/player/details.html:173
+#: templates/player/details.html:290 templates/player/ms.html:128
 #: templates/player/ms.html:222 templates/player/tenhou.html:182
 #: templates/player/tenhou.html:246
 msgid "1st"
 msgstr "1-e"
 
-#: templates/club/details.html:61 templates/player/details.html:163
-#: templates/player/details.html:280 templates/player/ms.html:131
+#: templates/club/details.html:61 templates/player/details.html:176
+#: templates/player/details.html:293 templates/player/ms.html:131
 #: templates/player/ms.html:225 templates/player/tenhou.html:185
 #: templates/player/tenhou.html:249
 msgid "2nd"
 msgstr "2-е"
 
-#: templates/club/details.html:64 templates/player/details.html:166
-#: templates/player/details.html:283 templates/player/ms.html:134
+#: templates/club/details.html:64 templates/player/details.html:179
+#: templates/player/details.html:296 templates/player/ms.html:134
 #: templates/player/ms.html:228 templates/player/tenhou.html:188
 #: templates/player/tenhou.html:252
 msgid "3rd"
 msgstr "3-е"
 
-#: templates/club/details.html:67 templates/player/details.html:169
-#: templates/player/details.html:286 templates/player/ms.html:137
+#: templates/club/details.html:67 templates/player/details.html:182
+#: templates/player/details.html:299 templates/player/ms.html:137
 #: templates/player/tenhou.html:191 templates/player/tenhou.html:255
 msgid "4th"
 msgstr "4-е"
@@ -1010,7 +1010,7 @@ msgstr "санма"
 msgid "Player"
 msgstr "Игрок"
 
-#: templates/ms/ms_accounts.html:28 templates/player/details.html:112
+#: templates/ms/ms_accounts.html:28 templates/player/details.html:125
 #: templates/player/tenhou.html:47 templates/player/tenhou.html:126
 #: templates/tenhou/games_history.html:58
 msgid "Rank"
@@ -1030,15 +1030,15 @@ msgstr "Очки"
 msgid "Account"
 msgstr "Аккаунт"
 
-#: templates/ms/ms_accounts.html:32 templates/player/details.html:116
-#: templates/player/details.html:144 templates/player/ms.html:109
+#: templates/ms/ms_accounts.html:32 templates/player/details.html:129
+#: templates/player/details.html:157 templates/player/ms.html:109
 #: templates/player/ms.html:202 templates/player/tenhou.html:166
 #: templates/player/tenhou.html:229 templates/tenhou/tenhou_accounts.html:24
 msgid "Last played date"
 msgstr "Дата последней игры"
 
 #: templates/player/_changes_table.html:7 templates/player/_deltas_table.html:9
-#: templates/player/details.html:69 templates/player/details.html:212
+#: templates/player/details.html:82 templates/player/details.html:225
 #: templates/player/tenhou.html:297 templates/player/tournaments.html:24
 #: templates/rating/dates.html:16 templates/tenhou/latest_yakumans.html:18
 #: templates/tournament/_tournaments_table.html:9
@@ -1047,7 +1047,7 @@ msgstr "Дата"
 
 #: templates/player/_changes_table.html:8
 #: templates/player/_deltas_table.html:10 templates/player/details.html:27
-#: templates/player/details.html:68 templates/player/rating_details.html:48
+#: templates/player/details.html:81 templates/player/rating_details.html:48
 #: templates/player/rating_details.html:83 templates/player/tournaments.html:23
 #: templates/tenhou/games_history.html:59
 msgid "Place"
@@ -1057,7 +1057,7 @@ msgstr "Место"
 msgid "Reason"
 msgstr "Причина"
 
-#: templates/player/_deltas_table.html:8 templates/player/details.html:67
+#: templates/player/_deltas_table.html:8 templates/player/details.html:80
 #: templates/player/tournaments.html:22
 msgid "Base rank"
 msgstr "Ранг"
@@ -1072,13 +1072,13 @@ msgstr "Влияние"
 msgid "Coefficient"
 msgstr "Коэффициент"
 
-#: templates/player/_deltas_table.html:13 templates/player/details.html:70
+#: templates/player/_deltas_table.html:13 templates/player/details.html:83
 #: templates/player/tournaments.html:25 templates/tenhou/games_history.html:61
 #: templates/tournament/_tournaments_table.html:17
 msgid "Type"
 msgstr "Тип"
 
-#: templates/player/_deltas_table.html:14 templates/player/details.html:71
+#: templates/player/_deltas_table.html:14 templates/player/details.html:84
 #: templates/player/tournaments.html:26
 msgid "Tournament"
 msgstr "Турнир"
@@ -1101,70 +1101,70 @@ msgstr "Рейтинг"
 msgid "Scores"
 msgstr "Очки"
 
-#: templates/player/details.html:59
+#: templates/player/details.html:72
 msgid "Latest tournaments"
 msgstr "Последние турниры"
 
-#: templates/player/details.html:60
+#: templates/player/details.html:73
 msgid "all player tournaments"
 msgstr "все турниры игрока"
 
-#: templates/player/details.html:105 templates/player/tenhou.html:5
+#: templates/player/details.html:118 templates/player/tenhou.html:5
 #: templates/player/tenhou.html:328 templates/player/tenhou.html:329
 msgid "Tenhou.net profile"
 msgstr "Tenhou.net профиль"
 
-#: templates/player/details.html:106 templates/player/details.html:241
+#: templates/player/details.html:119 templates/player/details.html:254
 msgid "more information"
 msgstr "больше информации"
 
-#: templates/player/details.html:110 templates/player/details.html:242
+#: templates/player/details.html:123 templates/player/details.html:255
 #: templates/player/ms.html:100 templates/player/tenhou.html:124
 msgid "Statistics for"
 msgstr "Статистика аккаунта"
 
-#: templates/player/details.html:124 templates/player/tenhou.html:132
+#: templates/player/details.html:137 templates/player/tenhou.html:132
 msgid "Latest places:"
 msgstr "Последние игры:"
 
-#: templates/player/details.html:142 templates/player/tenhou.html:164
+#: templates/player/details.html:155 templates/player/tenhou.html:164
 msgid "Current month"
 msgstr "За текущий месяц"
 
-#: templates/player/details.html:151 templates/player/tenhou.html:173
+#: templates/player/details.html:164 templates/player/tenhou.html:173
 #: templates/player/tenhou.html:237 templates/tenhou/games_history.html:62
 msgid "Lobby"
 msgstr "Лобби"
 
-#: templates/player/details.html:207 templates/player/tenhou.html:292
+#: templates/player/details.html:220 templates/player/tenhou.html:292
 msgid "Collected yakumans"
 msgstr "Собранные якуманы"
 
-#: templates/player/details.html:211 templates/player/tenhou.html:296
+#: templates/player/details.html:224 templates/player/tenhou.html:296
 #: templates/tenhou/latest_yakumans.html:16
 msgid "Yakuman"
 msgstr "Якуман"
 
-#: templates/player/details.html:213 templates/player/tenhou.html:298
+#: templates/player/details.html:226 templates/player/tenhou.html:298
 #: templates/tenhou/latest_yakumans.html:19
 msgid "Log"
 msgstr "Игра"
 
-#: templates/player/details.html:227 templates/player/tenhou.html:312
+#: templates/player/details.html:240 templates/player/tenhou.html:312
 #: templates/tenhou/latest_yakumans.html:38
 msgid "link"
 msgstr "ссылка"
 
-#: templates/player/details.html:240 templates/player/ms.html:5
+#: templates/player/details.html:253 templates/player/ms.html:5
 #: templates/player/ms.html:284 templates/player/ms.html:285
 msgid "Mahjong Soul profile"
 msgstr "Профиль на Mahjong Soul"
 
-#: templates/player/details.html:247 templates/player/ms.html:104
+#: templates/player/details.html:260 templates/player/ms.html:104
 msgid "Four players"
 msgstr "Четыре игрока"
 
-#: templates/player/details.html:255 templates/player/ms.html:197
+#: templates/player/details.html:268 templates/player/ms.html:197
 #: templates/tenhou/tenhou_games_async.html:27
 msgid "Sanma"
 msgstr "Санма"
@@ -1805,21 +1805,21 @@ msgstr "ничего не нашлось"
 msgid "Server"
 msgstr "О Сервере"
 
-#: templates/website/wrc_2020.html:5 templates/website/wrc_2020.html:10
+#: templates/website/wrc_2020.html:5 templates/website/wrc_2020.html:18
 msgid "World Riichi Championship 2020 Qualifications"
 msgstr "Отбор на Чемпионат Мира 2020 года"
 
-#: templates/website/wrc_2020.html:67 templates/website/wrc_2020.html:76
-#: templates/website/wrc_2020.html:77 templates/website/wrc_2025.html:61
-#: templates/website/wrc_2025.html:62
+#: templates/website/wrc_2020.html:75 templates/website/wrc_2020.html:84
+#: templates/website/wrc_2020.html:85 templates/website/wrc_2025.html:98
+#: templates/website/wrc_2025.html:99
 msgid "List of players sorted by RR rating (on 1st February 2020)"
 msgstr "Рейтинг RR на 1 февраля 2020 года."
 
-#: templates/website/wrc_2025.html:5 templates/website/wrc_2025.html:10
+#: templates/website/wrc_2025.html:5 templates/website/wrc_2025.html:18
 msgid "World Riichi Championship 2025 Qualifications"
 msgstr "Отбор на Чемпионат Мира 2025 года"
 
-#: templates/website/wrc_2025.html:52
+#: templates/website/wrc_2025.html:89
 msgid "List of players sorted by RR rating (on 3st February 2025)"
 msgstr "Рейтинг RR на 3 февраля 2025 года."
 
@@ -2027,7 +2027,7 @@ msgstr ""
 "ли привозить другие. А также все пожелания или потребности для проведения "
 "данного турнира."
 
-#: tournament/views.py:237 tournament/views.py:322
+#: tournament/views.py:237 tournament/views.py:321
 msgid ""
 "Your registration was accepted! It will be visible on the page after "
 "administrator approvement."
@@ -2039,15 +2039,15 @@ msgstr ""
 msgid "You already registered to the tournament!"
 msgstr "Вы ранее уже зарегистрировались на этот турнир!"
 
-#: tournament/views.py:326
+#: tournament/views.py:325
 msgid "Your registration was accepted!"
 msgstr "Регистрация принята!"
 
-#: tournament/views.py:332
+#: tournament/views.py:331
 msgid "Please, allow to store personal data"
 msgstr "Пожалуйста, разрешите сохранять персональные данные"
 
-#: utils/new_pantheon.py:111
+#: utils/new_pantheon.py:125
 msgid "There is no user email in the registration."
 msgstr "В регистрации не найдена почта пользователя."
 

server/locale/ru/LC_MESSAGES/django.po

@@ -113,8 +113,9 @@
 
 # Database
 # https://docs.djangoproject.com/en/2.0/ref/settings/#databases
-
-DATABASES = {"default": dj_database_url.config()}
+db_config_dict = dj_database_url.config()
+db_config_dict["OPTIONS"] = {"pool": False}
+DATABASES = {"default": db_config_dict}
 
 if os.environ.get("PANTHEON_DB_URL"):
     DATABASES["pantheon"] = dj_database_url.parse(os.environ.get("PANTHEON_DB_URL"))
@@ -143,8 +144,6 @@
 
 USE_I18N = True
 
-USE_L10N = True
-
 USE_TZ = True
 
 

server/mahjong_portal/settings.py

@@ -2,10 +2,10 @@
 gunicorn==23.0.0
 
 # main deps
-Django==4.2.16
+Django==5.1.7
 django-modeltranslation==0.18.10
-psycopg==3.2.1
-psycopg2==2.9.9
+psycopg==3.2.5
+psycopg2==2.9.10
 psycopg2cffi==2.9.0
 django-bootstrap5==23.3
 dj-database-url==2.0.0
@@ -33,7 +33,7 @@ django-haystack==3.3.0
 Whoosh==2.7.4
 
 # for web parsing
-beautifulsoup4==4.12.2
+beautifulsoup4==4.13.3
 requests==2.32.3
 
 # for monitoring

server/requirements/base.txt

@@ -16,9 +16,9 @@ <h1>About server</h1>
         <div class="card mb-4">
             <div class="card-body">
               <h5 class="card-title">Mahjong portal work on:</h5>
-              <p class="card-text">&bull; Django framework 4</p>
+              <p class="card-text">&bull; Django framework 5</p>
               <p class="card-text">&bull; {{ platform_name }}</p>
-              <p class="card-text">&bull; PostgreSQL 15</p>
+              <p class="card-text">&bull; {{ db_backend }}</p>
             </div>
         </div>
     </div>

server/static/js/jquery.min.js

@@ -16,9 +16,9 @@ <h1>О сервере</h1>
         <div class="card mb-4">
             <div class="card-body">
               <h5 class="card-title">Маджонг портал работает на:</h5>
-              <p class="card-text">&bull; Django framework 4</p>
+              <p class="card-text">&bull; Django framework 5</p>
               <p class="card-text">&bull; {{ platform_name }}</p>
-              <p class="card-text">&bull; PostgreSQL 15</p>
+              <p class="card-text">&bull; {{ db_backend }}</p>
             </div>
         </div>
     </div>