Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'cyy_git_tag' into 'master'

Browse Source 
* Modify tag get.

See merge request easycorp/zentaopms!4670
This commit is contained in:
李玉春
2022-07-27 02:10:11 +00:00
parent 0b87a710f1 a3a27c51ec
commit 8e0a5d4eee
3 changed files with 71 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/scm/gitea.class.php
+8 -1
View File
@@ -21,7 +21,14 @@ class Gitea
$this->client = $client;
$this->root = rtrim($root, DIRECTORY_SEPARATOR);
$this->branch = isset($_COOKIE['repoBranch']) ? 'origin/' . $_COOKIE['repoBranch'] : '';
$branch = isset($_COOKIE['repoBranch']) ? $_COOKIE['repoBranch'] : '';
if($branch)
{
$branches = $this->branch();
if(isset($branches[$branch])) $branch = "origin/$branch";
}
$this->branch = $branch;
chdir($this->root);
exec("{$this->client} config core.quotepath false");
lib/scm/gitrepo.class.php
+8 -1
View File
@@ -21,7 +21,14 @@ class GitRepo
$this->client = $client;
$this->root = rtrim($root, DIRECTORY_SEPARATOR);
$this->branch = isset($_COOKIE['repoBranch']) ? 'origin/' . $_COOKIE['repoBranch'] : '';
$branch = isset($_COOKIE['repoBranch']) ? $_COOKIE['repoBranch'] : '';
if($branch)
{
$branches = $this->branch();
if(isset($branches[$branch])) $branch = "origin/$branch";
}
$this->branch = $branch;
chdir($this->root);
exec("{$this->client} config core.quotepath false");
module/repo/lang/vi.php
+55 -44
View File
@@ -57,48 +57,52 @@ $lang->repo->line = 'Dòng';
$lang->repo->expand = 'Mở ra';
$lang->repo->collapse = 'Gấp lại';
$lang->repo->id = 'ID';
$lang->repo->SCM = 'Loại';
$lang->repo->name = 'Tên';
$lang->repo->path = 'Đường dẫn';
$lang->repo->prefix = 'Prefix';
$lang->repo->config = 'Cấu hình';
$lang->repo->desc = 'Mô tả';
$lang->repo->account = 'Người dùng';
$lang->repo->password = 'Mật khẩu';
$lang->repo->encoding = 'Encoding';
$lang->repo->client = 'Client Path';
$lang->repo->size = 'Size';
$lang->repo->revision = 'Revision';
$lang->repo->revisionA = 'Revision';
$lang->repo->revisions = 'Revision';
$lang->repo->time = 'Ngày';
$lang->repo->committer = 'Committer';
$lang->repo->commits = 'Commits';
$lang->repo->synced = 'Khởi tạo đồng bộ';
$lang->repo->lastSync = 'Last Sync';
$lang->repo->deleted = 'Đã xóa';
$lang->repo->commit = 'Giao phó';
$lang->repo->comment = 'Nhận xét';
$lang->repo->view = 'Xem File';
$lang->repo->viewA = 'Xem';
$lang->repo->log = 'Revision nhật ký';
$lang->repo->blame = 'Blame';
$lang->repo->date = 'Ngày';
$lang->repo->diff = 'Diff';
$lang->repo->diffAB = 'Diff';
$lang->repo->diffAll = 'Diff tất cả';
$lang->repo->viewDiff = 'Xem diff';
$lang->repo->allLog = 'Tất cả Revisions';
$lang->repo->location = 'Vị trí';
$lang->repo->file = 'File';
$lang->repo->action = 'Hành động';
$lang->repo->code = 'Mã';
$lang->repo->review = 'Repo duyệt';
$lang->repo->acl = 'Phân quyền';
$lang->repo->group = 'Nhóm';
$lang->repo->user = 'Người dùng';
$lang->repo->info = 'Thông tin phiên bản';
$lang->repo->id = 'ID';
$lang->repo->SCM = 'Loại';
$lang->repo->name = 'Tên';
$lang->repo->path = 'Đường dẫn';
$lang->repo->prefix = 'Prefix';
$lang->repo->config = 'Cấu hình';
$lang->repo->desc = 'Mô tả';
$lang->repo->account = 'Người dùng';
$lang->repo->password = 'Mật khẩu';
$lang->repo->encoding = 'Encoding';
$lang->repo->client = 'Client Path';
$lang->repo->size = 'Size';
$lang->repo->revision = 'Revision';
$lang->repo->revisionA = 'Revision';
$lang->repo->revisions = 'Revision';
$lang->repo->time = 'Ngày';
$lang->repo->committer = 'Committer';
$lang->repo->commits = 'Commits';
$lang->repo->synced = 'Khởi tạo đồng bộ';
$lang->repo->lastSync = 'Last Sync';
$lang->repo->deleted = 'Đã xóa';
$lang->repo->commit = 'Giao phó';
$lang->repo->comment = 'Nhận xét';
$lang->repo->view = 'Xem File';
$lang->repo->viewA = 'Xem';
$lang->repo->log = 'Revision nhật ký';
$lang->repo->blame = 'Blame';
$lang->repo->date = 'Ngày';
$lang->repo->diff = 'Diff';
$lang->repo->diffAB = 'Diff';
$lang->repo->diffAll = 'Diff tất cả';
$lang->repo->viewDiff = 'Xem diff';
$lang->repo->allLog = 'Tất cả Revisions';
$lang->repo->location = 'Vị trí';
$lang->repo->file = 'File';
$lang->repo->action = 'Hành động';
$lang->repo->code = 'Mã';
$lang->repo->review = 'Repo duyệt';
$lang->repo->acl = 'Phân quyền';
$lang->repo->group = 'Nhóm';
$lang->repo->user = 'Người dùng';
$lang->repo->info = 'Thông tin phiên bản';
$lang->repo->job = 'Job';
$lang->repo->fileServerUrl = 'File Server Url';
$lang->repo->fileServerAccount = 'File Server Account';
$lang->repo->fileServerPassword = 'File Server Password';
$lang->repo->title = 'Tiêu đề';
$lang->repo->status = 'Tình trạng';
@@ -149,6 +153,9 @@ $lang->repo->gitlabProject = 'Project';
$lang->repo->serviceHost = 'Host';
$lang->repo->serviceProject = 'Project';
$lang->repo->placeholder = new stdclass;
$lang->repo->placeholder->gitlabHost = 'Input url of gitlab';
$lang->repo->notice = new stdclass();
$lang->repo->notice->syncing = 'Đang đồng bộ. Vui lòng đợi ...';
$lang->repo->notice->syncComplete = 'Synchronized. Now redirecting ...';
@@ -156,6 +163,7 @@ $lang->repo->notice->syncedCount = 'The number of records synchronized is ';
$lang->repo->notice->delete = 'Bạn có muốn xóa this repo?';
$lang->repo->notice->successDelete = 'Repository is removed.';
$lang->repo->notice->commentContent = 'Nhận xét';
$lang->repo->notice->deleteReview = 'Do you want to delete this review?';
$lang->repo->notice->deleteBug = 'Bạn có muốn xóa bug này?';
$lang->repo->notice->deleteComment = 'Bạn có muốn xóa this comment?';
$lang->repo->notice->lastSyncTime = 'Last Sync:';
@@ -187,12 +195,15 @@ $lang->repo->error->output = "The command is: %s\nThe error is(%s): %s\n"
$lang->repo->error->clientVersion = "Client version is too low, please upgrade or change SVN client";
$lang->repo->error->encoding = "The encoding maybe wrong. Vui lòng change the encoding and try again.";
$lang->repo->error->deleted = "Deletion of the repository failed. The current repository has a commit record associated with the design.";
$lang->repo->error->linkedJob = "Deletion of the repository failed. The current repository has associated with the Compile.";
$lang->repo->error->clientPath = "The client installation directory cannot have spaces!";
$lang->repo->error->notFound = "The repository %s’s URL %s does not exist. Please confirm if this repository has been deleted from the local server.";
$lang->repo->error->noWritable = '%s is not writable! Please check the privilege, or download will not be done.';
$lang->repo->error->unconnected = 'The directory does not match the repository';
$lang->repo->syncTips = '<strong>Bạn có thể tìm tham khảo làm sao thiết lập đồng bộ Git từ <a target="_blank" href="https://www.zentao.pm/book/zentaomanual/free-open-source-project-management-software-git-105.html">here</a>.</strong>';
$lang->repo->encodingsTips = "The encodings of commit comments, can be comma separated values，ví dụ: utf-8";
$lang->repo->syncTips = '<strong>Bạn có thể tìm tham khảo làm sao thiết lập đồng bộ Git từ <a target="_blank" href="https://www.zentao.pm/book/zentaomanual/free-open-source-project-management-software-git-105.html">here</a>.</strong>';
$lang->repo->encodingsTips = "The encodings of commit comments, can be comma separated values，ví dụ: utf-8";
$lang->repo->pathTipsForGitlab = "GitLab Project URL";
$lang->repo->example = new stdclass();
$lang->repo->example->client = new stdclass();