Merge remote-tracking branch 'origin/dev' into dev

2023-03-29 13:48:20 +08:00 · 2023-03-29 13:48:20 +08:00 · 947e5aad9d
commit 947e5aad9d
parent 9f4094d2c9 574b7f39c9
8 changed files with 34 additions and 46 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -1,67 +1,58 @@
-name: 🐛 缺陷报告 Bug Report
-description: 报告缺陷以帮助我们进行改进 Report defects to help us improve
-title: "请输入问题报告标题 Please enter the title of the bug report"
+name: 🐛 Bug Report
+description: Report defects to help us improve
+title: "Please enter the title of the bug report"
 body:
  - type: checkboxes
    attributes:
-      label: 该问题是否已经被报告过了？ Is there an existing issue for this?
+      label: Is there an existing issue for this?
      description: |
-        请搜索以查看你遇到的问题是否已经被报告过。
        Please search to see if an issue already exists for the bug you encountered.
      options:
-        - label: |
-            我已经搜索了 Issues，没有发现类似问题 
+        - label: | 
            I have searched the existing issues
          required: true
  - type: checkboxes
    attributes:
-      label: 该问题是否能够在默认主题（daylight/midnight）下重现？ Can the issue be reproduced with the default theme (daylight/midnight)?
+      label: Can the issue be reproduced with the default theme (daylight/midnight)?
      description: |
-        请确认该问题能够在默认主题下重现。
        Please confirm that the issue can be reproduced with the default theme.
      options:
        - label: |
-            我能够在默认主题下重现该问题
            I was able to reproduce the issue with the default theme
          required: true
  - type: checkboxes
    attributes:
-      label: 该问题是否可能是由于扩展功能导致？ Could the issue be due to extensions?
+      label: Could the issue be due to extensions?
      description: |
-        请注意主题、代码片段、挂件或者其他扩展功能可能会导致问题。
        Be aware that themes, code snippets, widgets, or other extensions may cause problems.
      options:
        - label: |
-            我已经排除了扩展导致问题的可能性
            I've ruled out the possibility that the extension is causing the problem.
          required: true
  - type: textarea
    attributes:
-      label: 描述问题 Describe the problem
+      label: Describe the problem
      description: |
-        请尽量清晰地描述你遇到的问题。
        Please describe the problem you are experiencing as clearly as possible.
    validations:
      required: true
  - type: textarea
    attributes:
-      label: 期待的结果 Expected result
+      label: Expected result
      description: |
-        请尽量清晰地描述你所期待的结果。
        Please be as clear and accurate as possible to describe the results you are looking for.
    validations:
      required: true
  - type: textarea
    attributes:
-      label: 截屏或者录屏演示 Screenshot or screen recording presentation
+      label: Screenshot or screen recording presentation
      description: |
-        请通过截屏或者录屏演示你碰到的问题。
        Please try to attach screenshots or videos to describe the problem you are experiencing.
    validations:
      required: false
  - type: textarea
    attributes:
-      label: 版本环境 Version environment
+      label: Version environment
      value: |
        - Version: 
        - Operating System: 
@ -71,17 +62,15 @@ body:
      required: true
  - type: textarea
    attributes:
-      label: 日志文件 Log file
+      label: Log file
      description: |
-        请提供内核日志 `工作空间/temp/siyuan.log`
        The program log file is located at `workspace/temp/siyuan.log`
    validations:
      required: true
  - type: textarea
    attributes:
-      label: 更多信息 More information
+      label: More information
      description: |
-        请提供任何附加信息，以帮助我们更好地定位问题。
        Please provide other additional information to help us diagnose the problem.
    validations:
      required: false
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@ -1,36 +1,32 @@
-name: ✨ 特性提议 Request new features
-description: 欢迎提出你所期待的新特性 Come up with the features you expected
-title: "请输入特性提议标题 Please enter the title of the feature request"
+name: ✨ Request new features
+description: Come up with the features you expected
+title: "Please enter the title of the feature request"
 body:
  - type: textarea
    attributes:
-      label: 在什么情况下你需要该特性？In what scenarios do you need this feature?
+      label: In what scenarios do you need this feature?
      description: |
-        请尽量清晰地描述该特性的应用场景。
        Please describe the functions and application scenarios you expect as clearly and accurately as possible.
    validations:
      required: true
  - type: textarea
    attributes:
-      label: 描述可能的最优解决方案 Describe the optimal solution
+      label: Describe the optimal solution
      description: |
-        请描述你能想到的最优解决方案。也有有些类似软件已经实现了该特性，请列出以供我们参考。
        Please try to describe the best solution. There may be similar software that implements this feature. Please also list it for our reference.
    validations:
      required: true
  - type: textarea
    attributes:
-      label: 描述候选的解决方案 Describe the candidate solution
+      label: Describe the candidate solution
      description: |
-        请描述你能想到的候选解决方案。
        Please describe the candidate solutions you can accept as clearly and accurately as possible.
    validations:
      required: false
  - type: textarea
    attributes:
-      label: 其他信息 Other information
+      label: Other information
      description: |
-        请提供任何附加信息，以帮助我们更好地理解该特性和解决方案。
        Please provide any additional information about this feature suggestion.
    validations:
      required: false
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@ -101,7 +101,7 @@
  "exportBySiYuan": "Export by SiYuan",
  "featureBetaStage": "This feature support is currently in the free public beta stage, and there is no clear charging plan yet, please know",
  "syncOfficialProviderIntro": "Currently selected is the cloud storage service officially provided by SiYuan, which only supports paid subscription users",
-  "syncThirdPartyProviderS3Intro": "The current selected is a third-party cloud storage service compatible with the Amazon S3 protocol (eg <a href=\"https://s.qiniu.com/VbQfeu\" target=\"_blank\">Qiniu</a>, <a href=\"https://www.aliyun.com/product/ oss?userCode=yqovuas2\" target=\"_blank\">Aliyun OSS</a>, <a href=\"https://www.cloudflare.com/\" target=\"_blank\">Cloudflare R2</a>)",
+  "syncThirdPartyProviderS3Intro": "The current selected is a third-party cloud storage service compatible with the Amazon S3 protocol (eg <a href=\"https://s.qiniu.com/VbQfeu\" target=\"_blank\">Qiniu</a>, <a href=\"https://www.aliyun.com/product/oss?userCode=yqovuas2\" target=\"_blank\">Aliyun OSS</a>, <a href=\"https://www.cloudflare.com/\" target=\"_blank\">Cloudflare R2</a>)",
  "syncThirdPartyProviderWebDAVIntro": "The currently selected is a third-party cloud storage service with the WebDAV protocol. Due to the poor performance and insufficient stability of this protocol, it is recommended to choose the S3 service first",
  "syncThirdPartyProviderTip": "Before using this feature, please pay attention to the technical limitations and billing items of the third-party cloud storage service: <div class=\"b3-label__text\"><ul class='fn__list'><li>Technical limitations such as interface calling frequency and bandwidth</li><li>Billing items such as storage space and traffic</li><li>Terms of use and availability guarantee</li></ul></div><div class='fn__hr'></div>Disclaimer: For details, please refer to the relevant terms in the open source license AGPLv3 used by SiYuan",
  "syncProvider": "Cloud Storage Service Provider",
@ -1078,7 +1078,7 @@
    "125": "Auto sync failed too many times, please try to manually trigger sync, if there is still a problem, please report it via <a href=\"https://github.com/siyuan-note/siyuan/issues\" target=\"_blank\">GitHub Issues</a>",
    "126": "Bookmark cannot be empty",
    "127": "There are [%d] days left before the subscription expires, after which the cloud data will be completely deleted. Please visit <a target='_blank' href='https://ld246.com/subscribe/siyuan for renewal '>Here</a>, if you don't need to renew, please log out of your account to close the reminder",
-    "128": "Subscription has expired, cloud data will be completely deleted after expiration. To renew, please visit <a target='_blank' href='https://ld246.com/subscribe/siyuan'>here</a> , if you don't need to renew, please log out of your account to close the reminder",
+    "128": "The subscription has expired. After the expiration, the cloud data will be completely deleted. The reminder will no longer pop up two days after the subscription expires. To renew, please visit <a target='_blank' href='https://ld246.com/subscribe/siyuan'>here</a>",
    "129": "Cloud data has been corrupted, please refer to <a href=\"https://ld246.com/article/1658499492287\" target=\"_blank\">here</a> to resolve the issue",
    "130": "Starting new version installer...",
    "131": "This operation is not supported, please go to the cloud storage provider management console to operate",
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@ -1078,7 +1078,7 @@
    "125": "La sincronización automática ha fallado demasiadas veces, por favor intente activar la sincronización manualmente, si todavía hay un problema, por favor infórmelo a través de <a href=\"https://github.com/siyuan-note/siyuan/issues\" target=\"_blank\">Problemas GitHub</a>",
    "126": "El marcador no puede estar vacío",
    "127": "There are [%d] days left before the subscription expires, after which the cloud data will be completely deleted. Please visit <a target='_blank' href='https://ld246.com/subscribe/siyuan'>Aquí</a> para la renovación, si no necesita renovar, salga de su cuenta para cerrar el recordatorio",
-    "128": "La suscripción ha caducado, los datos de la nube se eliminarán completamente después de la expiración. Para renovar, visite <a target='_blank' href='https://ld246.com/subscribe/siyuan'>Aquí</a>, si no necesita renovar, salga de su cuenta para cerrar el recordatorio",
+    "128": "La suscripción caducó. Después de la caducidad, los datos de la nube se eliminarán por completo. El recordatorio ya no aparecerá dos días después de que caduque la suscripción. Para renovar, visite <a target='_blank' href= 'https://ld246.com/subscribe/siyuan'>aquí</a>",
    "129": "Los datos de la nube se han dañado, consulte <a href=\"https://ld246.com/article/1658499492287\" target=\"_blank\">aquí</a> para resolver el problema",
    "130": "Iniciando instalador de nueva versión...",
    "131": "Esta solicitud no es compatible, vaya a la consola de administración del proveedor de almacenamiento en la nube para operar",
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@ -1077,8 +1077,8 @@
    "124": "Veuillez activer la synchronisation cloud dans [Paramètres - Activer la synchronisation cloud]",
    "125": "Il y a trop d'échecs de téléchargement dans la synchronisation automatique. Veuillez essayer de déclencher manuellement la synchronisation. Si le problème persiste, veuillez le signaler via <a href=\"https://github.com/siyuan-note/siyuan/issues\" target=\"_blank\">GitHub Issues</a>",
    "126": "Les signets ne peuvent pas être vides",
-    "127": "Il reste [%d] jours avant l'expiration de l'abonnement, après quoi les données cloud seront complètement supprimées. Veuillez visiter <a target='_blank' href='https://ld246.com/subscribe/ siyuan pour le renouvellement '>ici</a>, si vous n'avez pas besoin de renouveler, veuillez vous déconnecter de votre compte pour fermer le rappel",
-    "128": "L'abonnement a expiré, les données cloud seront complètement supprimées après l'expiration. Pour renouveler, veuillez visiter <a target='_blank' href='https://ld246.com/subscribe/siyuan'>ici</a > , si vous n'avez pas besoin de renouveler, veuillez vous déconnecter de votre compte pour fermer le rappel",
+    "127": "Il reste [%d] jours avant l'expiration de l'abonnement, après quoi les données cloud seront complètement supprimées. Veuillez visiter <a target='_blank' href='https://ld246.com/subscribe/siyuan pour le renouvellement '>ici</a>, si vous n'avez pas besoin de renouveler, veuillez vous déconnecter de votre compte pour fermer le rappel",
+    "128": "L'abonnement a expiré. Après l'expiration, les données cloud seront complètement supprimées. Le rappel ne s'affichera plus deux jours après l'expiration de l'abonnement. Pour renouveler, veuillez visiter <a target='_blank' href= 'https://ld246.com/subscribe/siyuan'>ici</a>",
    "129": "Les données cloud ont été corrompues, veuillez vous référer à <a href=\"https://ld246.com/article/1658499492287\" target=\"_blank\">ici</a> pour résoudre le problème",
    "130": "Démarrage du programme d'installation de la nouvelle version...",
    "131": "Cette opération n'est pas prise en charge, veuillez vous rendre sur la console de gestion du fournisseur de stockage cloud pour opérer",
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@ -1078,7 +1078,7 @@
    "125": "自動同步下載失敗次數過多，請嘗試手動觸發同步，如果還有問題請<a href=\"https://ld246.com/article/1649901726096\" target=\"_blank\">回饋</a>",
    "126": "書籤不能為空",
    "127": "訂閱距過期還剩 [%d] 天，過期後雲端數據會被徹底刪除。續訂請訪問<a target='_blank' href='https://ld246.com/subscribe/siyuan'>這裡</a>，如果不需要續訂，請登出賬號關閉該提醒",
-    "128": "訂閱已經過期，過期後雲端數據會被徹底刪除。續訂請訪問<a target='_blank' href='https://ld246.com/subscribe/siyuan'>這裡</a>，如果不需要續訂，請登出賬號關閉該提醒",
+    "128": "訂閱已經過期，過期後雲端數據會被徹底刪除，訂閱過期兩天后不再彈出該提醒，續訂請訪問<a target='_blank' href='https://ld246.com/subscribe/siyuan'>這裡</a>",
    "129": "雲端數據已經損壞，請參考<a href=\"https://ld246.com/article/1658499492287\" target=\"_blank\">這裡</a>解決該問題",
    "130": "正在啟動新版本安裝程式...",
    "131": "不支持該操作，請到雲端存儲提供商管理控制台進行操作",
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@ -1078,7 +1078,7 @@
    "125": "自动同步下载失败次数过多，请尝试手动触发同步，如果还有问题请<a href=\"https://ld246.com/article/1649901726096\" target=\"_blank\">反馈</a>",
    "126": "书签不能为空",
    "127": "订阅距过期还剩 [%d] 天，过期后云端数据会被彻底删除。续订请访问<a target='_blank' href='https://ld246.com/subscribe/siyuan'>这里</a>，如果不需要续订，请登出账号关闭该提醒",
-    "128": "订阅已经过期，过期后云端数据会被彻底删除。续订请访问<a target='_blank' href='https://ld246.com/subscribe/siyuan'>这里</a>，如果不需要续订，请登出账号关闭该提醒",
+    "128": "订阅已经过期，过期后云端数据会被彻底删除，订阅过期两天后不再弹出该提醒，续订请访问<a target='_blank' href='https://ld246.com/subscribe/siyuan'>这里</a>",
    "129": "云端数据已经损坏，请参考<a href=\"https://ld246.com/article/1658499492287\" target=\"_blank\">这里</a>解决该问题",
    "130": "正在启动新版本安装程序...",
    "131": "不支持该操作，请到云端存储提供商管理控制台进行操作",
--- a/kernel/model/liandi.go
+++ b/kernel/model/liandi.go
@ -227,12 +227,15 @@ func refreshSubscriptionExpirationRemind() {
 	}
 	if IsSubscriber() && -1 != Conf.User.UserSiYuanProExpireTime {
 		expired := int64(Conf.User.UserSiYuanProExpireTime)
-		if time.Now().UnixMilli() >= expired { // 已经过期
-			time.Sleep(time.Second * 30)
-			util.PushErrMsg(Conf.Language(128), 0)
+		now := time.Now().UnixMilli()
+		if now >= expired { // 已经过期
+			if now-expired <= 1000*60*60*24*2 { // 2 天内提醒 https://github.com/siyuan-note/siyuan/issues/7816
+				time.Sleep(time.Second * 30)
+				util.PushErrMsg(Conf.Language(128), 0)
+			}
 			return
 		}
-		remains := int((expired - time.Now().UnixMilli()) / 1000 / 60 / 60 / 24)
+		remains := int((expired - now) / 1000 / 60 / 60 / 24)
 		expireDay := 15 // 付费订阅提前 15 天提醒
 		if 2 == Conf.User.UserSiYuanSubscriptionPlan {
 			expireDay = 3 // 试用订阅提前 3 天提醒