Skip to content

Commit

Permalink
Merge branch 'dev' into feat/devcontainer
Browse files Browse the repository at this point in the history
  • Loading branch information
0xJacky committed Feb 3, 2025
2 parents 00f4855 + 9401bcc commit c85a570
Show file tree
Hide file tree
Showing 15 changed files with 100 additions and 70 deletions.
6 changes: 3 additions & 3 deletions README-es.md
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ go build -tags=jsoniter -ldflags "$LD_FLAGS -X 'github.com/0xJacky/Nginx-UI/sett
**Instalar and Actualizar**

```shell
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) install
bash -c "$(curl -L https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ install
```
El puerto de escucha predeterminado es `9000` y el puerto de Desafío HTTP predeterminado es `9180`.
Si hay un conflicto de puertos, modifique manualmente `/usr/local/etc/nginx-ui/app.ini`,
Expand All @@ -255,13 +255,13 @@ luego use `systemctl restart nginx-ui` para recargar el servicio de UI de Nginx.
**Eliminar UI Nginx UI, excepto los archivos de configuración y la base de datos**

```shell
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) remove
bash -c "$(curl -L https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ remove
```

### Uso avanzado

````shell
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) help
bash -c "$(curl -L https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ help
````

## Ejemplo de configuración de proxy reverso de Nginx
Expand Down
8 changes: 4 additions & 4 deletions README-vi_VN.md
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ go build -tags=jsoniter -ldflags "$LD_FLAGS -X 'github.com/0xJacky/Nginx-UI/sett
**Cài đặt và nâng cấp**

```shell
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) install
bash -c "$(curl -L https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ install
```
Port mặc định để truy cập UI là `9000`, port HTTP Challenge mặc định để xác thực SSL là `9180`.
Nếu có xung đột port, vui lòng sửa đổi trong file `/usr/local/etc/nginx-ui/app.ini`,
Expand All @@ -309,19 +309,19 @@ hãy nhớ restart nginx-ui bằng lệnh `systemctl restart nginx-ui` mỗi khi
**Gỡ bỏ Nginx UI nhưng giữ lại các tệp cấu hình và cơ sở dữ liệu**

```shell
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) remove
bash -c "$(curl -L https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ remove
```

**Gỡ bỏ Nginx UI đồng thời xoá các tệp cấu hình, cơ sở dữ liệu**

```shell
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) remove --purge
bash -c "$(curl -L https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ remove --purge
```

### Trợ giúp

````shell
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) help
bash -c "$(curl -L https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ help
````

## Ví dụ về cấu hình Nginx Reverse Proxy
Expand Down
6 changes: 3 additions & 3 deletions README-zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -240,20 +240,20 @@ go build -tags=jsoniter -ldflags "$LD_FLAGS -X 'github.com/0xJacky/Nginx-UI/sett
**安装或升级**

```shell
bash <(curl -L -s https://mirror.ghproxy.com/https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) install -r https://mirror.ghproxy.com/
bash -c "$(curl -L https://mirror.ghproxy.com/https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ install -r https://mirror.ghproxy.com/
```
一键安装脚本默认设置的监听端口为 `9000`,HTTP Challenge 端口默认为 `9180`,如果出现端口冲突请进入 `/usr/local/etc/nginx-ui/app.ini` 修改,并使用 `systemctl restart nginx-ui` 重启 Nginx UI 服务。

**卸载 Nginx UI 但保留配置和数据库文件**

```shell
bash <(curl -L -s https://mirror.ghproxy.com/https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) remove
bash -c "$(curl -L https://mirror.ghproxy.com/https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ remove
```

### 更多用法

````shell
bash <(curl -L -s https://mirror.ghproxy.com/https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) help
bash -c "$(curl -L https://mirror.ghproxy.com/https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ help
````

## Nginx 反向代理配置示例
Expand Down
6 changes: 3 additions & 3 deletions README-zh_TW.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,21 +245,21 @@ go build -tags=jsoniter -ldflags "$LD_FLAGS -X 'github.com/0xJacky/Nginx-UI/sett
**安裝或升級**

```shell
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) install
bash -c "$(curl -L https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ install
```

一鍵安裝指令預設的監聽連接埠為 `9000`,HTTP Challenge 埠預設為 `9180`,如果出現連接埠衝突請修改 `/usr/local/etc/nginx-ui/app.ini`,並使用 `systemctl restart nginx-ui` 重啟 Nginx UI 守護行程。

**解除安裝 Nginx UI 但保留設定和資料庫檔案**

```shell
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) remove
bash -c "$(curl -L https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ remove
```

### 更多用法

````shell
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) help
bash -c "$(curl -L https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ help
````

## Nginx 反向代理設定範例
Expand Down
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,15 @@ URL:[https://demo.nginxui.com](https://demo.nginxui.com)

### Internationalization

We proudly offer official support for:

- English
- Simplified Chinese
- Traditional Chinese

We welcome translations into any language.
As non-native English speakers, we strive for accuracy, but we know there’s always room for improvement. If you spot any issues, we’d love your feedback!

Thanks to our amazing community, additional languages are also available! Explore and contribute to translations on [Weblate](https://weblate.nginxui.com).

### Built With

Expand Down Expand Up @@ -302,7 +306,7 @@ go build -tags=jsoniter -ldflags "$LD_FLAGS -X 'github.com/0xJacky/Nginx-UI/sett
**Install and Upgrade**

```shell
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) install
bash -c "$(curl -L https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ install
```
The default listening port is `9000`, and the default HTTP Challenge port is `9180`.
If there is a port conflict, please modify `/usr/local/etc/nginx-ui/app.ini` manually,
Expand All @@ -311,13 +315,13 @@ then use `systemctl restart nginx-ui` to reload the Nginx UI service.
**Remove Nginx UI, except configuration and database files**

```shell
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) remove
bash -c "$(curl -L https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ remove
```

### More Usage

````shell
bash <(curl -L -s https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh) help
bash -c "$(curl -L https://raw.githubusercontent.com/0xJacky/nginx-ui/main/install.sh)" @ help
````

## Example of Nginx Reverse Proxy Configuration
Expand Down
48 changes: 24 additions & 24 deletions app/src/language/zh_TW/app.po
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# OpenAI <[email protected]>, 2024.
# Hintay Lin <[email protected]>, 2024.
# Weblate <[email protected]>, 2024.
# "Xaver Y.R. Chen" <[email protected]>, 2025.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2024-07-31 15:47+0000\n"
"Last-Translator: Hintay Lin <[email protected]>\n"
"PO-Revision-Date: 2025-02-01 18:25+0000\n"
"Last-Translator: \"Xaver Y.R. Chen\" <[email protected]>\n"
"Language-Team: Chinese (Traditional) <https://weblate.nginxui.com/projects/"
"nginx-ui/frontend/zh_Hant/>\n"
"Language: zh_TW\n"
Expand Down Expand Up @@ -64,7 +65,7 @@ msgstr "新增"
#: src/views/preference/components/AddPasskey.vue:45
#: src/views/preference/components/AddPasskey.vue:49
msgid "Add a passkey"
msgstr ""
msgstr "新增通行密鑰"

#: src/routes/index.ts:118 src/views/config/ConfigEditor.vue:144
#: src/views/config/ConfigEditor.vue:204
Expand Down Expand Up @@ -103,20 +104,20 @@ msgstr "進階模式"

#: src/views/preference/components/AddPasskey.vue:99
msgid "Afterwards, refresh this page and click add passkey again."
msgstr ""
msgstr "然後,重新整理此頁面並再次點選新增通行密鑰。"

#: src/components/StdDesign/StdDataDisplay/StdTable.vue:419
#: src/views/site/site_list/SiteList.vue:98
msgid "All"
msgstr ""
msgstr "全部"

#: src/views/preference/OpenAISettings.vue:44
msgid "API Base Url"
msgstr "API 基礎網址"

#: src/views/certificate/DNSChallenge.vue:83
msgid "API Document"
msgstr "API 文檔"
msgstr "API 文件"

#: src/views/preference/OpenAISettings.vue:57
msgid "API Proxy"
Expand All @@ -133,7 +134,7 @@ msgstr "API Token"

#: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:103
msgid "Apply"
msgstr ""
msgstr "套用"

#: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:67
#, fuzzy
Expand All @@ -149,9 +150,8 @@ msgid "Are you sure to delete this banned IP immediately?"
msgstr "您確定要刪除這個被禁用的 IP 嗎?"

#: src/views/preference/components/Passkey.vue:113
#, fuzzy
msgid "Are you sure to delete this passkey immediately?"
msgstr "您確定要刪除這個被禁用的 IP 嗎?"
msgstr "您確定要刪除這個被禁用的通行密鑰嗎?"

#: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:96
#, fuzzy
Expand Down Expand Up @@ -219,11 +219,11 @@ msgstr "身份驗證"

#: src/components/TwoFA/Authorization.vue:121
msgid "Authenticate with a passkey"
msgstr ""
msgstr "使用通行密鑰認證"

#: src/views/preference/AuthSettings.vue:60
msgid "Authentication Settings"
msgstr ""
msgstr "認證設定"

#: src/views/site/ngx_conf/config_template/ConfigTemplate.vue:106
#: src/views/site/ngx_conf/config_template/ConfigTemplate.vue:120
Expand Down Expand Up @@ -287,9 +287,8 @@ msgid "Basic Mode"
msgstr "基本模式"

#: src/components/StdDesign/StdDataDisplay/StdBulkActions.vue:83
#, fuzzy
msgid "Batch Actions"
msgstr "操作"
msgstr "批次操作"

#: src/components/StdDesign/StdDataDisplay/StdBatchEdit.vue:62
#: src/components/StdDesign/StdDataDisplay/StdTable.vue:448
Expand Down Expand Up @@ -352,7 +351,7 @@ msgstr "系統初始使用者"
#: src/views/site/site_edit/RightSettings.vue:91
#: src/views/site/site_list/columns.tsx:25
msgid "Category"
msgstr ""
msgstr "類別"

#: src/views/preference/Preference.vue:158
#, fuzzy
Expand All @@ -361,7 +360,7 @@ msgstr "自動憑證"

#: src/constants/errors/cert.ts:3
msgid "Cert path is not under the nginx conf dir"
msgstr ""
msgstr "簽章路徑不在 Nginx 設定檔資料夾下"

#: src/constants/errors/cert.ts:4
#, fuzzy
Expand Down Expand Up @@ -661,7 +660,7 @@ msgstr "描述"

#: src/constants/errors/site.ts:3
msgid "Destination file already exists"
msgstr ""
msgstr "目的檔案已存在"

#: src/views/notification/notificationColumns.tsx:52
msgid "Details"
Expand Down Expand Up @@ -829,7 +828,8 @@ msgstr "試運轉模式已啟用"
msgid ""
"Due to the security policies of some browsers, you cannot use passkeys on "
"non-HTTPS websites, except when running on localhost."
msgstr ""
msgstr "基於部分瀏覽器的安全政策,您無法在未啟用 HTTPS 網站,特別是 localhost "
"上使用通行密鑰。"

#: src/views/site/site_list/SiteDuplicate.vue:72
#: src/views/site/site_list/SiteList.vue:140
Expand Down Expand Up @@ -1036,7 +1036,7 @@ msgstr ""

#: src/constants/errors/self_check.ts:3
msgid "Failed to read nginx.conf"
msgstr ""
msgstr "讀取 nginx.conf 失敗"

#: src/views/site/site_edit/SiteEdit.vue:135
#: src/views/stream/StreamEdit.vue:122
Expand All @@ -1053,7 +1053,7 @@ msgstr "找不到檔案"

#: src/constants/errors/cert.ts:2
msgid "Filename is empty"
msgstr ""
msgstr "檔名空白"

#: src/views/nginx_log/NginxLog.vue:155
msgid "Filter"
Expand Down Expand Up @@ -1140,7 +1140,7 @@ msgstr "HTTP01"

#: src/views/preference/BasicSettings.vue:51
msgid "ICP Number"
msgstr ""
msgstr "ICP 編號"

#: src/views/certificate/ACMEUser.vue:45
msgid "If left blank, the default CA Dir will be used."
Expand Down Expand Up @@ -1553,7 +1553,7 @@ msgstr "Nginx 錯誤日誌路徑"

#: src/views/site/ngx_conf/NginxStatusAlert.vue:15
msgid "Nginx is not running"
msgstr ""
msgstr "Nginx 未執行"

#: src/routes/index.ts:202 src/views/nginx_log/NginxLog.vue:148
msgid "Nginx Log"
Expand Down Expand Up @@ -1707,7 +1707,7 @@ msgstr "OpenAI"

#: src/components/TwoFA/Authorization.vue:112 src/views/other/Login.vue:231
msgid "Or"
msgstr ""
msgstr ""

#: src/views/config/components/Rename.vue:68
msgid "Original name"
Expand Down Expand Up @@ -1742,7 +1742,7 @@ msgstr "參數"

#: src/views/preference/components/Passkey.vue:59
msgid "Passkey"
msgstr ""
msgstr "通行密鑰"

#: src/views/preference/components/Passkey.vue:62
msgid ""
Expand All @@ -1766,7 +1766,7 @@ msgstr "使用者名稱或密碼不正確"

#: src/views/other/Install.vue:48
msgid "Password length cannot exceed 20 characters"
msgstr ""
msgstr "密碼長度不能超過 20 個字元"

#: src/views/config/ConfigEditor.vue:263
#: src/views/site/ngx_conf/LocationEditor.vue:111
Expand Down
2 changes: 2 additions & 0 deletions app/src/views/site/cert/Cert.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const props = defineProps<{
configName: string
currentServerIndex: number
certInfo?: CertificateInfo[]
siteEnabled: boolean
}>()
const enabled = defineModel<boolean>('enabled', {
Expand Down Expand Up @@ -68,6 +69,7 @@ function handleCertChange(certs: Cert[]) {
<ChangeCert @change="handleCertChange" />

<IssueCert
v-if="siteEnabled"
v-model:enabled="enabled"
:config-name="configName"
/>
Expand Down
18 changes: 9 additions & 9 deletions app/src/views/site/ngx_conf/NgxServer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,15 @@ provide('ngx_directives', ngx_directives)
/>

<div class="tab-content">
<template v-if="current_support_ssl && enabled">
<Cert
v-if="current_support_ssl"
v-model:enabled="autoCert"
:config-name="ngx_config.name"
:cert-info="certInfo?.[k]"
:current-server-index="current_server_index"
/>
</template>
<Cert
v-if="current_support_ssl"
v-model:enabled="autoCert"
class="mb-4"
:site-enabled="enabled"
:config-name="ngx_config.name"
:cert-info="certInfo?.[k]"
:current-server-index="current_server_index"
/>

<template v-if="v.comments">
<h3>{{ $gettext('Comments') }}</h3>
Expand Down
6 changes: 5 additions & 1 deletion docs/guide/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,15 @@ Nginx UI is available on the following platforms:

## Internationalization

We proudly offer official support for:

- English
- Simplified Chinese
- Traditional Chinese

We welcome translations into any language.
As non-native English speakers, we strive for accuracy, but we know there’s always room for improvement. If you spot any issues, we’d love your feedback!

Thanks to our amazing community, additional languages are also available! Explore and contribute to translations on [Weblate](https://weblate.nginxui.com).

## Built With

Expand Down
Loading

0 comments on commit c85a570

Please sign in to comment.