Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
08304732
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
08304732
编写于
2月 04, 2020
作者:
R
Rafael França
提交者:
GitHub
2月 04, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #38384 from tjschuck/cannot_cannot_be_can_not_pt_2
Change all "can not"s to the correct "cannot"
上级
a7104fa4
6af50a90
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
3 addition
and
3 deletion
+3
-3
activerecord/lib/active_record/associations/preloader/association.rb
...d/lib/active_record/associations/preloader/association.rb
+1
-1
activesupport/lib/active_support/inflector/transliterate.rb
activesupport/lib/active_support/inflector/transliterate.rb
+1
-1
activesupport/test/transliterate_test.rb
activesupport/test/transliterate_test.rb
+1
-1
未找到文件。
activerecord/lib/active_record/associations/preloader/association.rb
浏览文件 @
08304732
...
...
@@ -19,7 +19,7 @@ def run
end
else
# Custom preload scope is used and
# the association can
not be marked as loaded
# the association cannot be marked as loaded
# Loading into a Hash instead
records_by_owner
end
...
...
activesupport/lib/active_support/inflector/transliterate.rb
浏览文件 @
08304732
...
...
@@ -64,7 +64,7 @@ module Inflector
def
transliterate
(
string
,
replacement
=
"?"
,
locale:
nil
)
string
=
string
.
dup
if
string
.
frozen?
raise
ArgumentError
,
"Can only transliterate strings. Received
#{
string
.
class
.
name
}
"
unless
string
.
is_a?
(
String
)
raise
ArgumentError
,
"Can
not transliterate strings with
#{
string
.
encoding
}
encoding"
unless
ALLOWED_ENCODINGS_FOR_TRANSLITERATE
.
include?
(
string
.
encoding
)
raise
ArgumentError
,
"Cannot transliterate strings with
#{
string
.
encoding
}
encoding"
unless
ALLOWED_ENCODINGS_FOR_TRANSLITERATE
.
include?
(
string
.
encoding
)
input_encoding
=
string
.
encoding
...
...
activesupport/test/transliterate_test.rb
浏览文件 @
08304732
...
...
@@ -88,7 +88,7 @@ def test_transliterate_handles_strings_with_incompatible_encodings
exception
=
assert_raises
ArgumentError
do
ActiveSupport
::
Inflector
.
transliterate
(
string
)
end
assert_equal
"Can
not transliterate strings with
#{
encoding
}
encoding"
,
exception
.
message
assert_equal
"Cannot transliterate strings with
#{
encoding
}
encoding"
,
exception
.
message
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录