Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
fbdfc05b
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fbdfc05b
编写于
5月 16, 2019
作者:
F
Filipa Lacerda
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'js-i18n-i' into 'master'
i18n JS files starting with i See merge request gitlab-org/gitlab-ce!28010
上级
9ef67989
ed8dc177
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
31 addition
and
9 deletion
+31
-9
app/assets/javascripts/issuable_bulk_update_actions.js
app/assets/javascripts/issuable_bulk_update_actions.js
+2
-1
app/assets/javascripts/issuable_index.js
app/assets/javascripts/issuable_index.js
+4
-4
app/assets/javascripts/issue.js
app/assets/javascripts/issue.js
+8
-3
app/assets/javascripts/issue_status_select.js
app/assets/javascripts/issue_status_select.js
+2
-1
locale/gitlab.pot
locale/gitlab.pot
+15
-0
未找到文件。
app/assets/javascripts/issuable_bulk_update_actions.js
浏览文件 @
fbdfc05b
...
...
@@ -4,6 +4,7 @@ import $ from 'jquery';
import
_
from
'
underscore
'
;
import
axios
from
'
./lib/utils/axios_utils
'
;
import
Flash
from
'
./flash
'
;
import
{
__
}
from
'
./locale
'
;
export
default
{
init
({
container
,
form
,
issues
,
prefixId
}
=
{})
{
...
...
@@ -32,7 +33,7 @@ export default {
onFormSubmitFailure
()
{
this
.
form
.
find
(
'
[type="submit"]
'
).
enable
();
return
new
Flash
(
'
Issue update failed
'
);
return
new
Flash
(
__
(
'
Issue update failed
'
)
);
},
getSelectedIssues
()
{
...
...
app/assets/javascripts/issuable_index.js
浏览文件 @
fbdfc05b
import
$
from
'
jquery
'
;
import
axios
from
'
./lib/utils/axios_utils
'
;
import
flash
from
'
./flash
'
;
import
{
__
}
from
'
./locale
'
;
import
{
s__
,
__
}
from
'
./locale
'
;
import
IssuableBulkUpdateSidebar
from
'
./issuable_bulk_update_sidebar
'
;
import
IssuableBulkUpdateActions
from
'
./issuable_bulk_update_actions
'
;
...
...
@@ -29,7 +29,7 @@ export default class IssuableIndex {
$resetToken
.
on
(
'
click
'
,
e
=>
{
e
.
preventDefault
();
$resetToken
.
text
(
'
resetting...
'
);
$resetToken
.
text
(
s__
(
'
EmailToken|resetting...
'
)
);
axios
.
put
(
$resetToken
.
attr
(
'
href
'
))
...
...
@@ -38,12 +38,12 @@ export default class IssuableIndex {
.
val
(
data
.
new_address
)
.
focus
();
$resetToken
.
text
(
'
reset it
'
);
$resetToken
.
text
(
s__
(
'
EmailToken|reset it
'
)
);
})
.
catch
(()
=>
{
flash
(
__
(
'
There was an error when reseting email token.
'
));
$resetToken
.
text
(
'
reset it
'
);
$resetToken
.
text
(
s__
(
'
EmailToken|reset it
'
)
);
});
});
}
...
...
app/assets/javascripts/issue.js
浏览文件 @
fbdfc05b
...
...
@@ -7,6 +7,7 @@ import flash from './flash';
import
TaskList
from
'
./task_list
'
;
import
CreateMergeRequestDropdown
from
'
./create_merge_request_dropdown
'
;
import
IssuablesHelper
from
'
./helpers/issuables_helper
'
;
import
{
__
}
from
'
./locale
'
;
export
default
class
Issue
{
constructor
()
{
...
...
@@ -44,7 +45,11 @@ export default class Issue {
* @param {Array} data
* @param {String} issueFailMessage
*/
updateTopState
(
isClosed
,
data
,
issueFailMessage
=
'
Unable to update this issue at this time.
'
)
{
updateTopState
(
isClosed
,
data
,
issueFailMessage
=
__
(
'
Unable to update this issue at this time.
'
),
)
{
if
(
'
id
'
in
data
)
{
const
isClosedBadge
=
$
(
'
div.status-box-issue-closed
'
);
const
isOpenBadge
=
$
(
'
div.status-box-open
'
);
...
...
@@ -81,7 +86,7 @@ export default class Issue {
}
initIssueBtnEventListeners
()
{
const
issueFailMessage
=
'
Unable to update this issue at this time.
'
;
const
issueFailMessage
=
__
(
'
Unable to update this issue at this time.
'
)
;
return
$
(
document
).
on
(
'
click
'
,
...
...
@@ -152,6 +157,6 @@ export default class Issue {
$container
.
html
(
data
.
html
);
}
})
.
catch
(()
=>
flash
(
'
Failed to load related branches
'
));
.
catch
(()
=>
flash
(
__
(
'
Failed to load related branches
'
)
));
}
}
app/assets/javascripts/issue_status_select.js
浏览文件 @
fbdfc05b
import
$
from
'
jquery
'
;
import
{
__
}
from
'
./locale
'
;
export
default
function
issueStatusSelect
()
{
$
(
'
.js-issue-status
'
).
each
((
i
,
el
)
=>
{
...
...
@@ -7,7 +8,7 @@ export default function issueStatusSelect() {
selectable
:
true
,
fieldName
,
toggleLabel
(
selected
,
element
,
instance
)
{
let
label
=
'
Author
'
;
let
label
=
__
(
'
Author
'
)
;
const
$item
=
instance
.
dropdown
.
find
(
'
.is-active
'
);
if
(
$item
.
length
)
{
label
=
$item
.
text
();
...
...
locale/gitlab.pot
浏览文件 @
fbdfc05b
...
...
@@ -3620,6 +3620,12 @@ msgstr ""
msgid "EmailError|Your account has been blocked. If you believe this is in error, contact a staff member."
msgstr ""
msgid "EmailToken|reset it"
msgstr ""
msgid "EmailToken|resetting..."
msgstr ""
msgid "Emails"
msgstr ""
...
...
@@ -4217,6 +4223,9 @@ msgstr ""
msgid "Failed to load errors from Sentry. Error message: %{errorMessage}"
msgstr ""
msgid "Failed to load related branches"
msgstr ""
msgid "Failed to promote label due to internal error. Please contact administrators."
msgstr ""
...
...
@@ -5241,6 +5250,9 @@ msgstr ""
msgid "Issue events"
msgstr ""
msgid "Issue update failed"
msgstr ""
msgid "IssueBoards|Board"
msgstr ""
...
...
@@ -10340,6 +10352,9 @@ msgstr ""
msgid "Unable to schedule a pipeline to run immediately"
msgstr ""
msgid "Unable to update this issue at this time."
msgstr ""
msgid "Unarchive project"
msgstr ""
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录