Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
49b38194
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,发现更多精彩内容 >>
提交
49b38194
编写于
8月 24, 2017
作者:
B
Bob Van Landuyt
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Only perform `join_message` in `validate_variable_usage`
上级
1da594d3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
10 deletion
+8
-10
lib/gitlab/po_linter.rb
lib/gitlab/po_linter.rb
+8
-9
spec/lib/gitlab/po_linter_spec.rb
spec/lib/gitlab/po_linter_spec.rb
+0
-1
未找到文件。
lib/gitlab/po_linter.rb
浏览文件 @
49b38194
...
...
@@ -86,15 +86,7 @@ module Gitlab
validate_unnamed_variables
(
errors
,
required_variables
)
validate_translation
(
errors
,
message_id
,
required_variables
)
message_translation
=
join_message
(
message_translation
)
# We don't need to validate when the message is empty.
# Translations could fallback to the default, or we could be validating a
# language that does not have plurals.
unless
message_translation
.
empty?
validate_variable_usage
(
errors
,
message_translation
,
required_variables
)
end
validate_variable_usage
(
errors
,
message_translation
,
required_variables
)
end
def
validate_translation
(
errors
,
message_id
,
used_variables
)
...
...
@@ -150,6 +142,13 @@ module Gitlab
end
def
validate_variable_usage
(
errors
,
translation
,
required_variables
)
translation
=
join_message
(
translation
)
# We don't need to validate when the message is empty.
# Translations could fallback to the default, or we could be validating a
# language that does not have plurals.
return
if
translation
.
empty?
found_variables
=
translation
.
scan
(
VARIABLE_REGEX
)
missing_variables
=
required_variables
-
found_variables
...
...
spec/lib/gitlab/po_linter_spec.rb
浏览文件 @
49b38194
...
...
@@ -226,7 +226,6 @@ describe Gitlab::PoLinter do
expect
(
errors
).
to
include
(
'Failure translating to en with []: broken'
)
end
it
"adds an error when trying to translate with incorrect variables when using unnamed variables"
do
errors
=
[]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录