Skip to content

Commit

Permalink
Increase English language support
Browse files Browse the repository at this point in the history
  • Loading branch information
kingmo888 committed Mar 15, 2024
1 parent bbf586f commit a8b07cb
Show file tree
Hide file tree
Showing 25 changed files with 1,213 additions and 158 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ dist_py38

LICENSE.rst

db/test_db.sqlite3
db/test_db.sqlite3
job2en.py
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
# rustdesk-api-server

## 如果项目有帮到你,给个star不过分吧?

## 请使用客户端最新版本1.2.3

[The English explanation is available by clicking here.](https://github.com/kingmo888/rustdesk-api-server/blob/master/README_EN.md)

<p align="center">
<i>一个 python 实现的 Rustdesk API 接口,支持 WebUI 管理</i>
<br/>
<img src ="https://img.shields.io/badge/Version-1.4.8-blueviolet.svg"/>
<img src ="https://img.shields.io/badge/Version-1.4.9-blueviolet.svg"/>
<img src ="https://img.shields.io/badge/Python-3.7|3.8|3.9|3.10|3.11-blue.svg" />
<img src ="https://img.shields.io/badge/Django-3.2+|4.x-yelow.svg" />
<br/>
Expand Down Expand Up @@ -142,6 +140,7 @@ services:
| `MYSQL_PASSWORD` | 可选,默认 `-` | MYSQL数据库的密码 |
| `MYSQL_PORT` | 可选,默认 `3306` | MYSQL数据库端口 |
| 数据库配置 | -- 结束 -- | 查看【[sqlite3迁移mysql教程](/tutorial/sqlite2mysql.md)】 |
| `LANGUAGE_CODE` | 可选,默认 `zh-hans` | 语言,支持中文(`zh-hans`)、英语(`en`) |

## 使用问题

Expand Down
16 changes: 8 additions & 8 deletions api/admin_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
from django.contrib.auth.models import Group
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
from django.contrib.auth.forms import ReadOnlyPasswordHashField

from django.utils.translation import gettext as _


class UserCreationForm(forms.ModelForm):
"""A form for creating new users. Includes all the required
fields, plus a repeated password."""
password1 = forms.CharField(label='密码', widget=forms.PasswordInput)
password2 = forms.CharField(label='再次输入密码', widget=forms.PasswordInput)
password1 = forms.CharField(label=_('密码'), widget=forms.PasswordInput)
password2 = forms.CharField(label=_('再次输入密码'), widget=forms.PasswordInput)

class Meta:
model = models.UserProfile
Expand All @@ -23,7 +23,7 @@ def clean_password2(self):
password1 = self.cleaned_data.get("password1")
password2 = self.cleaned_data.get("password2")
if password1 and password2 and password1 != password2:
raise forms.ValidationError("密码校验失败,两次密码不一致。")
raise forms.ValidationError(_("密码校验失败,两次密码不一致。"))
return password2


Expand All @@ -41,7 +41,7 @@ class UserChangeForm(forms.ModelForm):
the user, but replaces the password field with admin's
password hash display field.
"""
password = ReadOnlyPasswordHashField(label=("密码Hash值"), help_text=("<a href=\"../password/\">点击修改密码</a>."))
password = ReadOnlyPasswordHashField(label=(_("密码Hash值")), help_text=("<a href=\"../password/\">点击修改密码</a>."))
class Meta:
model = models.UserProfile
fields = ('username', 'is_active', 'is_admin')
Expand Down Expand Up @@ -72,7 +72,7 @@ class UserAdmin(BaseUserAdmin):
list_display = ('username', 'rid')
list_filter = ('is_admin', 'is_active')
fieldsets = (
('基本信息', {'fields': ('username', 'password', 'is_active', 'is_admin', 'rid', 'uuid', 'deviceInfo',)}),
(_('基本信息'), {'fields': ('username', 'password', 'is_active', 'is_admin', 'rid', 'uuid', 'deviceInfo',)}),

)
readonly_fields = ( 'rid', 'uuid')
Expand All @@ -95,5 +95,5 @@ class UserAdmin(BaseUserAdmin):
admin.site.register(models.RustDesDevice, models.RustDesDeviceAdmin)
admin.site.register(models.ShareLink, models.ShareLinkAdmin)
admin.site.unregister(Group)
admin.site.site_header = 'RustDesk自建Web'
admin.site.site_title = '未定义'
admin.site.site_header = _('RustDesk自建Web')
admin.site.site_title = _('未定义')
60 changes: 60 additions & 0 deletions api/front_locale.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
from django.utils.translation import gettext as _


_('管理后台')
_('ID列表')
_('分享机器')
_('这么简易的东西,忘记密码这功能就没必要了吧。')
_('立即注册')
_('创建时间')
_('注册成功,请前往登录页登录。')
_('注册日期')
_('2、所分享的机器,被分享人享有相同的权限,如果机器设置了保存密码,被分享人也可以直接连接。')
_('导出xlsx')
_('生成分享链接')
_('请输入8~20位密码。可以包含字母、数字和特殊字符。')
_('尾页')
_('请确认密码')
_('注册')
_('内存')
_('首页')
_('网页控制')
_('注册时间')
_('链接地址')
_('请输入密码')
_('系统用户名')
_('状态')
_('已有账号?立即登录')
_('密码')
_('别名')
_('上一页')
_('更新时间')
_('综合屏')
_('平台')
_('全部用户')
_('注册页')
_('分享机器给其他用户')
_('所有设备')
_('连接密码')
_('设备统计')
_('所属用户')
_('分享')
_('请输入用户名')
_('1、链接有效期为15分钟,切勿随意分享给他人。')
_('CPU')
_('客户端ID')
_('下一页')
_('登录')
_('退出')
_('请将要分享的机器调整到右侧')
_('成功!如需分享,请复制以下链接给其他人:<br>')
_('忘记密码?')
_('计算机名')
_('两次输入密码不一致!')
_('页码')
_('版本')
_('用户名')
_('3、为保障安全,链接有效期为15分钟、链接仅有效1次。链接一旦被(非分享人的登录用户)访问,分享生效,后续访问链接失效。')
_('系统')
_('我的机器')
_('信息')
238 changes: 238 additions & 0 deletions api/migrations/0003_alter_rustdesdevice_options_and_more.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,238 @@
# Generated by Django 4.2.7 on 2024-03-15 20:52

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("api", "0002_alter_rustdesdevice_cpu_alter_rustdesdevice_hostname_and_more"),
]

operations = [
migrations.AlterModelOptions(
name="rustdesdevice",
options={
"ordering": ("-rid",),
"verbose_name": "Device",
"verbose_name_plural": "Device List",
},
),
migrations.AlterModelOptions(
name="rustdeskpeer",
options={
"ordering": ("-username",),
"verbose_name": "Peers",
"verbose_name_plural": "Peers List",
},
),
migrations.AlterModelOptions(
name="rustdesktag",
options={
"ordering": ("-uid",),
"verbose_name": "Tags",
"verbose_name_plural": "Tags List",
},
),
migrations.AlterModelOptions(
name="rustdesktoken",
options={
"ordering": ("-username",),
"verbose_name": "Token",
"verbose_name_plural": "Token List",
},
),
migrations.AlterModelOptions(
name="sharelink",
options={
"ordering": ("-create_time",),
"verbose_name": "Share Link",
"verbose_name_plural": "Link List",
},
),
migrations.AlterModelOptions(
name="userprofile",
options={
"permissions": (
("view_task", "Can see available tasks"),
("change_task_status", "Can change the status of tasks"),
("close_task", "Can remove a task by setting its status as closed"),
),
"verbose_name": "User",
"verbose_name_plural": "User List",
},
),
migrations.AlterField(
model_name="rustdesdevice",
name="create_time",
field=models.DateTimeField(
auto_now_add=True, verbose_name="Device Registration Time"
),
),
migrations.AlterField(
model_name="rustdesdevice",
name="hostname",
field=models.CharField(max_length=100, verbose_name="Hostname"),
),
migrations.AlterField(
model_name="rustdesdevice",
name="memory",
field=models.CharField(max_length=100, verbose_name="Memory"),
),
migrations.AlterField(
model_name="rustdesdevice",
name="os",
field=models.CharField(max_length=100, verbose_name="Operating System"),
),
migrations.AlterField(
model_name="rustdesdevice",
name="rid",
field=models.CharField(blank=True, max_length=60, verbose_name="Client ID"),
),
migrations.AlterField(
model_name="rustdesdevice",
name="username",
field=models.CharField(
blank=True, max_length=100, verbose_name="System Username"
),
),
migrations.AlterField(
model_name="rustdesdevice",
name="version",
field=models.CharField(max_length=100, verbose_name="Client Version"),
),
migrations.AlterField(
model_name="rustdeskpeer",
name="alias",
field=models.CharField(max_length=30, verbose_name="Alias"),
),
migrations.AlterField(
model_name="rustdeskpeer",
name="hostname",
field=models.CharField(max_length=30, verbose_name="Operating System Name"),
),
migrations.AlterField(
model_name="rustdeskpeer",
name="platform",
field=models.CharField(max_length=30, verbose_name="Platform"),
),
migrations.AlterField(
model_name="rustdeskpeer",
name="rhash",
field=models.CharField(
max_length=60, verbose_name="Device Connection Password"
),
),
migrations.AlterField(
model_name="rustdeskpeer",
name="rid",
field=models.CharField(max_length=60, verbose_name="Client ID"),
),
migrations.AlterField(
model_name="rustdeskpeer",
name="tags",
field=models.CharField(max_length=30, verbose_name="Tag"),
),
migrations.AlterField(
model_name="rustdeskpeer",
name="uid",
field=models.CharField(max_length=16, verbose_name="User ID"),
),
migrations.AlterField(
model_name="rustdeskpeer",
name="username",
field=models.CharField(max_length=20, verbose_name="System Username"),
),
migrations.AlterField(
model_name="rustdesktag",
name="tag_color",
field=models.CharField(blank=True, max_length=60, verbose_name="Tag Color"),
),
migrations.AlterField(
model_name="rustdesktag",
name="tag_name",
field=models.CharField(max_length=60, verbose_name="Tag Name"),
),
migrations.AlterField(
model_name="rustdesktag",
name="uid",
field=models.CharField(max_length=16, verbose_name="Belongs to User ID"),
),
migrations.AlterField(
model_name="rustdesktoken",
name="access_token",
field=models.CharField(
blank=True, max_length=60, verbose_name="Access Token"
),
),
migrations.AlterField(
model_name="rustdesktoken",
name="create_time",
field=models.DateTimeField(auto_now_add=True, verbose_name="Login Time"),
),
migrations.AlterField(
model_name="rustdesktoken",
name="uid",
field=models.CharField(max_length=16, verbose_name="User ID"),
),
migrations.AlterField(
model_name="rustdesktoken",
name="username",
field=models.CharField(max_length=20, verbose_name="Username"),
),
migrations.AlterField(
model_name="rustdesktoken",
name="uuid",
field=models.CharField(max_length=60, verbose_name="UUID"),
),
migrations.AlterField(
model_name="sharelink",
name="create_time",
field=models.DateTimeField(auto_now_add=True, verbose_name="Creation Time"),
),
migrations.AlterField(
model_name="sharelink",
name="is_expired",
field=models.BooleanField(default=False, verbose_name="Is Expired"),
),
migrations.AlterField(
model_name="sharelink",
name="is_used",
field=models.BooleanField(default=False, verbose_name="Is Used"),
),
migrations.AlterField(
model_name="sharelink",
name="peers",
field=models.CharField(max_length=20, verbose_name="Machine ID List"),
),
migrations.AlterField(
model_name="sharelink",
name="shash",
field=models.CharField(max_length=60, verbose_name="Link Key"),
),
migrations.AlterField(
model_name="sharelink",
name="uid",
field=models.CharField(max_length=16, verbose_name="User ID"),
),
migrations.AlterField(
model_name="userprofile",
name="deviceInfo",
field=models.TextField(blank=True, verbose_name="Login Information:"),
),
migrations.AlterField(
model_name="userprofile",
name="is_active",
field=models.BooleanField(default=True, verbose_name="Is Activated"),
),
migrations.AlterField(
model_name="userprofile",
name="is_admin",
field=models.BooleanField(default=False, verbose_name="Is Admin"),
),
migrations.AlterField(
model_name="userprofile",
name="username",
field=models.CharField(max_length=50, unique=True, verbose_name="Username"),
),
]
Loading

0 comments on commit a8b07cb

Please sign in to comment.