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

* Adjust branch create tips.

Browse Source
This commit is contained in:
caoyanyi
2024-04-07 15:32:11 +08:00
parent 10d3f435bd
commit e92d5ef5c8
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/repo/lang/de.php
+4 -4
View File
@@ -275,16 +275,16 @@ $lang->repo->typeList['logicError'] = 'Logic Error';
$lang->repo->featureBar['maintain']['all'] = 'All';
$lang->repo->errorLang[0] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
$lang->repo->errorLang[0] = "Can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
$lang->repo->errorLang[1] = 'Branch is exists';
$lang->repo->errorLang[2] = 'branch .* already exists';
$lang->repo->errorLang[2] = 'Branch .* already exists';
$lang->repo->errorLang[3] = 'Forbidden';
$lang->repo->errorLang[4] = 'cannot have ASCII control characters';
$lang->repo->errorLang[4] = 'Cannot have ASCII control characters';
$lang->repo->errorLang[5] = 'Created fail';
$lang->repo->apiError[0] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
$lang->repo->apiError[1] = 'Branch is exists';
$lang->repo->apiError[2] = 'branch .* already exists';
$lang->repo->apiError[2] = 'branch.* already exists';
$lang->repo->apiError[3] = 'Forbidden';
$lang->repo->apiError[4] = 'cannot have ASCII control characters';
$lang->repo->apiError[5] = 'Created fail';
module/repo/lang/en.php
+4 -4
View File
@@ -275,16 +275,16 @@ $lang->repo->typeList['logicError'] = 'Logic Error';
$lang->repo->featureBar['maintain']['all'] = 'All';
$lang->repo->errorLang[0] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
$lang->repo->errorLang[0] = "Can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
$lang->repo->errorLang[1] = 'Branch is exists';
$lang->repo->errorLang[2] = 'branch .* already exists';
$lang->repo->errorLang[2] = 'Branch already exists';
$lang->repo->errorLang[3] = 'Forbidden';
$lang->repo->errorLang[4] = 'cannot have ASCII control characters';
$lang->repo->errorLang[4] = 'Cannot have ASCII control characters';
$lang->repo->errorLang[5] = 'Created fail';
$lang->repo->apiError[0] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
$lang->repo->apiError[1] = 'Branch is exists';
$lang->repo->apiError[2] = 'branch .* already exists';
$lang->repo->apiError[2] = 'branch.* already exists';
$lang->repo->apiError[3] = 'Forbidden';
$lang->repo->apiError[4] = 'cannot have ASCII control characters';
$lang->repo->apiError[5] = 'Created fail';
module/repo/lang/fr.php
+4 -4
View File
@@ -275,16 +275,16 @@ $lang->repo->typeList['logicError'] = 'Erreur Logique';
$lang->repo->featureBar['maintain']['all'] = 'All';
$lang->repo->errorLang[0] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
$lang->repo->errorLang[0] = "Can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
$lang->repo->errorLang[1] = 'Branch is exists';
$lang->repo->errorLang[2] = 'branch .* already exists';
$lang->repo->errorLang[2] = 'Branch .* already exists';
$lang->repo->errorLang[3] = 'Forbidden';
$lang->repo->errorLang[4] = 'cannot have ASCII control characters';
$lang->repo->errorLang[4] = 'Cannot have ASCII control characters';
$lang->repo->errorLang[5] = 'Created fail';
$lang->repo->apiError[0] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
$lang->repo->apiError[1] = 'Branch is exists';
$lang->repo->apiError[2] = 'branch .* already exists';
$lang->repo->apiError[2] = 'branch.* already exists';
$lang->repo->apiError[3] = 'Forbidden';
$lang->repo->apiError[4] = 'cannot have ASCII control characters';
$lang->repo->apiError[5] = 'Created fail';
module/repo/lang/zh-cn.php
+1 -1
View File
@@ -284,7 +284,7 @@ $lang->repo->errorLang[5] = '分支创建失败';
$lang->repo->apiError[0] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
$lang->repo->apiError[1] = 'Branch is exists';
$lang->repo->apiError[2] = 'branch .* already exists';
$lang->repo->apiError[2] = 'branch.* already exists';
$lang->repo->apiError[3] = 'Forbidden';
$lang->repo->apiError[4] = 'cannot have ASCII control characters';
$lang->repo->apiError[5] = 'Created fail';
module/repo/zen.php
+1 -1
View File
@@ -1633,7 +1633,7 @@ class repoZen extends repo
{
foreach($this->lang->repo->apiError as $key => $pattern)
{
if(preg_match("/$pattern/", $message))
if(preg_match("/$pattern/i", $message))
{
$message = zget($this->lang->repo->errorLang, $key);
break;