diff --git a/.gitpod.yml b/.gitpod.yml
index 228f1b94c..6fd6797b5 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -3,7 +3,7 @@ tasks:
# Fix because of https://github.com/gitpod-io/gitpod/issues/16614
before: sudo curl -o /usr/local/bin/docker-compose -fsSL https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-$(uname -m)
init: |
- cp .env.example .env &&
+ cp .env.development.example .env &&
sed -i "s#APP_URL=http://localhost#APP_URL=$(gp url 8000)#g" .env
sed -i "s#USERID=#USERID=33333#g" .env
sed -i "s#GROUPID=#GROUPID=33333#g" .env
@@ -20,7 +20,7 @@ tasks:
echo "Waiting for Sail environment to boot up."
gp sync-await spin-is-ready
./vendor/bin/spin exec vite npm install
- ./vendor/bin/spin exec vite npm run dev
+ ./vendor/bin/spin exec vite npm run dev -- --host
- name: Laravel Queue Worker, listening to code changes
command: |
diff --git a/app/Livewire/Project/New/PublicGitRepository.php b/app/Livewire/Project/New/PublicGitRepository.php
index c6c699acf..b71a0b670 100644
--- a/app/Livewire/Project/New/PublicGitRepository.php
+++ b/app/Livewire/Project/New/PublicGitRepository.php
@@ -98,7 +98,8 @@ class PublicGitRepository extends Component
(str($this->repository_url)->startsWith('https://') ||
str($this->repository_url)->startsWith('http://')) &&
!str($this->repository_url)->endsWith('.git') &&
- !str($this->repository_url)->contains('github.com')
+ (!str($this->repository_url)->contains('github.com') ||
+ !str($this->repository_url)->contains('git.sr.ht'))
) {
$this->repository_url = $this->repository_url . '.git';
}
diff --git a/lang/zh-cn.json b/lang/zh-cn.json
new file mode 100644
index 000000000..70c457fa8
--- /dev/null
+++ b/lang/zh-cn.json
@@ -0,0 +1,30 @@
+{
+ "auth.login": "登录",
+ "auth.login.azure": "使用 Microsoft 登录",
+ "auth.login.bitbucket": "使用 Bitbucket 登录",
+ "auth.login.github": "使用 GitHub 登录",
+ "auth.login.gitlab": "使用 Gitlab 登录",
+ "auth.login.google": "使用 Google 登录",
+ "auth.already_registered": "已经注册?",
+ "auth.confirm_password": "确认密码",
+ "auth.forgot_password": "忘记密码",
+ "auth.forgot_password_send_email": "发送密码重置邮件",
+ "auth.register_now": "注册",
+ "auth.logout": "退出登录",
+ "auth.register": "注册",
+ "auth.registration_disabled": "注册已禁用,请联系管理员",
+ "auth.reset_password": "重置密码",
+ "auth.failed": "这些凭据与我们的记录不符",
+ "auth.failed.callback": "处理第三方登录的回调时出错",
+ "auth.failed.password": "密码错误",
+ "auth.failed.email": "该账户未注册",
+ "auth.throttle": "登录次数过多,请在 :seconds 秒后重试",
+ "input.name": "用户名",
+ "input.email": "邮箱",
+ "input.password": "密码",
+ "input.password.again": "确认密码",
+ "input.code": "验证码",
+ "input.recovery_code": "恢复码",
+ "button.save": "保存",
+ "repository.url": "示例
对于公共代码仓库,请使用 https://...。
对于私有代码仓库,请使用 git@...。
https://github.com/coollabsio/coolify-examples main 分支将被选择
https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify nodejs-fastify 分支将被选择。
https://gitea.com/sedlav/expressjs.git main 分支将被选择。
https://gitlab.com/andrasbacsai/nodejs-example.git main 分支将被选择"
+}
diff --git a/resources/views/livewire/project/shared/tags.blade.php b/resources/views/livewire/project/shared/tags.blade.php
index 2d4240dfa..0de2540fd 100644
--- a/resources/views/livewire/project/shared/tags.blade.php
+++ b/resources/views/livewire/project/shared/tags.blade.php
@@ -21,7 +21,7 @@