Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translate to English #2 #186

Open
wants to merge 59 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
edbb8b3
update
FranzKafkaYu Jul 1, 2022
07add3c
Update README.md
FranzKafkaYu Jul 1, 2022
f781025
Update README_EN.md
FranzKafkaYu Jul 1, 2022
88166ce
Update shell script
FranzKafkaYu Jul 2, 2022
c331375
Upload shell scripts
FranzKafkaYu Jul 2, 2022
82cc83e
Update README.md
FranzKafkaYu Jul 3, 2022
f61b7a8
Update README.md
FranzKafkaYu Jul 6, 2022
678ac92
Update README.md
FranzKafkaYu Jul 6, 2022
ad832bd
Update README.md
FranzKafkaYu Jul 12, 2022
dd6b490
Update README.md
FranzKafkaYu Jul 20, 2022
05a206b
Update README.md
FranzKafkaYu Jul 20, 2022
cce9a34
Update README.md
FranzKafkaYu Jul 21, 2022
11d49be
Update README.md
FranzKafkaYu Jul 24, 2022
6d67708
Update README.md
FranzKafkaYu Jul 24, 2022
bb22179
Update README.md
FranzKafkaYu Jul 24, 2022
e15ca7f
Update README.md
FranzKafkaYu Jul 26, 2022
e63c3d4
Update x-ui.sh for standalone mode cert issue
FranzKafkaYu Jul 28, 2022
99cfb5d
fix log print
FranzKafkaYu Jul 28, 2022
af98a18
Optimize info
FranzKafkaYu Jul 28, 2022
970646a
Update README.md
FranzKafkaYu Aug 1, 2022
54ad70f
Update x-ui.sh
FranzKafkaYu Aug 1, 2022
c9a7c26
Update README.md
FranzKafkaYu Aug 10, 2022
b502595
Update README.md
FranzKafkaYu Aug 12, 2022
dc18439
Update README_EN.md
FranzKafkaYu Aug 12, 2022
e505d97
优化证书申请提示文案
FranzKafkaYu Sep 5, 2022
a3bb1ac
Update x-ui.sh
FranzKafkaYu Oct 10, 2022
42f934f
修复证书签发失败导致后续申请时域名合法性校验失败问题
FranzKafkaYu Oct 10, 2022
b4ccca1
Create bug_report.yml
FranzKafkaYu Oct 19, 2022
13ce290
Delete ------.md
FranzKafkaYu Oct 19, 2022
e22efd6
Update bug_report.yml
FranzKafkaYu Oct 19, 2022
a2515c2
Update bug_report.yml
FranzKafkaYu Oct 19, 2022
42a2549
Support for English
FranzKafkaYu Oct 23, 2022
9e73c8b
Update README.md
FranzKafkaYu Oct 23, 2022
a964138
Update README.md
FranzKafkaYu Oct 23, 2022
d0b98f4
update README
FranzKafkaYu Oct 24, 2022
53efeb7
Update bug_report.yml
FranzKafkaYu Oct 25, 2022
6bb012e
Update README.md
FranzKafkaYu Oct 25, 2022
a208b63
check if acme.sh already installed
tacrazymage Oct 25, 2022
8d1009a
check if acme already installed
tacrazymage Oct 25, 2022
67d34bd
Update
FranzKafkaYu Oct 25, 2022
7dfce14
Update x-ui.sh
FranzKafkaYu Nov 2, 2022
2ca93eb
Merge pull request #125 from tacrazymage/patch-1
FranzKafkaYu Nov 2, 2022
8be5f2d
format scripts
FranzKafkaYu Nov 2, 2022
cf841ea
Update README.md
FranzKafkaYu Nov 9, 2022
b6e1a10
fix install shell for English version
FranzKafkaYu Nov 12, 2022
1b088fb
Update README
FranzKafkaYu Nov 15, 2022
c85b861
translate README.md
Mazafard Nov 17, 2022
11059b7
update realese.yml
Mazafard Nov 17, 2022
1d9953c
Update README.md
Mazafard Nov 17, 2022
9670bd5
update README.md
Mazafard Nov 17, 2022
c6c3dbb
DELETE ISSUE MD
Mazafard Nov 17, 2022
6606843
Update issue templates
Mazafard Nov 17, 2022
fabc6ce
add cron job setting for updating geo data and xray log clear
FranzKafkaYu Nov 22, 2022
39ee5e0
fix for geosite url
FranzKafkaYu Nov 22, 2022
835bfc4
fix conflict
Mazafard Nov 30, 2022
c7dbc31
close issue Translate to English #2
Mazafard Nov 30, 2022
f8cb80c
add egnlish builder
Mazafard Nov 30, 2022
6b5e2ed
fix changes
Mazafard Nov 30, 2022
cf688cf
revert chineese relase
Mazafard Nov 30, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE/------.md

This file was deleted.

38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
57 changes: 57 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Issue Report
description: "Create a report to help us improve."
body:
- type: checkboxes
id: terms
attributes:
label: Welcome
options:
- label: Yes, I'm using the latest major release. Only such installations are supported.
required: true
- label: Yes, I'm using the supported system. Only such systems are supported.
required: true
- label: Yes, I have read all WIKI document,nothing can help me in my problem.
required: true
- label: Yes, I've searched similar issues on GitHub and didn't find any.
required: true
- label: Yes, I've included all information below (version, config, log, etc).
required: true

- type: textarea
id: problem
attributes:
label: Description of the problem,screencshot would be good
placeholder: Your problem description
validations:
required: true

- type: textarea
id: version
attributes:
label: Version of x-ui
value: |-
<details>

```console
$ x-ui version
# Paste output here
```

</details>
validations:
required: true

- type: textarea
id: log
attributes:
label: x-ui log or xray log
value: |-
<details>

```console
# paste log here
```

</details>
validations:
required: true
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/custom.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Custom issue template
about: Describe this issue template's purpose here.
title: ''
labels: ''
assignees: ''

---


20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
129 changes: 127 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

jobs:
release:
permissions: write-all
runs-on: ubuntu-latest
outputs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
Expand Down Expand Up @@ -61,6 +62,46 @@ jobs:
asset_path: x-ui-linux-amd64.tar.gz
asset_name: x-ui-linux-amd64.tar.gz
asset_content_type: application/gzip
linuxamd64enbuild:
name: build x-ui amd64 en version
needs: release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18
- name: build linux amd64 en version
run: |
CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o xui-release -v main.go
mkdir x-ui
cp xui-release x-ui/xui-release
cp x-ui.service x-ui/x-ui.service
cp x-ui_en.sh x-ui/x-ui.sh
cd x-ui
mv xui-release x-ui
mkdir bin
cd bin
wget https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-64.zip
unzip Xray-linux-64.zip
rm -f Xray-linux-64.zip geoip.dat geosite.dat
wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
mv xray xray-linux-amd64
cd ..
cd ..
- name: package
run: tar -zcvf x-ui-linux-amd64-english.tar.gz x-ui
- name: upload
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }}
with:
upload_url: ${{ needs.release.outputs.upload_url }}
asset_path: x-ui-linux-amd64-english.tar.gz
asset_name: x-ui-linux-amd64-english.tar.gz
asset_content_type: application/gzip
linuxarm64build:
name: build x-ui arm64 version
needs: release
Expand Down Expand Up @@ -103,6 +144,48 @@ jobs:
asset_path: x-ui-linux-arm64.tar.gz
asset_name: x-ui-linux-arm64.tar.gz
asset_content_type: application/gzip
linuxarm64enbuild:
name: build x-ui arm64 version
needs: release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18
- name: build linux arm64 en version
run: |
sudo apt-get update
sudo apt install gcc-aarch64-linux-gnu
CGO_ENABLED=1 GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc go build -o xui-release -v main.go
mkdir x-ui
cp xui-release x-ui/xui-release
cp x-ui.service x-ui/x-ui.service
cp x-ui_en.sh x-ui/x-ui.sh
cd x-ui
mv xui-release x-ui
mkdir bin
cd bin
wget https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-arm64-v8a.zip
unzip Xray-linux-arm64-v8a.zip
rm -f Xray-linux-arm64-v8a.zip geoip.dat geosite.dat
wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
mv xray xray-linux-arm64
cd ..
cd ..
- name: package
run: tar -zcvf x-ui-linux-arm64-english.tar.gz x-ui
- name: upload
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }}
with:
upload_url: ${{ needs.release.outputs.upload_url }}
asset_path: x-ui-linux-arm64-english.tar.gz
asset_name: x-ui-linux-arm64-english.tar.gz
asset_content_type: application/gzip
linuxs390xbuild:
name: build x-ui s390x version
needs: release
Expand All @@ -113,7 +196,7 @@ jobs:
uses: actions/setup-go@v2
with:
go-version: 1.18
- name: build linux s390x version
- name: build linux s390x en version
run: |
sudo apt-get update
sudo apt install gcc-s390x-linux-gnu -y
Expand Down Expand Up @@ -144,4 +227,46 @@ jobs:
upload_url: ${{ needs.release.outputs.upload_url }}
asset_path: x-ui-linux-s390x.tar.gz
asset_name: x-ui-linux-s390x.tar.gz
asset_content_type: application/gzip
asset_content_type: application/gzip
linuxs390xenbuild:
name: build x-ui s390x e version
needs: release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18
- name: build linux s390x en version
run: |
sudo apt-get update
sudo apt install gcc-s390x-linux-gnu -y
CGO_ENABLED=1 GOOS=linux GOARCH=s390x CC=s390x-linux-gnu-gcc go build -o xui-release -v main.go
mkdir x-ui
cp xui-release x-ui/xui-release
cp x-ui.service x-ui/x-ui.service
cp x-ui_en.sh x-ui/x-ui.sh
cd x-ui
mv xui-release x-ui
mkdir bin
cd bin
wget https://github.com/XTLS/Xray-core/releases/latest/download/Xray-linux-s390x.zip
unzip Xray-linux-s390x.zip
rm -f Xray-linux-s390x.zip geoip.dat geosite.dat
wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geoip.dat
wget https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/geosite.dat
mv xray xray-linux-s390x
cd ..
cd ..
- name: package
run: tar -zcvf x-ui-linux-s390x-english.tar.gz x-ui
- name: upload
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GAYHUB_TOKEN }}
with:
upload_url: ${{ needs.release.outputs.upload_url }}
asset_path: x-ui-linux-s390x-english.tar.gz
asset_name: x-ui-linux-s390x-english.tar.gz
asset_content_type: application/gzip
Loading