From 521a002001eeddc63e98fc3ec71abfd6f792f47f Mon Sep 17 00:00:00 2001 From: nutsflag <26460023+nutsflag@users.noreply.github.com> Date: Fri, 2 Oct 2020 15:13:31 +0200 Subject: [PATCH 1/8] Update code-editor.blade.php --- resources/views/components/code-editor.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/components/code-editor.blade.php b/resources/views/components/code-editor.blade.php index 6822bb28d..011840465 100644 --- a/resources/views/components/code-editor.blade.php +++ b/resources/views/components/code-editor.blade.php @@ -34,6 +34,7 @@ Ruby Shell/Bash SQL + VBScript XML YAML @@ -66,4 +67,4 @@ - \ No newline at end of file + From 467176ee78c2874881e4fefdd6bdafa022180a18 Mon Sep 17 00:00:00 2001 From: nutsflag <26460023+nutsflag@users.noreply.github.com> Date: Fri, 2 Oct 2020 15:14:29 +0200 Subject: [PATCH 2/8] Update code.js --- resources/js/services/code.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/js/services/code.js b/resources/js/services/code.js index a7dfa587f..7d49c50f6 100644 --- a/resources/js/services/code.js +++ b/resources/js/services/code.js @@ -26,6 +26,7 @@ import 'codemirror/mode/rust/rust'; import 'codemirror/mode/shell/shell'; import 'codemirror/mode/sql/sql'; import 'codemirror/mode/toml/toml'; +import 'codemirror/mode/vbscript/vbscript'; import 'codemirror/mode/xml/xml'; import 'codemirror/mode/yaml/yaml'; @@ -84,6 +85,7 @@ const modeMap = { bash: 'shell', toml: 'toml', sql: 'text/x-sql', + vbscript: 'vbscript', xml: 'xml', yaml: 'yaml', yml: 'yaml', From d0d75afc66a9b77f365f7edc3b3def6610b79db4 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Fri, 2 Oct 2020 15:55:46 +0100 Subject: [PATCH 3/8] New translations settings.php (Chinese Simplified) --- resources/lang/zh_CN/settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/zh_CN/settings.php b/resources/lang/zh_CN/settings.php index 7b8d87b49..6ff4a6423 100755 --- a/resources/lang/zh_CN/settings.php +++ b/resources/lang/zh_CN/settings.php @@ -92,8 +92,8 @@ return [ 'audit_table_event' => '事件', 'audit_table_item' => '相关项目', 'audit_table_date' => '活动日期', - 'audit_date_from' => 'Date Range From', - 'audit_date_to' => 'Date Range To', + 'audit_date_from' => '日期范围从', + 'audit_date_to' => '日期范围至', // Role Settings 'roles' => '角色', From c82c3023c5a81d38b708599c503c8e3523af59c3 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Fri, 2 Oct 2020 17:18:27 +0100 Subject: [PATCH 4/8] New translations settings.php (Spanish) --- resources/lang/es/settings.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/lang/es/settings.php b/resources/lang/es/settings.php index 48473acef..82cb28615 100644 --- a/resources/lang/es/settings.php +++ b/resources/lang/es/settings.php @@ -179,7 +179,7 @@ return [ 'user_api_token_name_desc' => 'Dale a tu token un nombre legible como un recordatorio futuro de su propósito.', 'user_api_token_expiry' => 'Fecha de expiración', 'user_api_token_expiry_desc' => 'Establece una fecha en la que este token expira. Después de esta fecha, las solicitudes realizadas usando este token ya no funcionarán. Dejar este campo en blanco fijará un vencimiento de 100 años en el futuro.', - 'user_api_token_create_secret_message' => 'Immediately after creating this token a "Token ID" & "Token Secret" will be generated and displayed. The secret will only be shown a single time so be sure to copy the value to somewhere safe and secure before proceeding.', + 'user_api_token_create_secret_message' => 'Inmediatamente después de crear este token se generarán y mostrarán sus correspondientes "Token ID" y "Token Secret". El "Token Secret" sólo se mostrará una vez, así que asegúrese de copiar el valor a un lugar seguro antes de proceder.', 'user_api_token_create_success' => 'Token API creado correctamente', 'user_api_token_update_success' => 'Token API actualizado correctamente', 'user_api_token' => 'Token API', @@ -187,8 +187,8 @@ return [ 'user_api_token_id_desc' => 'Este es un identificador no editable generado por el sistema y único para este token que necesitará ser proporcionado en solicitudes de API.', 'user_api_token_secret' => 'Token Secret', 'user_api_token_secret_desc' => 'Esta es una clave no editable generada por el sistema que necesitará ser proporcionada en solicitudes de API. Solo se monstraré esta vez así que guarde su valor en un lugar seguro.', - 'user_api_token_created' => 'Token created :timeAgo', - 'user_api_token_updated' => 'Token updated :timeAgo', + 'user_api_token_created' => 'Token creado :timeAgo', + 'user_api_token_updated' => 'Token actualizado :timeAgo', 'user_api_token_delete' => 'Borrar token', 'user_api_token_delete_warning' => 'Esto eliminará completamente este token API con el nombre \':tokenName\' del sistema.', 'user_api_token_delete_confirm' => '¿Está seguro de que desea borrar este API token?', From d688e43197a2d7efecbef1c01fc94c12a8e73e89 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Mon, 5 Oct 2020 06:26:38 +0100 Subject: [PATCH 5/8] New translations settings.php (Chinese Simplified) --- resources/lang/zh_CN/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/zh_CN/settings.php b/resources/lang/zh_CN/settings.php index 6ff4a6423..3467b49a4 100755 --- a/resources/lang/zh_CN/settings.php +++ b/resources/lang/zh_CN/settings.php @@ -57,7 +57,7 @@ return [ 'reg_enable_desc' => '启用注册后，用户将可以自己注册为站点用户。 注册后，他们将获得一个默认的单一用户角色。', 'reg_default_role' => '注册后的默认用户角色', 'reg_enable_external_warning' => '当启用外部LDAP或者SAML认证时，上面的选项会被忽略。当使用外部系统认证认证成功时，将自动创建非现有会员的用户账户。', - 'reg_email_confirmation' => '邮箱确认n', + 'reg_email_confirmation' => '邮件确认', 'reg_email_confirmation_toggle' => '需要电子邮件确认', 'reg_confirm_email_desc' => '如果使用域名限制，则需要Email验证，并且该值将被忽略。', 'reg_confirm_restrict_domain' => '域名限制', From bb1f1a9ecd1687e867b40f7f4a3441bce825e979 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 13 Oct 2020 22:36:07 +0100 Subject: [PATCH 6/8] Fixed error on drawing edit on markdown editor Was preventing save of drawings. For #2313 --- resources/js/components/markdown-editor.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/js/components/markdown-editor.js b/resources/js/components/markdown-editor.js index c371a9839..19d26d4a9 100644 --- a/resources/js/components/markdown-editor.js +++ b/resources/js/components/markdown-editor.js @@ -440,10 +440,10 @@ class MarkdownEditor { const data = { image: pngData, - uploaded_to: Number(document.getElementById('page-editor').getAttribute('page-id')) + uploaded_to: Number(this.pageId), }; - window.$http.post(window.baseUrl('/images/drawio'), data).then(resp => { + window.$http.post("/images/drawio", data).then(resp => { this.insertDrawing(resp.data, cursorPos); DrawIO.close(); }).catch(err => { @@ -476,10 +476,10 @@ class MarkdownEditor { let data = { image: pngData, - uploaded_to: Number(document.getElementById('page-editor').getAttribute('page-id')) + uploaded_to: Number(this.pageId), }; - window.$http.post(window.baseUrl(`/images/drawio`), data).then(resp => { + window.$http.post("/images/drawio", data).then(resp => { let newText = `
`; let newContent = this.cm.getValue().split('\n').map(line => { if (line.indexOf(`drawio-diagram="${drawingId}"`) !== -1) { From 8d07b7cf1c91f283e17f98ac45004582eb9b96a9 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 13 Oct 2020 22:44:33 +0100 Subject: [PATCH 7/8] Added alias for vbscript --- resources/js/services/code.js | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/js/services/code.js b/resources/js/services/code.js index 7d49c50f6..e2aca1aad 100644 --- a/resources/js/services/code.js +++ b/resources/js/services/code.js @@ -85,6 +85,7 @@ const modeMap = { bash: 'shell', toml: 'toml', sql: 'text/x-sql', + vbs: 'vbscript', vbscript: 'vbscript', xml: 'xml', yaml: 'yaml', From 18bcafaee46d249ae4d71ed75872af326c8a87eb Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Tue, 13 Oct 2020 22:49:55 +0100 Subject: [PATCH 8/8] Updated translator attribution before release v0.30.3 --- .github/translators.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/translators.txt b/.github/translators.txt index 6f06c8844..c74fe3943 100644 --- a/.github/translators.txt +++ b/.github/translators.txt @@ -122,3 +122,4 @@ fadiapp :: Arabic Jakub Bouček (jakubboucek) :: Czech Marco (cdrfun) :: German 10935336 :: Chinese Simplified +孟繁阳 (FanyangMeng) :: Chinese Simplified