account migrate in and other minor improvements
This commit is contained in:
Your Name
Henri Dickson
parent
4872430203
commit
791688b002
5 changed files with 117 additions and 92 deletions
|
|
@ -6,7 +6,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-06-15 18:22-0400\n"
|
||||
"POT-Creation-Date: 2024-06-15 22:23-0400\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"
|
||||
|
|
@ -1031,7 +1031,7 @@ msgstr "创建"
|
|||
#: journal/templates/collection_edit.html:38 journal/templates/comment.html:69
|
||||
#: journal/templates/mark.html:147 journal/templates/note.html:39
|
||||
#: journal/templates/review_edit.html:39 journal/templates/tag_edit.html:51
|
||||
#: users/templates/users/account.html:43 users/templates/users/account.html:104
|
||||
#: users/templates/users/account.html:43 users/templates/users/account.html:102
|
||||
#: users/templates/users/preferences.html:168
|
||||
#: users/templates/users/preferences.html:193
|
||||
msgid "Save"
|
||||
|
|
@ -1745,69 +1745,69 @@ msgstr "仅关注者"
|
|||
msgid "Mentioned Only"
|
||||
msgstr "自己和提到的人"
|
||||
|
||||
#: journal/models/note.py:27
|
||||
#: journal/models/note.py:33
|
||||
msgid "Page"
|
||||
msgstr "页码"
|
||||
|
||||
#: journal/models/note.py:28
|
||||
#: journal/models/note.py:34
|
||||
msgid "Chapter"
|
||||
msgstr "章节"
|
||||
|
||||
#: journal/models/note.py:31
|
||||
#: journal/models/note.py:37
|
||||
msgid "Part"
|
||||
msgstr "分部"
|
||||
|
||||
#: journal/models/note.py:32
|
||||
#: journal/models/note.py:38
|
||||
msgid "Episode"
|
||||
msgstr "单集"
|
||||
|
||||
#: journal/models/note.py:33
|
||||
#: journal/models/note.py:39
|
||||
msgid "Track"
|
||||
msgstr "曲目"
|
||||
|
||||
#: journal/models/note.py:34
|
||||
#: journal/models/note.py:40
|
||||
msgid "Cycle"
|
||||
msgstr "周目"
|
||||
|
||||
#: journal/models/note.py:35
|
||||
#: journal/models/note.py:41
|
||||
msgid "Timestamp"
|
||||
msgstr "时间戳"
|
||||
|
||||
#: journal/models/note.py:36
|
||||
#: journal/models/note.py:42
|
||||
msgid "Percentage"
|
||||
msgstr "百分比"
|
||||
|
||||
#: journal/models/note.py:53
|
||||
#: journal/models/note.py:59
|
||||
#, python-brace-format
|
||||
msgid "Page {value}"
|
||||
msgstr "第{value}页"
|
||||
|
||||
#: journal/models/note.py:54
|
||||
#: journal/models/note.py:60
|
||||
#, python-brace-format
|
||||
msgid "Chapter {value}"
|
||||
msgstr "第{value}章"
|
||||
|
||||
#: journal/models/note.py:57
|
||||
#: journal/models/note.py:63
|
||||
#, python-brace-format
|
||||
msgid "Part {value}"
|
||||
msgstr "第{value}部"
|
||||
|
||||
#: journal/models/note.py:58
|
||||
#: journal/models/note.py:64
|
||||
#, python-brace-format
|
||||
msgid "Episode {value}"
|
||||
msgstr "第{value}集"
|
||||
|
||||
#: journal/models/note.py:59
|
||||
#: journal/models/note.py:65
|
||||
#, python-brace-format
|
||||
msgid "Track {value}"
|
||||
msgstr "第{value}首"
|
||||
|
||||
#: journal/models/note.py:60
|
||||
#: journal/models/note.py:66
|
||||
#, python-brace-format
|
||||
msgid "Cycle {value}"
|
||||
msgstr "{value}周目"
|
||||
|
||||
#: journal/models/renderers.py:94 mastodon/api.py:619 takahe/utils.py:540
|
||||
#: journal/models/renderers.py:94 mastodon/api.py:619 takahe/utils.py:543
|
||||
#, python-brace-format
|
||||
msgid "regarding {item_title}, may contain spoiler or triggering content"
|
||||
msgstr "关于 {item_title}，可能包含剧透或敏感内容"
|
||||
|
|
@ -2516,7 +2516,7 @@ msgstr "笔记"
|
|||
|
||||
#: journal/templates/note.html:21
|
||||
msgid "Note with empty content will be deleted, sure to continue?"
|
||||
msgstr ""
|
||||
msgstr "无内容的笔记会被删除，确定继续吗？"
|
||||
|
||||
#: journal/templates/profile.html:55
|
||||
msgid "calendar"
|
||||
|
|
@ -2733,7 +2733,7 @@ msgstr "重复标签"
|
|||
msgid "Tag updated."
|
||||
msgstr "标签已更新"
|
||||
|
||||
#: journal/views/wrapped.py:143
|
||||
#: journal/views/wrapped.py:142
|
||||
msgid "Summary posted to timeline."
|
||||
msgstr "总结已发布到时间轴"
|
||||
|
||||
|
|
@ -2802,7 +2802,7 @@ msgstr "播放"
|
|||
msgid "comment"
|
||||
msgstr "写短评"
|
||||
|
||||
#: social/templates/activity/create_collection.html:16 takahe/utils.py:590
|
||||
#: social/templates/activity/create_collection.html:16 takahe/utils.py:593
|
||||
msgid "created collection"
|
||||
msgstr "创建了收藏单"
|
||||
|
||||
|
|
@ -3328,83 +3328,83 @@ msgstr "关联联邦宇宙身份后可发现更多用户，并使用本站完整
|
|||
msgid "Display name, avatar and other information"
|
||||
msgstr "昵称、头像与其它个人信息"
|
||||
|
||||
#: users/templates/users/account.html:96
|
||||
msgid "Please turn off Sync display name, bio and avatar."
|
||||
msgstr "请先关闭「自动同步用户昵称等基本信息」设置，否则这里的设置会在同步时被覆盖。"
|
||||
#: users/templates/users/account.html:94
|
||||
msgid "Updating profile information here will turn off automatic sync of display name, bio and avatar from your Mastodon instance. Sure to continue?"
|
||||
msgstr "在这里更新个人资料会停止从关联实例自动同步昵称等个人信息，确定继续吗？"
|
||||
|
||||
#: users/templates/users/account.html:110
|
||||
#: users/templates/users/account.html:108
|
||||
msgid "Users you are following"
|
||||
msgstr "正在关注的用户"
|
||||
|
||||
#: users/templates/users/account.html:116
|
||||
#: users/templates/users/account.html:114
|
||||
msgid "Users who follow you"
|
||||
msgstr "关注了你的用户"
|
||||
|
||||
#: users/templates/users/account.html:122
|
||||
#: users/templates/users/account.html:120
|
||||
msgid "Users who request to follow you"
|
||||
msgstr "请求关注你的用户"
|
||||
|
||||
#: users/templates/users/account.html:128
|
||||
#: users/templates/users/account.html:126
|
||||
msgid "Users you are muting"
|
||||
msgstr "已隐藏的用户"
|
||||
|
||||
#: users/templates/users/account.html:134
|
||||
#: users/templates/users/account.html:132
|
||||
msgid "Users you are blocking"
|
||||
msgstr "已屏蔽的用户"
|
||||
|
||||
#: users/templates/users/account.html:140
|
||||
#: users/templates/users/account.html:138
|
||||
msgid "Sync and import social account"
|
||||
msgstr "同步联邦宇宙信息和社交数据"
|
||||
|
||||
#: users/templates/users/account.html:150
|
||||
#: users/templates/users/account.html:148
|
||||
msgid "Sync display name, bio and avatar"
|
||||
msgstr "自动同步用户昵称等基本信息"
|
||||
|
||||
#: users/templates/users/account.html:158
|
||||
#: users/templates/users/account.html:156
|
||||
msgid "Sync follow, mute and block"
|
||||
msgstr "自动导入新增的关注、屏蔽和隐藏列表"
|
||||
|
||||
#: users/templates/users/account.html:162
|
||||
#: users/templates/users/account.html:160
|
||||
msgid "Save sync settings"
|
||||
msgstr "保存同步设置"
|
||||
|
||||
#: users/templates/users/account.html:165
|
||||
#: users/templates/users/account.html:163
|
||||
msgid "New follow, mute and blocks in the associated identity may be automatically imported; removal has to be done manually."
|
||||
msgstr "本站会按照以上设置每天自动导入你在联邦宇宙实例中新增的关注、屏蔽和隐藏列表；如果你在联邦宇宙实例中关注的用户加入了NeoDB，你会自动关注她；如果你在联邦宇宙实例中取消了关注、屏蔽或隐藏，本站不会自动取消，但你可以手动移除。"
|
||||
|
||||
#: users/templates/users/account.html:172
|
||||
#: users/templates/users/account.html:170
|
||||
msgid "Click button below to start sync now."
|
||||
msgstr "如果希望立即开始同步，可以点击下方按钮。"
|
||||
|
||||
#: users/templates/users/account.html:174
|
||||
#: users/templates/users/account.html:172
|
||||
msgid "Sync now"
|
||||
msgstr "立即同步"
|
||||
|
||||
#: users/templates/users/account.html:178
|
||||
#: users/templates/users/account.html:176
|
||||
msgid "Last updated"
|
||||
msgstr "最近更新"
|
||||
|
||||
#: users/templates/users/account.html:186
|
||||
#: users/templates/users/account.html:184
|
||||
msgid "Delete Account"
|
||||
msgstr "删除账号"
|
||||
|
||||
#: users/templates/users/account.html:189
|
||||
#: users/templates/users/account.html:187
|
||||
msgid "Once deleted, account data cannot be recovered. Sure to proceed?"
|
||||
msgstr "账号数据一旦删除后将无法恢复，确定继续吗？"
|
||||
|
||||
#: users/templates/users/account.html:192
|
||||
#: users/templates/users/account.html:190
|
||||
msgid "Enter full <code>username@instance.social</code> or <code>email@domain.com</code> to confirm deletion."
|
||||
msgstr "输入完整的登录用 <code>用户名@实例名</code> 或 <code>电子邮件地址</code> 以确认删除"
|
||||
|
||||
#: users/templates/users/account.html:202
|
||||
#: users/templates/users/account.html:200
|
||||
msgid "Once deleted, account data cannot be recovered."
|
||||
msgstr "账号数据一旦删除后将无法恢复"
|
||||
|
||||
#: users/templates/users/account.html:204
|
||||
#: users/templates/users/account.html:202
|
||||
msgid "Importing in progress, can't delete now."
|
||||
msgstr "暂时无法删除，因为有导入任务正在进行"
|
||||
|
||||
#: users/templates/users/account.html:207
|
||||
#: users/templates/users/account.html:205
|
||||
msgid "Permanently Delete"
|
||||
msgstr "永久删除"
|
||||
|
||||
|
|
@ -3705,13 +3705,21 @@ msgid "Settings for current device saved"
|
|||
msgstr "当前设备设置已保存"
|
||||
|
||||
#: users/templates/users/preferences.html:215
|
||||
msgid "Applications"
|
||||
msgstr "应用程序"
|
||||
msgid "Additional Settings"
|
||||
msgstr "更多设置"
|
||||
|
||||
#: users/templates/users/preferences.html:217
|
||||
msgid "View authorized applications"
|
||||
msgstr "查看已授权的应用程序"
|
||||
|
||||
#: users/templates/users/preferences.html:221
|
||||
msgid "Migrate account"
|
||||
msgstr "迁移账号"
|
||||
|
||||
#: users/templates/users/preferences.html:223
|
||||
msgid "Link an email so that you can migrate followers from other Fediverse instances."
|
||||
msgstr "关联电子邮件后方可从其他实例迁入。"
|
||||
|
||||
#: users/templates/users/profile_actions.html:6
|
||||
msgid "click to unblock"
|
||||
msgstr "点击可取消屏蔽"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-06-15 18:22-0400\n"
|
||||
"POT-Creation-Date: 2024-06-15 22:23-0400\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"
|
||||
|
|
@ -1031,7 +1031,7 @@ msgstr "創建"
|
|||
#: journal/templates/collection_edit.html:38 journal/templates/comment.html:69
|
||||
#: journal/templates/mark.html:147 journal/templates/note.html:39
|
||||
#: journal/templates/review_edit.html:39 journal/templates/tag_edit.html:51
|
||||
#: users/templates/users/account.html:43 users/templates/users/account.html:104
|
||||
#: users/templates/users/account.html:43 users/templates/users/account.html:102
|
||||
#: users/templates/users/preferences.html:168
|
||||
#: users/templates/users/preferences.html:193
|
||||
msgid "Save"
|
||||
|
|
@ -1745,69 +1745,69 @@ msgstr "僅關注者"
|
|||
msgid "Mentioned Only"
|
||||
msgstr "自己和提到的人"
|
||||
|
||||
#: journal/models/note.py:27
|
||||
#: journal/models/note.py:33
|
||||
msgid "Page"
|
||||
msgstr "頁碼"
|
||||
|
||||
#: journal/models/note.py:28
|
||||
#: journal/models/note.py:34
|
||||
msgid "Chapter"
|
||||
msgstr "章節"
|
||||
|
||||
#: journal/models/note.py:31
|
||||
#: journal/models/note.py:37
|
||||
msgid "Part"
|
||||
msgstr "分部"
|
||||
|
||||
#: journal/models/note.py:32
|
||||
#: journal/models/note.py:38
|
||||
msgid "Episode"
|
||||
msgstr "單集"
|
||||
|
||||
#: journal/models/note.py:33
|
||||
#: journal/models/note.py:39
|
||||
msgid "Track"
|
||||
msgstr "曲目"
|
||||
|
||||
#: journal/models/note.py:34
|
||||
#: journal/models/note.py:40
|
||||
msgid "Cycle"
|
||||
msgstr "周目"
|
||||
|
||||
#: journal/models/note.py:35
|
||||
#: journal/models/note.py:41
|
||||
msgid "Timestamp"
|
||||
msgstr "時間戳"
|
||||
|
||||
#: journal/models/note.py:36
|
||||
#: journal/models/note.py:42
|
||||
msgid "Percentage"
|
||||
msgstr "百分比"
|
||||
|
||||
#: journal/models/note.py:53
|
||||
#: journal/models/note.py:59
|
||||
#, python-brace-format
|
||||
msgid "Page {value}"
|
||||
msgstr "第{value}頁"
|
||||
|
||||
#: journal/models/note.py:54
|
||||
#: journal/models/note.py:60
|
||||
#, python-brace-format
|
||||
msgid "Chapter {value}"
|
||||
msgstr "第{value}章"
|
||||
|
||||
#: journal/models/note.py:57
|
||||
#: journal/models/note.py:63
|
||||
#, python-brace-format
|
||||
msgid "Part {value}"
|
||||
msgstr "第{value}部"
|
||||
|
||||
#: journal/models/note.py:58
|
||||
#: journal/models/note.py:64
|
||||
#, python-brace-format
|
||||
msgid "Episode {value}"
|
||||
msgstr "第{value}集"
|
||||
|
||||
#: journal/models/note.py:59
|
||||
#: journal/models/note.py:65
|
||||
#, python-brace-format
|
||||
msgid "Track {value}"
|
||||
msgstr "第{value}首"
|
||||
|
||||
#: journal/models/note.py:60
|
||||
#: journal/models/note.py:66
|
||||
#, python-brace-format
|
||||
msgid "Cycle {value}"
|
||||
msgstr "{value}周目"
|
||||
|
||||
#: journal/models/renderers.py:94 mastodon/api.py:619 takahe/utils.py:540
|
||||
#: journal/models/renderers.py:94 mastodon/api.py:619 takahe/utils.py:543
|
||||
#, python-brace-format
|
||||
msgid "regarding {item_title}, may contain spoiler or triggering content"
|
||||
msgstr "關於 {item_title}，可能包含劇透或敏感內容"
|
||||
|
|
@ -2516,7 +2516,7 @@ msgstr "筆記"
|
|||
|
||||
#: journal/templates/note.html:21
|
||||
msgid "Note with empty content will be deleted, sure to continue?"
|
||||
msgstr ""
|
||||
msgstr "無內容的筆記會被刪除，確定繼續嗎？"
|
||||
|
||||
#: journal/templates/profile.html:55
|
||||
msgid "calendar"
|
||||
|
|
@ -2733,7 +2733,7 @@ msgstr "重複標籤"
|
|||
msgid "Tag updated."
|
||||
msgstr "標籤已更新"
|
||||
|
||||
#: journal/views/wrapped.py:143
|
||||
#: journal/views/wrapped.py:142
|
||||
msgid "Summary posted to timeline."
|
||||
msgstr "總結已發佈到時間軸"
|
||||
|
||||
|
|
@ -2802,7 +2802,7 @@ msgstr "播放"
|
|||
msgid "comment"
|
||||
msgstr "寫短評"
|
||||
|
||||
#: social/templates/activity/create_collection.html:16 takahe/utils.py:590
|
||||
#: social/templates/activity/create_collection.html:16 takahe/utils.py:593
|
||||
msgid "created collection"
|
||||
msgstr "創建了收藏單"
|
||||
|
||||
|
|
@ -3328,83 +3328,83 @@ msgstr "關聯聯邦宇宙身份後可發現更多用戶，並使用本站完整
|
|||
msgid "Display name, avatar and other information"
|
||||
msgstr "暱稱、頭像與其它個人信息"
|
||||
|
||||
#: users/templates/users/account.html:96
|
||||
msgid "Please turn off Sync display name, bio and avatar."
|
||||
msgstr "請先關閉「自動同步用戶暱稱等基本信息」設置，否則這裏的設置會在同步時被覆蓋。"
|
||||
#: users/templates/users/account.html:94
|
||||
msgid "Updating profile information here will turn off automatic sync of display name, bio and avatar from your Mastodon instance. Sure to continue?"
|
||||
msgstr "在這裏更新個人資料會停止從關聯實例自動同步暱稱等個人信息，確定繼續嗎？"
|
||||
|
||||
#: users/templates/users/account.html:110
|
||||
#: users/templates/users/account.html:108
|
||||
msgid "Users you are following"
|
||||
msgstr "正在關注的用戶"
|
||||
|
||||
#: users/templates/users/account.html:116
|
||||
#: users/templates/users/account.html:114
|
||||
msgid "Users who follow you"
|
||||
msgstr "關注了你的用戶"
|
||||
|
||||
#: users/templates/users/account.html:122
|
||||
#: users/templates/users/account.html:120
|
||||
msgid "Users who request to follow you"
|
||||
msgstr "請求關注你的用戶"
|
||||
|
||||
#: users/templates/users/account.html:128
|
||||
#: users/templates/users/account.html:126
|
||||
msgid "Users you are muting"
|
||||
msgstr "已隱藏的用戶"
|
||||
|
||||
#: users/templates/users/account.html:134
|
||||
#: users/templates/users/account.html:132
|
||||
msgid "Users you are blocking"
|
||||
msgstr "已屏蔽的用戶"
|
||||
|
||||
#: users/templates/users/account.html:140
|
||||
#: users/templates/users/account.html:138
|
||||
msgid "Sync and import social account"
|
||||
msgstr "同步聯邦宇宙信息和社交數據"
|
||||
|
||||
#: users/templates/users/account.html:150
|
||||
#: users/templates/users/account.html:148
|
||||
msgid "Sync display name, bio and avatar"
|
||||
msgstr "自動同步用戶暱稱等基本信息"
|
||||
|
||||
#: users/templates/users/account.html:158
|
||||
#: users/templates/users/account.html:156
|
||||
msgid "Sync follow, mute and block"
|
||||
msgstr "自動導入新增的關注、屏蔽和隱藏列表"
|
||||
|
||||
#: users/templates/users/account.html:162
|
||||
#: users/templates/users/account.html:160
|
||||
msgid "Save sync settings"
|
||||
msgstr "保存同步設置"
|
||||
|
||||
#: users/templates/users/account.html:165
|
||||
#: users/templates/users/account.html:163
|
||||
msgid "New follow, mute and blocks in the associated identity may be automatically imported; removal has to be done manually."
|
||||
msgstr "本站會按照以上設置每天自動導入你在聯邦宇宙實例中新增的關注、屏蔽和隱藏列表；如果你在聯邦宇宙實例中關注的用戶加入了NeoDB，你會自動關注她；如果你在聯邦宇宙實例中取消了關注、屏蔽或隱藏，本站不會自動取消，但你可以手動移除。"
|
||||
|
||||
#: users/templates/users/account.html:172
|
||||
#: users/templates/users/account.html:170
|
||||
msgid "Click button below to start sync now."
|
||||
msgstr "如果希望立即開始同步，可以點擊下方按鈕。"
|
||||
|
||||
#: users/templates/users/account.html:174
|
||||
#: users/templates/users/account.html:172
|
||||
msgid "Sync now"
|
||||
msgstr "立即同步"
|
||||
|
||||
#: users/templates/users/account.html:178
|
||||
#: users/templates/users/account.html:176
|
||||
msgid "Last updated"
|
||||
msgstr "最近更新"
|
||||
|
||||
#: users/templates/users/account.html:186
|
||||
#: users/templates/users/account.html:184
|
||||
msgid "Delete Account"
|
||||
msgstr "刪除賬號"
|
||||
|
||||
#: users/templates/users/account.html:189
|
||||
#: users/templates/users/account.html:187
|
||||
msgid "Once deleted, account data cannot be recovered. Sure to proceed?"
|
||||
msgstr "賬號數據一旦刪除後將無法恢復，確定繼續嗎？"
|
||||
|
||||
#: users/templates/users/account.html:192
|
||||
#: users/templates/users/account.html:190
|
||||
msgid "Enter full <code>username@instance.social</code> or <code>email@domain.com</code> to confirm deletion."
|
||||
msgstr "輸入完整的登錄用 <code>用戶名@實例名</code> 或 <code>電子郵件地址</code> 以確認刪除"
|
||||
|
||||
#: users/templates/users/account.html:202
|
||||
#: users/templates/users/account.html:200
|
||||
msgid "Once deleted, account data cannot be recovered."
|
||||
msgstr "賬號數據一旦刪除後將無法恢復"
|
||||
|
||||
#: users/templates/users/account.html:204
|
||||
#: users/templates/users/account.html:202
|
||||
msgid "Importing in progress, can't delete now."
|
||||
msgstr "暫時無法刪除，因爲有導入任務正在進行"
|
||||
|
||||
#: users/templates/users/account.html:207
|
||||
#: users/templates/users/account.html:205
|
||||
msgid "Permanently Delete"
|
||||
msgstr "永久刪除"
|
||||
|
||||
|
|
@ -3705,13 +3705,21 @@ msgid "Settings for current device saved"
|
|||
msgstr "當前設備設置已保存"
|
||||
|
||||
#: users/templates/users/preferences.html:215
|
||||
msgid "Applications"
|
||||
msgstr "應用程序"
|
||||
msgid "Additional Settings"
|
||||
msgstr "更多設置"
|
||||
|
||||
#: users/templates/users/preferences.html:217
|
||||
msgid "View authorized applications"
|
||||
msgstr "查看已授權的應用程序"
|
||||
|
||||
#: users/templates/users/preferences.html:221
|
||||
msgid "Migrate account"
|
||||
msgstr "遷移賬號"
|
||||
|
||||
#: users/templates/users/preferences.html:223
|
||||
msgid "Link an email so that you can migrate followers from other Fediverse instances."
|
||||
msgstr "關聯電子郵件後方可從其他實例遷入。"
|
||||
|
||||
#: users/templates/users/profile_actions.html:6
|
||||
msgid "click to unblock"
|
||||
msgstr "點擊可取消屏蔽"
|
||||
|
|
|
|||
|
|
@ -51,4 +51,8 @@ def account_profile(request):
|
|||
if form.is_valid():
|
||||
i = form.save()
|
||||
Takahe.update_state(i, "edited")
|
||||
u = request.user
|
||||
if u.mastodon_acct and not u.preference.mastodon_skip_userinfo:
|
||||
u.preference.mastodon_skip_userinfo = True
|
||||
u.preference.save(update_fields=["mastodon_skip_userinfo"])
|
||||
return HttpResponseRedirect(reverse("users:info"))
|
||||
|
|
|
|||
|
|
@ -91,10 +91,8 @@
|
|||
<summary>{% trans "Display name, avatar and other information" %}</summary>
|
||||
<form action="{% url 'users:profile' %}?next={{ request.path }}"
|
||||
method="post"
|
||||
{% if request.user.mastodon_acct and not request.user.preference.mastodon_skip_userinfo %}onsubmit="return confirm('{% trans "Updating profile information here will turn off automatic sync of display name, bio and avatar from your Mastodon instance. Sure to continue?" %}')"{% endif %}
|
||||
enctype="multipart/form-data">
|
||||
{% if request.user.mastodon_acct and not request.user.preference.mastodon_skip_userinfo %}
|
||||
<small class="invalid">{% trans "Please turn off Sync display name, bio and avatar." %}</small>
|
||||
{% endif %}
|
||||
{% include "_field.html" with field=profile_form.name %}
|
||||
{% include "_field.html" with field=profile_form.summary %}
|
||||
{% include "_field.html" with field=profile_form.icon %}
|
||||
|
|
|
|||
|
|
@ -212,10 +212,17 @@
|
|||
</article>
|
||||
<article>
|
||||
<details>
|
||||
<summary>{% trans 'Applications' %}</summary>
|
||||
<summary>{% trans 'Additional Settings' %}</summary>
|
||||
<p>
|
||||
<a href="/@{{ request.user.identity.handle }}/settings/tokens/">{% trans "View authorized applications" %}</a>
|
||||
</p>
|
||||
<p>
|
||||
{% if user.email %}
|
||||
<a href="/@{{ request.user.identity.handle }}/settings/migrate_in/">{% trans "Migrate account" %}</a>
|
||||
{% else %}
|
||||
<a href="{% url 'users:info' %}">{% trans "Link an email so that you can migrate followers from other Fediverse instances." %}</a>
|
||||
{% endif %}
|
||||
</p>
|
||||
</details>
|
||||
</article>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue