Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
33cc3667
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,发现更多精彩内容 >>
提交
33cc3667
编写于
2月 13, 2011
作者:
J
Josh Kalderimis
提交者:
Santiago Pastorino
2月 12, 2011
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow for the format of time_tag in AP to be changed via an option argument.
Signed-off-by:
N
Santiago Pastorino
<
santiago@wyeworks.com
>
上级
95a5bd87
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
8 deletion
+16
-8
actionpack/lib/action_view/helpers/date_helper.rb
actionpack/lib/action_view/helpers/date_helper.rb
+5
-3
actionpack/test/template/date_helper_test.rb
actionpack/test/template/date_helper_test.rb
+11
-5
未找到文件。
actionpack/lib/action_view/helpers/date_helper.rb
浏览文件 @
33cc3667
...
...
@@ -566,7 +566,7 @@ def select_month(date, options = {}, html_options = {})
def
select_year
(
date
,
options
=
{},
html_options
=
{})
DateTimeSelector
.
new
(
date
,
options
,
html_options
).
select_year
end
# Returns an html time tag for the given date or time.
#
# ==== Examples
...
...
@@ -581,9 +581,11 @@ def select_year(date, options = {}, html_options = {})
#
def
time_tag
(
date_or_time
,
*
args
)
options
=
args
.
extract_options!
content
=
args
.
first
||
I18n
.
l
(
date_or_time
,
:format
=>
:long
)
format
=
options
.
delete
(
:format
)
||
:long
content
=
args
.
first
||
I18n
.
l
(
date_or_time
,
:format
=>
format
)
datetime
=
date_or_time
.
acts_like?
(
:time
)
?
date_or_time
.
xmlschema
:
date_or_time
.
rfc3339
content_tag
:time
,
content
,
options
.
reverse_merge
(
:datetime
=>
datetime
)
content_tag
(
:time
,
content
,
options
.
reverse_merge
(
:datetime
=>
datetime
))
end
end
...
...
actionpack/test/template/date_helper_test.rb
浏览文件 @
33cc3667
...
...
@@ -2699,27 +2699,33 @@ def test_object_select_html_safety
assert
date_select
(
"post"
,
"written_on"
,
:default
=>
Time
.
local
(
2006
,
9
,
19
,
15
,
16
,
35
),
:include_blank
=>
true
).
html_safe?
assert
time_select
(
"post"
,
"written_on"
,
:ignore_date
=>
true
).
html_safe?
end
def
test_time_tag_with_date
date
=
Date
.
today
expected
=
"<time datetime=
\"
#{
date
.
rfc3339
}
\"
>
#{
I18n
.
l
(
date
,
:format
=>
:long
)
}
</time>"
assert_equal
expected
,
time_tag
(
date
)
end
def
test_time_tag_with_time
time
=
Time
.
now
expected
=
"<time datetime=
\"
#{
time
.
xmlschema
}
\"
>
#{
I18n
.
l
(
time
,
:format
=>
:long
)
}
</time>"
assert_equal
expected
,
time_tag
(
time
)
end
def
test_time_tag_pubdate_option
assert_match
/<time.*pubdate="pubdate">.*<\/time>/
,
time_tag
(
Time
.
now
,
:pubdate
=>
true
)
end
def
test_time_tag_with_given_text
assert_match
/<time.*>Right now<\/time>/
,
time_tag
(
Time
.
now
,
'Right now'
)
end
def
test_time_tag_with_different_format
time
=
Time
.
now
expected
=
"<time datetime=
\"
#{
time
.
xmlschema
}
\"
>
#{
I18n
.
l
(
time
,
:format
=>
:short
)
}
</time>"
assert_equal
expected
,
time_tag
(
time
,
:format
=>
:short
)
end
protected
def
with_env_tz
(
new_tz
=
'US/Eastern'
)
old_tz
,
ENV
[
'TZ'
]
=
ENV
[
'TZ'
],
new_tz
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录