feat(webclient): v1.3.5 -> v1.3.6

add locale french

.github/workflows/build.yml

@@ -55,6 +55,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Set up Go environment
         uses: actions/setup-go@v4
@@ -121,6 +123,7 @@ jobs:
           name: rustdesk-api-${{ matrix.job.goos }}-${{ matrix.job.platform }}
           path: |
             ${{ matrix.job.goos}}-${{ matrix.job.platform }}.${{matrix.job.file_ext}}
+
       - name: Upload to GitHub Release
         uses: softprops/action-gh-release@v2
         with:
@@ -130,6 +133,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Generate Changelog
+        run: npx changelogithub # or changelogithub@0.12 if ensure the stable result
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
   docker:
     name: Push Docker Image
     needs: build

README.md

@@ -211,7 +211,7 @@ proxy:
 变量名前缀是`RUSTDESK_API`，环境变量如果存在将覆盖配置文件中的配置
 
 | 变量名                                               | 说明                                                      | 示例                           |
-|------------------------------------|---------------------------------------------------------|------------------------------|
+|---------------------------------------------------|---------------------------------------------------------|------------------------------|
 | TZ                                                | 时区                                                      | Asia/Shanghai                |
 | RUSTDESK_API_LANG                                 | 语言                                                      | `en`,`zh-CN`                 |
 | RUSTDESK_API_APP_WEB_CLIENT                       | 是否启用web-client; 1:启用,0:不启用; 默认启用                        | 1                            |
@@ -239,6 +239,7 @@ proxy:
 | RUSTDESK_API_RUSTDESK_API_SERVER                  | Rustdesk的api服务器地址                                       | http://192.168.1.66:21114    |
 | RUSTDESK_API_RUSTDESK_KEY                         | Rustdesk的key                                            | 123456789                    |
 | RUSTDESK_API_RUSTDESK_KEY_FILE                    | Rustdesk存放key的文件                                        | `./conf/data/id_ed25519.pub` |
+| RUSTDESK_API_RUSTDESK_WEBCLIENT_MAGIC_QUERYONLINE | Web client v2 中是否启用新的在线状态查询方法; `1`:启用,`0`:不启用,默认不启用     | `0`                          |
 | ----PROXY配置-----                                  | ---------------                                         | ----------                   |
 | RUSTDESK_API_PROXY_ENABLE                         | 是否启用代理:`false`, `true`                                  | `false`                      |
 | RUSTDESK_API_PROXY_HOST                           | 代理地址                                                    | `http://127.0.0.1:1080`      |

README_EN.md

@@ -214,7 +214,7 @@ proxy:
 The prefix for variable names is `RUSTDESK_API`. If environment variables exist, they will override the configurations in the configuration file.
 
 | Variable Name                                       | Description                                                                                                  | Example                       |
-|------------------------------------|-------------------------------------------------------------------------|-------------------------------|
+|-----------------------------------------------------|--------------------------------------------------------------------------------------------------------------|-------------------------------|
 | TZ                                                  | timezone                                                                                                     | Asia/Shanghai                 |
 | RUSTDESK_API_LANG                                   | Language                                                                                                     | `en`,`zh-CN`                  |
 | RUSTDESK_API_APP_WEB_CLIENT                         | web client on/off; 1: on, 0 off, default: 1                                                                  | 1                             |
@@ -241,7 +241,8 @@ The prefix for variable names is `RUSTDESK_API`. If environment variables exist,
 | RUSTDESK_API_RUSTDESK_RELAY_SERVER                  | Rustdesk relay server address                                                                                | 192.168.1.66:21117            |
 | RUSTDESK_API_RUSTDESK_API_SERVER                    | Rustdesk API server address                                                                                  | http://192.168.1.66:21114     |
 | RUSTDESK_API_RUSTDESK_KEY                           | Rustdesk key                                                                                                 | 123456789                     |
-| RUSTDESK_API_RUSTDESK_KEY_FILE     | Rustdesk存放key的文件                                                        | `./conf/data/id_ed25519.pub`  |
+| RUSTDESK_API_RUSTDESK_KEY_FILE                      | Rustdesk key file                                                                                            | `./conf/data/id_ed25519.pub`  |
+| RUSTDESK_API_RUSTDESK_WEBCLIENT_MAGIC_QUERYONLINE   | New online query method is enabled in the web client v2; '1': Enabled, '0': Disabled, not enabled by default | `0`                           |
 | ---- PROXY -----                                    | ---------------                                                                                              | ----------                    |
 | RUSTDESK_API_PROXY_ENABLE                           | proxy_enable :`false`, `true`                                                                                | `false`                       |
 | RUSTDESK_API_PROXY_HOST                             | proxy_host                                                                                                   | `http://127.0.0.1:1080`       |

conf/config.yaml

@@ -28,6 +28,7 @@ rustdesk:
   key: ""
   key-file: "./conf/data/id_ed25519.pub"
   personal: 1
+  webclient-magic-queryonline: 0
 logger:
   path: "./runtime/log.txt"
   level: "warn" #trace,debug,info,warn,error,fatal

config/rustdesk.go

@@ -11,6 +11,8 @@ type Rustdesk struct {
 	Key         string `mapstructure:"key"`
 	KeyFile     string `mapstructure:"key-file"`
 	Personal    int    `mapstructure:"personal"`
+	//webclient-magic-queryonline
+	WebclientMagicQueryonline int `mapstructure:"webclient-magic-queryonline"`
 }
 
 func LoadKeyFile(rustdesk *Rustdesk) {

global/apiValidator.go

@@ -6,6 +6,7 @@ import (
 	"github.com/go-playground/locales/es"
 	"github.com/go-playground/locales/ko"
 	"github.com/go-playground/locales/ru"
+	"github.com/go-playground/locales/fr"
 	"github.com/go-playground/locales/zh_Hans_CN"
 
 	ut "github.com/go-playground/universal-translator"
@@ -14,6 +15,7 @@ import (
 	es_translations "github.com/go-playground/validator/v10/translations/es"
 	ru_translations "github.com/go-playground/validator/v10/translations/ru"
 	zh_translations "github.com/go-playground/validator/v10/translations/zh"
+	fr_translations "github.com/go-playground/validator/v10/translations/fr"
 	"reflect"
 )
 
@@ -26,14 +28,16 @@ func ApiInitValidator() {
 	koT := ko.New()
 	ruT := ru.New()
 	esT := es.New()
+	frT := fr.New()
 
-	uni := ut.New(enT, cn, koT, ruT, esT)
+	uni := ut.New(enT, cn, koT, ruT, esT, frT)
 
 	enTrans, _ := uni.GetTranslator("en")
 	zhTrans, _ := uni.GetTranslator("zh_Hans_CN")
 	koTrans, _ := uni.GetTranslator("ko")
 	ruTrans, _ := uni.GetTranslator("ru")
 	esTrans, _ := uni.GetTranslator("es")
+	frTrans, _ := uni.GetTranslator("fr")
 
 	err := zh_translations.RegisterDefaultTranslations(validate, zhTrans)
 	if err != nil {
@@ -57,6 +61,10 @@ func ApiInitValidator() {
 	if err != nil {
 		panic(err)
 	}
+	err = fr_translations.RegisterDefaultTranslations(validate, frTrans)
+	if err != nil {
+		panic(err)
+	}
 
 	validate.RegisterTagNameFunc(func(field reflect.StructField) string {
 		label := field.Tag.Get("label")
@@ -126,6 +134,9 @@ func getTranslatorForLang(lang string) ut.Translator {
 	case "es":
 		trans, _ := Validator.UT.GetTranslator("es")
 		return trans
+	case "fr":
+		trans, _ := Validator.UT.GetTranslator("fr")
+		return trans
 	case "en":
 		fallthrough
 	default:

http/controller/web/index.go

@@ -3,6 +3,7 @@ package web
 import (
 	"Gwen/global"
 	"github.com/gin-gonic/gin"
+	"strconv"
 )
 
 type Index struct {
@@ -14,11 +15,13 @@ func (i *Index) Index(c *gin.Context) {
 
 func (i *Index) ConfigJs(c *gin.Context) {
 	apiServer := global.Config.Rustdesk.ApiServer
-
+	magicQueryonline := strconv.Itoa(global.Config.Rustdesk.WebclientMagicQueryonline)
 	tmp := `
 localStorage.setItem('api-server', "` + apiServer + `")
 const ws2_prefix = 'wc-'
 localStorage.setItem(ws2_prefix+'api-server', "` + apiServer + `")
-`
+
+window.webclient_magic_queryonline = ` + magicQueryonline + ``
+
 	c.String(200, tmp)
 }

resources/i18n/fr.toml

@@ -0,0 +1,144 @@
+[Test]
+description = "test"
+one = "test1 "
+other = "Test2 {{.P0}}"
+
+[ParamsError]
+description = "Params validation failed."
+one = "La validation des paramètres a échoué."
+other = "La validation des paramètres a échoué."
+
+[OperationFailed]
+description = "OperationFailed."
+one = "l'opération a échoué."
+other = "l'opération a échoué."
+
+[OperationSuccess]
+description = "OperationSuccess."
+one = "Opération réussie"
+other = "Opération réussie"
+
+[ItemExists]
+description = "Item already exists."
+one = "L'élément existe déjà."
+other = "L'élément existe déjà."
+
+[ItemNotFound]
+description = "Item not found."
+one = "Article introuvable."
+other = "Article introuvable."
+
+[NoAccess]
+description = "No access."
+one = "Aucun d'access."
+other = "Aucun d'access."
+
+[UsernameOrPasswordError]
+description = "Username or password error."
+one = "Nom d'utilisateur ou de mot de passe incorrect."
+other = "Nom d'utilisateur ou de mot de passe incorrect."
+
+[SystemError]
+description = "System error."
+one = "Erreur system."
+other = "Erreur system."
+
+[ConfigNotFound]
+description = "Config not found."
+one = "Configuration introuvable."
+other = "Configuration introuvable."
+
+[OauthExpired]
+description = "Oauth expired."
+one = "Oauth a expiré, veuillez réessayer."
+other = "Oauth a expiré, veuillez réessayer."
+
+[OauthFailed]
+description = "Oauth failed."
+one = "Oauth a échoué."
+other = "Oauth a échoué."
+
+[OauthHasBindOtherUser]
+description = "Oauth has bind other user."
+one = "Oauth a lié un autre utilisateur."
+other = "Oauth a lié un autre utilisateur."
+
+[ParamIsEmpty]
+description = "Param is empty."
+one = "{{.P0}} est vide."
+other = "{{.P0}} est vide."
+
+[BindFail]
+description = "Bind fail."
+one = "Échec de la liaison."
+other = "Échec de la liaison."
+
+[BindSuccess]
+description = "Bind success."
+one = "Succès de la liaison."
+other = "Succès de la liaison."
+
+[OauthHasBeenSuccess]
+description = "Oauth has been success."
+one = "Oauth a été réussi avec Succès."
+other = "Oauth a été réussi avec Succès."
+
+[OauthSuccess]
+description = "Oauth success."
+one = "Oauh réussi avec succès."
+other = "Oauh réussi avec succès."
+
+[OauthRegisterSuccess]
+description = "Oauth register success."
+one = "Succès de l'enregistrement Oauth."
+other = "Succès de l'enregistrement Oauth."
+
+[OauthRegisterFailed]
+description = "Oauth register failed."
+one = "L'inscription Oauth a échoué."
+other = "L'inscription Oauth a échoué."
+
+[GetOauthTokenError]
+description = "Get oauth token error."
+one = "Erreur de l'obtention du jeton oauth."
+other = "Erreur de l'obtention du jeton oauth."
+
+[GetOauthUserInfoError]
+description = "Get oauth user info error."
+one = "Erreur d'obtention d'informations sur l'utilisateur oauth."
+other = "Erreur d'obtention d'informations sur l'utilisateur oauth."
+
+[DecodeOauthUserInfoError]
+description = "Decode oauth user info error."
+one = "Erreur de décodage des informations utilisateur oauth."
+other = "Erreur de décodage des informations utilisateur oauth."
+
+[OldPasswordError]
+description = "Old password error."
+one = "Ancien mot de passe incorrect."
+other = "Ancien mot de passe incorrect."
+
+[DefaultGroup]
+description = "Default group"
+one = "Groupe Défaut"
+other = "Groupe Défaut"
+
+[ShareGroup]
+description = "Share group"
+one = "Groupe partagé"
+other = "Groupe partagé"
+
+[RegisterClosed]
+description = "Register closed."
+one = "Inscription fermée."
+other = "Inscription fermée."
+
+[CaptchaRequired]
+description = "Captcha required."
+one = "Captcha requis."
+other = "Captcha requis."
+
+[CaptchaError]
+description = "Captcha error."
+one = "Erreur de captcha."
+other = "Erreur de captcha."

resources/web2/index.html

@@ -32,7 +32,7 @@
     <title>RustDesk</title>
     <script src="/webclient-config/index.js"></script>
     <link rel="manifest" href="manifest.json" />
-    <script type="module" crossorigin src="js/dist/index.js?v=893935a2"></script>
+    <script type="module" crossorigin src="js/dist/index.js?v=1bbc8b94"></script>
     <link rel="modulepreload" href="js/dist/vendor.js?v=0b990c6e" />
     <style>
       html,
@@ -259,7 +259,7 @@
         }
         scriptLoaded = true;
         var scriptTag = document.createElement("script");
-        scriptTag.src = "main.dart.js?v=df360f45";
+        scriptTag.src = "main.dart.js?v=f6f842b3";
         scriptTag.type = "application/javascript";
         document.body.append(scriptTag);
       }