hiddifypanel 10.30.8.dev1__tar.gz → 10.30.9.dev0__tar.gz

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/HISTORY.md

@@ -15,6 +15,8 @@
 
 #### Fix
 
+* Sorting issue. 
+
 * Api uuid bug. 
 
 * Translation bug. 
@@ -29,6 +31,18 @@
 
 #### Other
 
+* Update. 
+
+* Update translations. 
+
+* Update_translation. 
+
+* Merge branch 'main' of github.com:hiddify/Hiddify-Panel. 
+
+* Update translations. 
+
+* Add id in user. 
+
 * Update translations. 
 
 * Temporary remove active devices. 

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hiddifypanel
-Version: 10.30.8.dev1
+Version: 10.30.9.dev0
 Summary: hiddifypanel multi proxy panel
 Home-page: https://github.com/hiddify/hiddify-manager/
 Author: hiddify

hiddifypanel-10.30.9.dev0/hiddifypanel/VERSION

@@ -0,0 +1 @@
+10.30.9.dev0

hiddifypanel-10.30.9.dev0/hiddifypanel/VERSION.py

@@ -0,0 +1,3 @@
+__version__='10.30.9.dev0'
+from datetime import datetime
+__release_date__= datetime.strptime('2024-07-12','%Y-%m-%d')

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/hutils/network/net.py

@@ -136,6 +136,7 @@ def get_ip(version: Literal[4, 6], retry: int = 5) -> ipaddress.IPv4Address | ip
         ip = get_ip(version, retry=retry - 1)
     return ip
 
+
 def get_random_domains(count: int = 1, retry: int = 3) -> List[str]:
     try:
         irurl = "https://api.ooni.io/api/v1/measurements?probe_cc=IR&test_name=web_connectivity&anomaly=false&confirmed=false&failure=false&order_by=test_start_time&limit=1000"
@@ -310,7 +311,7 @@ def is_in_same_asn(domain_or_ip: str, domain_or_ip_target: str) -> bool:
         print(f"An error occurred: {e}")
         return False
 
-        # hutils.flask.flash(_("selected domain for REALITY is not in the same ASN. To better use of the protocol, it is better to find a domain in the same ASN.") +
+        # hutils.flask.flash(_("domain.reality.asn_issue") +
         #                    f"<br> Server ASN={asn_ipv4.get('autonomous_system_organization','unknown')}<br>{domain}_ASN={asn_dip.get('autonomous_system_organization','unknown')}", "warning")
 
 
@@ -342,8 +343,9 @@ def is_ip(input: str):
     except:
         return False
 
-def resolve_domain_with_api(domain:str) -> str:
+
+def resolve_domain_with_api(domain: str) -> str:
     if not domain:
         return ''
     endpoint = f'http://ip-api.com/json/{domain}?fields=query'
-    return str(requests.get(endpoint).json().get('query'))
+    return str(requests.get(endpoint).json().get('query'))

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/models/user.py

@@ -290,7 +290,7 @@ class User(BaseAccount, SerializerMixin):
         return schema.dump(User())
 
     def to_schema(self):
-        user_dict = self.to_dict()
+        user_dict = self.to_dict(dump_id=True)
         from hiddifypanel.panel.commercial.restapi.v2.admin.user_api import UserSchema
         return UserSchema().load(user_dict)
 
@@ -317,7 +317,8 @@ class User(BaseAccount, SerializerMixin):
                 'wg_pk': self.wg_pk,
                 'wg_pub': self.wg_pub,
                 'wg_psk': self.wg_psk,
-                'is_active': self.is_active
+                'is_active': self.is_active,
+                'enable': self.enable
                 }
 
     # @staticmethod

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/admin/Actions.py

@@ -65,7 +65,7 @@ class Actions(FlaskView):
         domain_changed = request.args.get("domain_changed", str(domain_changed)).lower() == "true"
         complete_install = request.args.get("complete_install", str(complete_install)).lower() == "true"
         if domain_changed:
-            hutils.flask.flash((_('Your domains changed. Please do not forget to copy admin links, otherwise you can not access to the panel anymore.')), 'info')
+            hutils.flask.flash((_('domain.changed_in_domain_warning')), 'info')
         # hutils.flask.flash(f'complete_install={complete_install} domain_changed={domain_changed} ', 'info')
         # return render_template("result.html")
         # hiddify.add_temporary_access()
@@ -87,7 +87,7 @@ class Actions(FlaskView):
 
         resp = render_template("result.html",
                                out_type="info",
-                               out_msg=_("Success! Please wait around 4 minutes to make sure everything is updated. During this time, please save your proxy links which are:") +
+                               out_msg=_("admin.waiting_for_update") +
                                admin_links,
                                log_file_url=get_log_api_url(),
                                log_file="0-install.log",

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/admin/AdminstratorAdmin.py

@@ -72,7 +72,7 @@ class AdminstratorAdmin(AdminLTEModelView):
 
     column_descriptions = dict(
         comment=_("Add some text that is only visible to super_admin."),
-        mode=_("Define the admin mode. "),
+        mode=_("admin.define_mode"),
     )
     # create_modal = True
     can_export = False

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/admin/Dashboard.py

@@ -22,7 +22,7 @@ class Dashboard(FlaskView):
             return redirect(hurl_for("admin.QuickSetup:index"))
 
         if hutils.utils.is_panel_outdated():
-            hutils.flask.flash(_('This version of hiddify panel is outdated. Please update it from admin area.'), "danger")  # type: ignore
+            hutils.flask.flash(_('outdated_panel'), "danger")  # type: ignore
 
         childs = None
         admin_id = request.args.get("admin_id") or g.account.id
@@ -48,8 +48,7 @@ class Dashboard(FlaskView):
 
         if def_user and sslip_domains:
             quick_setup = hurl_for("admin.QuickSetup:index")
-            hutils.flask.flash((_('It seems that you have not setup the system completely. <a class="btn btn-success" href="%(quick_setup)s">Click here</a> to complete setup.',
-                                  quick_setup=quick_setup)), 'warning')  # type: ignore
+            hutils.flask.flash((_('admin.incomplete_setup_warning', quick_setup=quick_setup)), 'warning')  # type: ignore
             if hutils.node.is_parent():
                 hutils.flask.flash(
                     _("Please understand that parent panel is under test and the plan and the condition of use maybe change at anytime."), "danger")  # type: ignore
@@ -61,7 +60,7 @@ class Dashboard(FlaskView):
                     _("Please understand that parent panel is under test and the plan and the condition of use maybe change at anytime."), "danger")  # type: ignore
         elif def_user:
             d = domains[0]
-            hutils.flask.flash((_('It seems that you have not created any users yet. Default user link: %(default_link)s',
+            hutils.flask.flash((_("admin.no_user_warning",
                                default_link=hiddify.get_html_user_link(def_user, d))), 'secondary')  # type: ignore
         if hutils.network.is_ssh_password_authentication_enabled():
             hutils.flask.flash(_('serverssh.password-login.warning'), "warning")  # type: ignore

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/admin/DomainAdmin.py

@@ -46,11 +46,11 @@ class DomainAdmin(AdminLTEModelView):
         mode=_("Direct mode means you want to use your server directly (for usual use), CDN means that you use your server on behind of a CDN provider."),
         cdn_ip=_("config.cdn_forced_host.description"),
         show_domains=_(
-            'You can select the configs with which domains show be shown in the user area. If you select all, automatically, all the new domains will be added for each users.'),
+            'domain.show_domains_description'),
         alias=_('The name shown in the configs for this domain.'),
         servernames=_('config.reality_server_names.description'),
         sub_link_only=_('This can be used for giving your users a permanent non blockable links.'),
-        grpc=_('gRPC is a H2 based protocol. Maybe it is faster for you!'))
+        grpc=_('grpc-proxy.description'))
 
     # create_modal = True
     can_export = False
@@ -243,7 +243,7 @@ class DomainAdmin(AdminLTEModelView):
                     if not hutils.network.is_in_same_asn(d, ipv4_list[0]):
                         server_asn = hutils.network.get_ip_asn(ipv4_list[0])
                         domain_asn = hutils.network.get_ip_asn(dip)  # type: ignore
-                        msg = _("selected domain for REALITY is not in the same ASN. To better use of the protocol, it is better to find a domain in the same ASN.") + \
+                        msg = _("domain.reality.asn_issue") + \
                             (f"<br> Server ASN={server_asn}<br>{d}_ASN={domain_asn}" if server_asn or domain_asn else "")
                         hutils.flask.flash(msg, 'warning')
 

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/admin/QuickSetup.py

@@ -112,10 +112,10 @@ def get_quick_setup_form(empty=False):
         domain_regex = "^([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})$"
 
         domain_validators = [
-            wtf.validators.Regexp(domain_regex, re.IGNORECASE, _("config.Invalid domain")),
+            wtf.validators.Regexp(domain_regex, re.IGNORECASE, _("config.Invalid_domain")),
             validate_domain,
-            wtf.validators.NoneOf([d.domain.lower() for d in Domain.query.all()], _("config.Domain already used")),
-            wtf.validators.NoneOf([c.value.lower() for c in StrConfig.query.all() if "fakedomain" in c.key and c.key != ConfigEnum.decoy_domain], _("config.Domain already used"))]
+            wtf.validators.NoneOf([d.domain.lower() for d in Domain.query.all()], _("config.Domain_already_used")),
+            wtf.validators.NoneOf([c.value.lower() for c in StrConfig.query.all() if "fakedomain" in c.key and c.key != ConfigEnum.decoy_domain], _("config.Domain_already_used"))]
         domain = wtf.StringField(
             _("domain.domain"),
             domain_validators,
@@ -132,7 +132,7 @@ def get_quick_setup_form(empty=False):
             "config.block_iran_sites.description"), default=hconfig(ConfigEnum.block_iran_sites))
         # enable_vmess = SwitchField(_("config.vmess_enable.label"), description=_("config.vmess_enable.description"), default=hconfig(ConfigEnum.vmess_enable))
         decoy_domain = wtf.StringField(_("config.decoy_domain.label"), description=_("config.decoy_domain.description"), default=hconfig(
-            ConfigEnum.decoy_domain), validators=[wtf.validators.Regexp(domain_regex, re.IGNORECASE, _("config.Invalid domain")), hutils.flask.validate_domain_exist])
+            ConfigEnum.decoy_domain), validators=[wtf.validators.Regexp(domain_regex, re.IGNORECASE, _("config.Invalid_domain")), hutils.flask.validate_domain_exist])
         submit = wtf.SubmitField(_('Submit'))
 
     return QuickSetupForm(None) if empty else QuickSetupForm()
@@ -146,7 +146,8 @@ def validate_domain(form, field):
 
     myip = hutils.network.get_ip(4)
     if dip and myip != dip:
-        raise ValidationError(_("Domain (%(domain)s)-> IP=%(domain_ip)s is not matched with your ip=%(server_ip)s which is required in direct mode", server_ip=myip, domain_ip=dip, domain=domain))
+        raise ValidationError(_("Domain (%(domain)s)-> IP=%(domain_ip)s is not matched with your ip=%(server_ip)s which is required in direct mode",
+                              server_ip=myip, domain_ip=dip, domain=domain))
 
 
 def admin_link():

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/admin/SettingAdmin.py

@@ -267,16 +267,16 @@ def get_config_form():
                 render_kw = {'class': "ltr"}
                 validators = []
                 if c.key == ConfigEnum.domain_fronting_domain:
-                    validators.append(wtf.validators.Regexp("^([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})|$", re.IGNORECASE, _("config.Invalid domain")))
+                    validators.append(wtf.validators.Regexp("^([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})|$", re.IGNORECASE, _("config.Invalid_domain")))
                     validators.append(hutils.flask.validate_domain_exist)
                 elif '_domain' in c.key or "_fakedomain" in c.key:
-                    validators.append(wtf.validators.Regexp("^([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})$", re.IGNORECASE, _("config.Invalid domain")))
+                    validators.append(wtf.validators.Regexp("^([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})$", re.IGNORECASE, _("config.Invalid_domain")))
                     validators.append(hutils.flask.validate_domain_exist)
 
                     if c.key != ConfigEnum.decoy_domain:
-                        validators.append(wtf.validators.NoneOf([d.domain.lower() for d in Domain.query.all()], _("config.Domain already used")))
+                        validators.append(wtf.validators.NoneOf([d.domain.lower() for d in Domain.query.all()], _("config.Domain_already_used")))
                         validators.append(wtf.validators.NoneOf(
-                            [cc.value.lower() for cc in StrConfig.query.filter(StrConfig.child_id == Child.current().id).all() if cc.key != c.key and "fakedomain" in cc.key and cc.key != ConfigEnum.decoy_domain], _("config.Domain already used")))
+                            [cc.value.lower() for cc in StrConfig.query.filter(StrConfig.child_id == Child.current().id).all() if cc.key != c.key and "fakedomain" in cc.key and cc.key != ConfigEnum.decoy_domain], _("config.Domain_already_used")))
 
                     render_kw['required'] = ""
                     if len(c.value) < 3:
@@ -292,36 +292,36 @@ def get_config_form():
                 if c.key == ConfigEnum.parent_panel:
                     validators.append(wtf.validators.Regexp("()|(http(s|)://([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})/.*)", re.IGNORECASE, _("Invalid admin link")))
                 if c.key == ConfigEnum.telegram_bot_token:
-                    validators.append(wtf.validators.Regexp("()|^([0-9]{8,12}:[a-zA-Z0-9_-]{30,40})|$", re.IGNORECASE, _("config.Invalid telegram bot token")))
+                    validators.append(wtf.validators.Regexp("()|^([0-9]{8,12}:[a-zA-Z0-9_-]{30,40})|$", re.IGNORECASE, _("config.Invalid_telegram_bot_token")))
                 if c.key == ConfigEnum.branding_site:
                     validators.append(wtf.validators.Regexp(
-                        "()|(http(s|)://([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})/?.*)", re.IGNORECASE, _("config.Invalid brand link")))
+                        "()|(http(s|)://([A-Za-z0-9\\-\\.]+\\.[a-zA-Z]{2,})/?.*)", re.IGNORECASE, _("config.Invalid_brand_link")))
                     # render_kw['required']=""
 
                 if 'secret' in c.key:
                     validators.append(wtf.validators.Regexp(
-                        "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$", re.IGNORECASE, _('config.invalid uuid')))
+                        "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$", re.IGNORECASE, _('config.invalid_uuid')))
                     render_kw['required'] = ""
 
                 if c.key == ConfigEnum.proxy_path:
-                    validators.append(wtf.validators.Regexp("^[a-zA-Z0-9]*$", re.IGNORECASE, _("config.Invalid proxy path")))
+                    validators.append(wtf.validators.Regexp("^[a-zA-Z0-9]*$", re.IGNORECASE, _("config.Invalid_proxy_path")))
                     render_kw['required'] = ""
 
                 if 'port' in c.key:
                     if c.key in [ConfigEnum.http_ports, ConfigEnum.tls_ports]:
-                        validators.append(wtf.validators.Regexp("^(\\d+)(,\\d+)*$", re.IGNORECASE, _("config.Invalid port")))
+                        validators.append(wtf.validators.Regexp("^(\\d+)(,\\d+)*$", re.IGNORECASE, _("config.Invalid_port")))
                         render_kw['required'] = ""
                     else:
-                        validators.append(wtf.validators.Regexp("^(\\d+)(,\\d+)*$|^$", re.IGNORECASE, _("config.Invalid port")))
+                        validators.append(wtf.validators.Regexp("^(\\d+)(,\\d+)*$|^$", re.IGNORECASE, _("config.Invalid_port")))
                     # validators.append(wtf.validators.Regexp("^(\d+)(,\d+)*$",re.IGNORECASE,_("config.port is required")))
 
                 # tls tricks validations
                 if c.key in [ConfigEnum.tls_fragment_size, ConfigEnum.tls_fragment_sleep, ConfigEnum.tls_padding_length, ConfigEnum.wireguard_noise_trick]:
-                    validators.append(wtf.validators.Regexp("^\\d+-\\d+$", re.IGNORECASE, _("config.Invalid! The pattern is number-number") + f' {c.key}'))
+                    validators.append(wtf.validators.Regexp("^\\d+-\\d+$", re.IGNORECASE, _("config.Invalid_The_pattern_is_number-number") + f' {c.key}'))
                 # mux and hysteria validations
                 if c.key in [ConfigEnum.hysteria_up_mbps, ConfigEnum.hysteria_down_mbps, ConfigEnum.mux_max_connections, ConfigEnum.mux_min_streams, ConfigEnum.mux_max_streams,
                              ConfigEnum.mux_brutal_down_mbps, ConfigEnum.mux_brutal_up_mbps]:
-                    validators.append(wtf.validators.Regexp("^\\d+$", re.IGNORECASE, _("config.Invalid! it should be a number only") + f' {c.key}'))
+                    validators.append(wtf.validators.Regexp("^\\d+$", re.IGNORECASE, _("config.Invalid_it_should_be_a_number_only") + f' {c.key}'))
 
                 for val in validators:
                     if hasattr(val, "regex"):

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/admin/UserAdmin.py

@@ -10,7 +10,7 @@ from wtforms.validators import NumberRange
 from flask_babel import lazy_gettext as _
 from flask import g, request  # type: ignore
 from markupsafe import Markup
-from sqlalchemy import desc
+from sqlalchemy import desc, func
 
 from hiddifypanel.hutils.flask import hurl_for
 from wtforms.validators import Regexp, ValidationError
@@ -25,6 +25,7 @@ from hiddifypanel import hutils
 
 
 class UserAdmin(AdminLTEModelView):
+    column_default_sort = ('id', False)  # Sort by username in ascending order
 
     column_sortable_list = ["is_active", "name", "current_usage", 'mode', "remaining_days", "comment", 'last_online', "uuid", 'remaining_days']
     column_searchable_list = ["uuid", "name"]
@@ -112,7 +113,7 @@ class UserAdmin(AdminLTEModelView):
         # usage_limit_GB="in GB",
         # current_usage_GB="in GB"
         comment=_("Add some text that is only visible to you."),
-        mode=_("Define the user mode. Should the usage reset every month?"),
+        mode=_("user.define_mode"),
         last_reset_time=_("If monthly is enabled, the usage will be reset after 30 days from this date."),
         start_date=_("From when the user package will be started? Empty for start from first connection"),
         package_days=_("How many days this package should be available?")
@@ -376,15 +377,17 @@ class UserAdmin(AdminLTEModelView):
             abort(403)
 
         query = query.filter(User.added_by.in_(admin.recursive_sub_admins_ids()))
-        query = query.order_by(desc(User.id))
+
         return query
 
     # Override get_count_query() to include the filter condition in the count query
     def get_count_query(self):
         # Get the base count query
 
-        # query = query.session.query(func.count(User.id))
+        # query = self.session.query(func.count(User.id)).
+
         query = super().get_count_query()
+
         admin_id = int(request.args.get("admin_id") or g.account.id)
         if admin_id not in g.account.recursive_sub_admins_ids():
             abort(403)

hiddifypanel-10.30.9.dev0/hiddifypanel/panel/admin/templates/model/domain_list.html

@@ -0,0 +1,20 @@
+{% extends 'hiddify-flask-admin/list.html' %}
+
+{% block body %}
+{{super()}}
+
+<div class="callout callout-info">
+    {{_('domain.intro')}}
+</div>
+
+
+<style>
+    .table td {
+        vertical-align: middle;
+    }
+
+    td.col-domain {
+        /* direction:ltr; */
+    }
+</style>
+{% endblock %}

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/admin/templates/model/user_list.html

@@ -11,7 +11,8 @@
             <button onclick="show_send_message('all')" type="button" class="btn hbtn bg-h-green">
                 {{_("All Users")}}
             </button>
-            <button onclick="show_send_message('active')" type="button" class="btn hbtn bg-h-green" style="margin-left: 5px;margin-right: 5px;">
+            <button onclick="show_send_message('active')" type="button" class="btn hbtn bg-h-green"
+                style="margin-left: 5px;margin-right: 5px;">
                 {{_("Active Users")}}
             </button>
             <button onclick="show_send_message('selected')" type="button" class="btn hbtn bg-h-green">
@@ -22,9 +23,11 @@
         <div style="margin-top: 10px;">
             <button onclick="show_send_message('offline 1h')" type="button" class="btn  hbtn bg-h-red">
                 {{_("Offline more than 1 hour")}}</button>
-            <button onclick="show_send_message('offline 1d')" type="button" class="btn  hbtn bg-h-red" style="margin-left: 5px;">
+            <button onclick="show_send_message('offline 1d')" type="button" class="btn  hbtn bg-h-red"
+                style="margin-left: 5px;">
                 {{_("Offline more than 1 day")}}</button>
-            <button onclick="show_send_message('offline 1w')" type="button" class="btn hbtn bg-h-red" style="margin-left: 5px;margin-right: 5px;">
+            <button onclick="show_send_message('offline 1w')" type="button" class="btn hbtn bg-h-red"
+                style="margin-left: 5px;margin-right: 5px;">
                 {{_("Offline more than 1 week")}}
             </button>
             <button onclick="show_send_message('expired')" type="button" class="btn hbtn bg-h-red">
@@ -37,7 +40,7 @@
 {{super()}}
 
 <div class="callout callout-success">
-    {{_('User usage will be updated every 6 minutes. To update it now click <a href="%(link)s" class="btn btn-info">here</a>',link=hurl_for("admin.Actions:update_usage"))}}
+    {{_('adminuser.force_update_usage',link=hurl_for("admin.Actions:update_usage"))}}
 
 </div>
 <style>
@@ -155,4 +158,4 @@
     }
 
 </script>
-{% endblock %}
+{% endblock %}

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/admin/templates/quick_setup.html

@@ -5,7 +5,7 @@
 {% block tail %}
 {{super()}}
 
-{{modal('quicksetup',_('Save Link'),_('Please note that your panel can be accessed only via <a href="%(adminlink)s" class="btn btn-primary copy-link">%(adminlink)s</a>. Please save this link.',adminlink=admin_link),show=Fales)}}
+{{modal('quicksetup',_('Save Link'),_('admin.save_panel_link',adminlink=admin_link),show=Fales)}}
 
 <script>
     disable_notif = false

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/admin/templates/result.html

@@ -40,7 +40,8 @@ page."),temp_link(),show=False)}}
     <label class="col-6" id="process-title"></label> <label class="col-6" id="process-details"></label>
   </div>
   <div class="progress">
-    <div id="progress" class="progress-bar" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
+    <div id="progress" class="progress-bar" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0"
+      aria-valuemax="100"></div>
   </div>
 </div>
 {% endif %}
@@ -153,7 +154,7 @@ page."),temp_link(),show=False)}}
             $("#process-title").html("")
             bootbox.alert({
               title: '{{_("Success")}}',
-              message: '{{_("The action done successfully. You can now leave this page.")}}',
+              message: '{{_("admin.action_done_sucess")}}',
               locale: '{{get_locale()}}',
             });
           }

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/commercial/ParentDomainAdmin.py

@@ -25,7 +25,7 @@
 #     column_descriptions = dict(
 #         domain=_("domain.description"),
 #         alias=_('The name shown in the configs for this domain.'),
-#         show_domains=_('You can select the configs with which domains show be shown in the user area. If you select all, automatically, all the new domains will be added for each users.')
+#         show_domains=_('domain.show_domains_description')
 #         # current_usage_GB="in GB"
 #     )
 

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/commercial/restapi/v2/admin/schema.py

@@ -129,6 +129,7 @@ class UserSchema(Schema):
     lang = Enum(Lang, required=False, allow_none=True, description="The language of the user")
     enable = Boolean(required=False, description="Whether the user is enabled or not")
     is_active = Boolean(required=False, description="Whether the user is active for using hiddify")
+    id = Integer(required=False, description="never use it, only for better presentation")
 
 
 class PostUserSchema(UserSchema):
@@ -137,6 +138,7 @@ class PostUserSchema(UserSchema):
         # the uuid is sent in the url path
         self.fields['uuid'].required = False
         self.fields['uuid'].allow_none = True
+        del self.fields['id']
 
 
 class PatchUserSchema(UserSchema):
@@ -146,6 +148,7 @@ class PatchUserSchema(UserSchema):
         self.fields['uuid'].allow_none = True,
         self.fields['name'].required = False
         self.fields['name'].allow_none = True,
+        del self.fields['id']
 
 
 # endregion

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/commercial/telegrambot/Usage.py

@@ -30,10 +30,7 @@ def send_welcome(message):
         with force_locale(user.lang or hconfig(ConfigEnum.lang)):
             bot.reply_to(message, get_usage_msg(user.uuid), reply_markup=user_keyboard(user.uuid))
     else:
-        bot.reply_to(message,
-                     _("Hooray \U0001F389 \U0001F389 \U0001F389 \n"
-                       "Welcome to hiddifybot.\n"
-                       "Start by clicking the link on the panel or entering your UUID."))
+        bot.reply_to(message, _("bot.welcome"))
 
 
 def user_keyboard(uuid):

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/commercial/telegrambot/admin.py

@@ -32,7 +32,7 @@ def send_welcome(message):
 
 def start_admin(message):
 
-    bot.reply_to(message, _("Welcome to admin bot. Choose your action"), reply_markup=admin_keyboard_main())
+    bot.reply_to(message, _("bot.admin_welcome"), reply_markup=admin_keyboard_main())
 
 
 def get_admin_by_tgid(message):
@@ -136,14 +136,14 @@ def create_package(call):  # <- passes a CallbackQuery type object to your funct
                 days = int(splt[2])
                 count = int(splt[3])
                 domain = int(splt[4])
-                new_text = _("Please Wait...")
+                new_text = _("Please Wait")
                 bot.edit_message_text(new_text, call.message.chat.id, call.message.message_id, reply_markup=None)
                 domain = Domain.query.filter(Domain.id == domain).first()
                 from . import Usage
                 admin_id = admin.id
                 admin_name = admin.name
                 for i in range(1, count + 1):
-                    new_text = _("Please Wait...") + f' {i}/{count}'
+                    new_text = _("Please Wait") + f' {i}/{count}'
                     bot.edit_message_text(new_text, call.message.chat.id, call.message.message_id, reply_markup=None)
                     user = User(package_days=days, usage_limit_GB=gig, name=f"{admin_name} auto {i}  {datetime.date.today()}", added_by=admin_id)
                     db.session.add(user)

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/commercial/telegrambot/information.py

@@ -52,9 +52,7 @@ def prepare_hello_message():
     @return: A text message
     """
 
-    response = _("Hooray \U0001F389 \U0001F389 \U0001F389 \n"
-                 "Welcome to hiddifybot.\n"
-                 "Start by clicking the link on the panel or entering your UUID.")
+    response = _("bot.welcome")
 
     return response
 

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/common_bp/login.py

@@ -16,11 +16,11 @@ import re
 
 class LoginForm(FlaskForm):
     secret_textbox = wtf.fields.StringField(_(f'login.secret.label'), [wtf.validators.Regexp(
-        "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$", re.IGNORECASE, _('config.invalid uuid'))], default='',
+        "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$", re.IGNORECASE, _('config.invalid_uuid'))], default='',
         description=_(f'login.secret.description'), render_kw={
         'required': "",
         'pattern': "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$",
-        'message': _('config.invalid uuid')
+        'message': _('config.invalid_uuid')
     })
     submit = wtf.fields.SubmitField(_('Submit'))
 

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/user/templates/home/home.html

@@ -19,8 +19,11 @@
                 <i class="fa-solid fa-moon"></i>
             </a>
             {% endif %}
-            <button class='btn btn-sm btn-default' onclick='show_video("features")'><i class="fa-solid fa-question"></i></button> <a href="{{'https://github.com/hiddify/hiddify-manager/wiki'}}">
-                {{hconfig(ConfigEnum.branding_title) or _('user.home.title')}}</a>: <div class="d-inline-flex">{{_('Welcome %(user)s',user=user.name if user.name!="default" else "")}}</div>
+            <button class='btn btn-sm btn-default' onclick='show_video("features")'><i
+                    class="fa-solid fa-question"></i></button> <a
+                href="{{'https://github.com/hiddify/hiddify-manager/wiki'}}">
+                {{hconfig(ConfigEnum.branding_title) or _('user.home.title')}}</a>: <div class="d-inline-flex">
+                {{_('Welcome %(user)s',user=user.name if user.name!="default" else "")}}</div>
         </h1>
 
 
@@ -48,19 +51,27 @@
                 <h3 class="card-title p-1"> </h3>
                 <ul class="nav nav-pills p-2">
                     {% if telegram_enable %}
-                    <li class="nav-item"><a class="nav-link" href="#telegram" data-toggle="tab"><i class="fa-brands fa-telegram fa-margin"></i> {{_('telegram')}}</a></li>
+                    <li class="nav-item"><a class="nav-link" href="#telegram" data-toggle="tab"><i
+                                class="fa-brands fa-telegram fa-margin"></i> {{_('telegram')}}</a></li>
                     {% endif %}
-                    <li class="nav-item"><a class="nav-link {{" active" if ua.os.family=="Android" else "" }}" href="#android" data-toggle="tab"><i class="fa-brands fa-android fa-margin"></i> {{_('android')}}</a></li>
-                    <li class="nav-item"><a class="nav-link {{" active" if ua.os.family=="iOS" else "" }}" href="#ios" data-toggle="tab"><i class="fa-brands fa-app-store-ios fa-margin"></i> {{_('ios')}}</a></li>
-                    <li class="nav-item"><a class="nav-link {{" active" if ua.is_pc else "" }}" href="#windows" data-toggle="tab">
-                            <i class="fa-brands fa-windows fa-margin1"></i> <i class="fa-brands fa-apple fa-margin1"></i> <i class="fa-brands fa-linux fa-margin1"></i> {{_('desktop')}}</a></li>
+                    <li class="nav-item"><a class="nav-link {{" active" if ua.os.family=="Android" else "" }}"
+                            href="#android" data-toggle="tab"><i class="fa-brands fa-android fa-margin"></i>
+                            {{_('android')}}</a></li>
+                    <li class="nav-item"><a class="nav-link {{" active" if ua.os.family=="iOS" else "" }}" href="#ios"
+                            data-toggle="tab"><i class="fa-brands fa-app-store-ios fa-margin"></i> {{_('ios')}}</a></li>
+                    <li class="nav-item"><a class="nav-link {{" active" if ua.is_pc else "" }}" href="#windows"
+                            data-toggle="tab">
+                            <i class="fa-brands fa-windows fa-margin1"></i> <i
+                                class="fa-brands fa-apple fa-margin1"></i> <i class="fa-brands fa-linux fa-margin1"></i>
+                            {{_('desktop')}}</a></li>
 
                 </ul>
             </div><!-- /.card-header -->
             <div class="card-body">
                 <div class="tab-content">
-                    <div class="tab-pane {{" active" if not ua.is_pc and ua.os.family not in ["Android", "iOS" ] else "" }}" id="default">
-                        {{_('user.home.select os')}}
+                    <div class="tab-pane {{" active" if not ua.is_pc and ua.os.family not in ["Android", "iOS" ] else ""
+                        }}" id="default">
+                        {{_('user.home.select_os')}}
                     </div>
                     <div class="tab-pane" id="telegram">
                         {% include 'home/telegram.html' %}
@@ -94,15 +105,19 @@
             <div class="card-header d-flex p-0">
                 <h3 class="card-title p-0"></h3>
                 <ul class="nav nav-pills p-2">
-                    <li class="nav-item"><a class="nav-link" href="#all_configs" data-toggle="tab"><i class="fa-solid fa-grip fa-margin"></i> {{_('user.home.all_configs')}}</a></li>
-                    <li class="nav-item"><a class="nav-link" href="#speedtest" data-toggle="tab"><i class="fa-solid fa-gauge-high fa-margin"></i> {{_('user.home.speedtest.title')}}</a></li>
-                    <li class="nav-item"><a class="nav-link" href="#doh" data-toggle="tab"><i class="fa-solid fa-sitemap fa-margin"></i> {{_('user.home.doh')}}</a></li>
+                    <li class="nav-item"><a class="nav-link" href="#all_configs" data-toggle="tab"><i
+                                class="fa-solid fa-grip fa-margin"></i> {{_('user.home.all_configs')}}</a></li>
+                    <li class="nav-item"><a class="nav-link" href="#speedtest" data-toggle="tab"><i
+                                class="fa-solid fa-gauge-high fa-margin"></i> {{_('user.home.speedtest.title')}}</a>
+                    </li>
+                    <li class="nav-item"><a class="nav-link" href="#doh" data-toggle="tab"><i
+                                class="fa-solid fa-sitemap fa-margin"></i> {{_('user.home.doh')}}</a></li>
                 </ul>
             </div><!-- /.card-header -->
             <div class="card-body">
                 <div class="tab-content">
                     <div class="tab-pane active" id="default">
-                        {{_('user.home.select tool')}}
+                        {{_('user.home.select_tool')}}
                     </div>
                     <div class="tab-pane" id="all_configs">
                         {% include 'home/all-configs.html'%}
@@ -135,7 +150,8 @@
                         <i class="fa-solid fa-qrcode fa-margin"></i>
                     </div>
                 </div>
-                <a href="https://{{domain}}/{{hconfigs[ConfigEnum.proxy_path]}}/{{user.uuid}}/" class="card-footer share-link">
+                <a href="https://{{domain}}/{{hconfigs[ConfigEnum.proxy_path]}}/{{user.uuid}}/"
+                    class="card-footer share-link">
                     <i class="fas fa-qrcode"></i> {{_('user.home.qr-code.display')}}
                 </a>
 

{hiddifypanel-10.30.8.dev1 → hiddifypanel-10.30.9.dev0}/hiddifypanel/panel/user/templates/home/index_old.html

@@ -60,7 +60,7 @@
                 <div class="tab-content">
                     <div class="tab-pane {{" active" if not ua.is_pc and ua.os.family not in ["Android", "iOS" ] else ""
                         }}" id="default">
-                        {{_('user.home.select os')}}
+                        {{_('user.home.select_os')}}
                     </div>
                     <div class="tab-pane" id="telegram">
                         {% include 'home/telegram.html' %}
@@ -106,7 +106,7 @@
             <div class="card-body">
                 <div class="tab-content">
                     <div class="tab-pane active" id="default">
-                        {{_('user.home.select tool')}}
+                        {{_('user.home.select_tool')}}
                     </div>
                     <div class="tab-pane" id="all_configs">
                         {% include 'home/all-configs.html'%}