-
Notifications
You must be signed in to change notification settings - Fork 75
datetime属性の形式を統一 #9717
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
datetime属性の形式を統一 #9717
Changes from all commits
2ff057d
1a3da0c
7dfca7d
23deca4
d3aa351
d878e05
bfb5814
af02cab
caef81f
46194af
efba32d
6af963f
1dbfb24
c734aa1
89ae91b
00f4c51
d232bc3
e85da16
743cea5
b21b770
db9da76
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,26 +33,29 @@ | |
| | 提出物作成中 | ||
| - elsif @product.published_at | ||
| .card-list-item-meta__item | ||
| time.a-meta | ||
| .a-meta | ||
| span.a-meta__label | ||
| | 提出 | ||
| = l(@product.published_at) | ||
| time.a-meta__value datetime=@product.published_at.iso8601 | ||
| = l(@product.published_at) | ||
| - else | ||
| .card-list-item-meta__item | ||
| time.a-meta | ||
| .a-meta | ||
| span.a-meta__label | ||
| | 提出 | ||
| = l(@product.created_at) | ||
| time.a-meta datetime=@product.created_at.iso8601 | ||
| = l(@product.created_at) | ||
|
|
||
| .card-list-item-meta__item | ||
| - if @product.updated_at | ||
| time.a-meta | ||
| .a-meta | ||
| span.a-meta__label | ||
| | 更新 | ||
| = l(@product.updated_at) | ||
| time.a-meta datetime=@product.updated_at.iso8601 | ||
| = l(@product.updated_at) | ||
|
|
||
| - if @display_until_next_elapsed_days && elapsed_days < @reply_deadline_days | ||
| time.a-meta | ||
| .a-meta | ||
| span.a-meta__label | ||
| | 次の経過日数まで | ||
| - if until_next_elapsed_days < 1 | ||
|
|
@@ -73,15 +76,17 @@ | |
| = link_to user, class: 'card-list-item__user-icons-icon' do | ||
| = image_tag user.avatar_url, class: "a-user-icon #{role_class_for_user(user)}", title: user.icon_title, alt: user.icon_title | ||
| .card-list-item-meta__item | ||
| time.a-meta | ||
| = "〜 #{l @product.comments.last.created_at, format: :date_and_time}" | ||
| .a-meta | ||
| | 〜 | ||
| time datetime=@product.comments.last.created_at.iso8601 | ||
| = l @product.comments.last.created_at, format: :date_and_time | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 「〜(から)」という記号は時間情報ではないため「~」だけtimeタグの外に出した |
||
|
|
||
| - if (@is_mentor || @is_admin) && @product.user.primary_role == 'trainee' | ||
| .card-list-item__row | ||
| .card-list-item-meta__items | ||
| .card-list-item-meta__item | ||
| - if @product.user.training_ends_on | ||
| time.a-meta dateTime=@product.user.training_ends_on | ||
| time.a-meta datetime=@product.user.training_ends_on.in_time_zone.iso8601 | ||
| span.a-meta__label | ||
| | 研修終了日 | ||
| span.a-meta__value | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,17 +24,17 @@ | |
| .a-meta 提出物作成中 | ||
| - elsif product.published_at | ||
| .card-list-item-meta__item | ||
| time.a-meta | ||
| time.a-meta datetime=product.published_at.iso8601 | ||
| span.a-meta__label 提出 | ||
| | #{l product.published_at} | ||
| - else | ||
| .card-list-item-meta__item | ||
| time.a-meta | ||
| time.a-meta datetime=product.created_at.iso8601 | ||
| span.a-meta__label 提出 | ||
| | #{l product.created_at} | ||
| .card-list-item-meta__item | ||
| - if product.updated_at | ||
| time.a-meta | ||
| time.a-meta datetime=product.updated_at.iso8601 | ||
| span.a-meta__label 更新 | ||
| | #{l product.updated_at} | ||
| - if !product.comments.empty? | ||
|
|
@@ -58,23 +58,35 @@ | |
| - if product.self_last_commented_at && product.mentor_last_commented_at | ||
| .card-list-item-meta__item | ||
| - if product.self_last_commented_at > product.mentor_last_commented_at | ||
| time.a-meta | ||
| | 〜 #{l product.self_last_commented_at}( | ||
| .a-meta | ||
| | 〜 | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 同じファイル内で 〜(U+301C、波ダッシュ)と ~(U+FF5E、全角チルダ)が混在しています。main ブランチでは全て 〜 で統一されているのに、この PR で2箇所だけ ~ に変わってしまっています。 L200あたり(提出者側): | 〜 ← 元通り
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 全角チルダを波ダッシュに修正に修正しました。 |
||
| time.a-meta datetime=product.self_last_commented_at.iso8601 | ||
| = l product.self_last_commented_at | ||
| |( | ||
| strong 提出者 | ||
| | ) | ||
| - elsif product.self_last_commented_at < product.mentor_last_commented_at | ||
| time.a-meta | ||
| | 〜 #{l product.mentor_last_commented_at}(メンター) | ||
| .a-meta | ||
| | 〜 | ||
| time.a-meta datetime=product.mentor_last_commented_at.iso8601 | ||
| = l product.mentor_last_commented_at | ||
| |(メンター) | ||
| - elsif product.self_last_commented_at || product.mentor_last_commented_at | ||
| .card-list-item-meta__item | ||
| - if product.self_last_commented_at | ||
| time.a-meta | ||
| | 〜 #{l product.self_last_commented_at}( | ||
| .a-meta | ||
| | 〜 | ||
| time.a-meta datetime=product.self_last_commented_at.iso8601 | ||
| = l product.self_last_commented_at | ||
| |( | ||
| strong 提出者 | ||
| | ) | ||
| - elsif product.mentor_last_commented_at | ||
| time.a-meta | ||
| | 〜 #{l product.mentor_last_commented_at}(メンター) | ||
| .a-meta | ||
| | 〜 | ||
| time.a-meta datetime=product.mentor_last_commented_at.iso8601 | ||
| = l product.mentor_last_commented_at | ||
| |(メンター) | ||
| - if current_user.mentor? && product.checks.empty? | ||
| .card-list-item__row.is-only-mentor | ||
| .card-list-item__assignee | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
「1時間未満」や「約○○時間」という曖昧な値は機械可読な形式で指定できないので、timeタグで扱うことをやめた。
ref: https://developer.mozilla.org/ja/docs/Web/HTML/Reference/Elements/time