Skip to content
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

feat: specified commercial transaction #71

Merged
merged 4 commits into from
Feb 3, 2023
Merged

Conversation

maito1201
Copy link
Contributor

@maito1201 maito1201 commented Feb 2, 2023

概要

  • 特商法表記の追加
  • スピーカー募集終了に伴う導線削除

Screen shot

日本語
image

英語
image

image

Copy link
Member

@taigakiyokawa taigakiyokawa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

対応ありがとうございます!
1点だけ細かい指摘をしましたがこのままでも問題ないので Approve しておきます 🙆‍♂️

src/i18n/en.json Outdated
@@ -14,5 +14,6 @@
"target_info": "gopher, aspiring engineer, interested in Go",
"host": "organizer",
"gophers_japan": "Institute Gophers Japan",
"specified_commercial_transaction": "Specified Commercial Transaction",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nits
https://www.japaneselawtranslation.go.jp/en/laws/view/3340/en によると「特定商取引法」は 「Act on Specified Commercial Transactions」が正しそうです。 今のままでも十分伝わるとは思うのでどちらでもOKです。

Suggested change
"specified_commercial_transaction": "Specified Commercial Transaction",
"act_on_specified_commercial_transactions": "Act on Specified Commercial Transactions",

ちなみに「〜に基づく表記」まで訳そうとすると「Notation based on the Act on Specified Commercial Transactions」や「Information Required under the Act on Specified Commercial Transactions of Japan」などになるみたいですがそこまでやらなくても良いとは思います。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

指摘ありがとうございます、修正しました

@maito1201 maito1201 merged commit 154c8fd into main Feb 3, 2023
maito1201 added a commit that referenced this pull request Feb 3, 2023
* [fix] Fix date for closing application from Sat to Tue (#65) (#66)

* feat: community booth section (#67)

* feat: specified commercial transaction (#71)

* feat: specified commercial transaction

* fix typo

* fix: i18n locale

* fix: english explanation

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>
maito1201 added a commit that referenced this pull request Feb 23, 2023
* [fix] Fix date for closing application from Sat to Tue (#65) (#66)

* feat: community booth section (#67)

* feat: specified commercial transaction (#71)

* feat: specified commercial transaction

* fix typo

* fix: i18n locale

* fix: english explanation

* feat: add information about CfP result (#165)

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>
maito1201 added a commit that referenced this pull request Mar 11, 2023
* feat: specified commercial transaction

* fix typo

* fix: i18n locale

* fix: english explanation
maito1201 added a commit that referenced this pull request Apr 1, 2023
* [fix] Fix date for closing application from Sat to Tue (#65)

* feat: add GitHub template (#68)

* fix: template (#69)

* fix: file structure (#70)

* merge main into develop (#72)

* [fix] Fix date for closing application from Sat to Tue (#65) (#66)

* feat: community booth section (#67)

* feat: specified commercial transaction (#71)

* feat: specified commercial transaction

* fix typo

* fix: i18n locale

* fix: english explanation

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>

* Merge main into develop (#169)

* [fix] Fix date for closing application from Sat to Tue (#65) (#66)

* feat: community booth section (#67)

* feat: specified commercial transaction (#71)

* feat: specified commercial transaction

* fix typo

* fix: i18n locale

* fix: english explanation

* feat: add information about CfP result (#165)

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>

* feat: useSessionize (#171)

* feat: useSettionize

* add EOL

* スポンサー(パートナー)ページの実装 (#170)

* feat: partner page

* SAMPLE json / images

* fix: `desc` to `description`

* fix: simplify prop type name

* fix: `desc` to `description`

* fix: extract params from context

* feat: header with link (#172)

* chore: Remove CommunityBoothSection from PageTop (#174)

* chore: Temporarily change links of Header to the links to HTML pages build by Sessionize (#173)

* chore: Remove `next/link` temporary for forwarding to HTML pages build by Sessionize

* chore: Temporarily change links of Header to the links to HTML pages build by Sessionize

* fix(HeaderMenu): Use `next/link` when href is `/`

* Proposal feat: hide home label from header (#175)

* feat: hide home label from header

* fix header menu

* comment out unused import

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>
Co-authored-by: sivchari <[email protected]>
Co-authored-by: Shinji Nakamatsu <[email protected]>
maito1201 added a commit that referenced this pull request Apr 2, 2023
* [fix] Fix date for closing application from Sat to Tue (#65)

* feat: add GitHub template (#68)

* fix: template (#69)

* fix: file structure (#70)

* merge main into develop (#72)

* [fix] Fix date for closing application from Sat to Tue (#65) (#66)

* feat: community booth section (#67)

* feat: specified commercial transaction (#71)

* feat: specified commercial transaction

* fix typo

* fix: i18n locale

* fix: english explanation

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>

* Merge main into develop (#169)

* [fix] Fix date for closing application from Sat to Tue (#65) (#66)

* feat: community booth section (#67)

* feat: specified commercial transaction (#71)

* feat: specified commercial transaction

* fix typo

* fix: i18n locale

* fix: english explanation

* feat: add information about CfP result (#165)

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>

* feat: useSessionize (#171)

* feat: useSettionize

* add EOL

* スポンサー(パートナー)ページの実装 (#170)

* feat: partner page

* SAMPLE json / images

* fix: `desc` to `description`

* fix: simplify prop type name

* fix: `desc` to `description`

* fix: extract params from context

* feat: header with link (#172)

* chore: Remove CommunityBoothSection from PageTop (#174)

* chore: Temporarily change links of Header to the links to HTML pages build by Sessionize (#173)

* chore: Remove `next/link` temporary for forwarding to HTML pages build by Sessionize

* chore: Temporarily change links of Header to the links to HTML pages build by Sessionize

* fix(HeaderMenu): Use `next/link` when href is `/`

* Proposal feat: hide home label from header (#175)

* feat: hide home label from header

* fix header menu

* comment out unused import

* fix: remove community booth section (#177)

* feat: community booth section (#67)

* fix: remove community booth section

* chore: add eslint rule (#178)

* feat: community booth section (#67)

* fix: remove community booth section

* chore: add eslint rules

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>
Co-authored-by: sivchari <[email protected]>
Co-authored-by: Shinji Nakamatsu <[email protected]>
taigakiyokawa added a commit that referenced this pull request Apr 2, 2023
* [fix] Fix date for closing application from Sat to Tue (#65)

* feat: add GitHub template (#68)

* fix: template (#69)

* fix: file structure (#70)

* merge main into develop (#72)

* [fix] Fix date for closing application from Sat to Tue (#65) (#66)

* feat: community booth section (#67)

* feat: specified commercial transaction (#71)

* feat: specified commercial transaction

* fix typo

* fix: i18n locale

* fix: english explanation

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>

* Merge main into develop (#169)

* [fix] Fix date for closing application from Sat to Tue (#65) (#66)

* feat: community booth section (#67)

* feat: specified commercial transaction (#71)

* feat: specified commercial transaction

* fix typo

* fix: i18n locale

* fix: english explanation

* feat: add information about CfP result (#165)

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>

* feat: useSessionize (#171)

* feat: useSettionize

* add EOL

* スポンサー(パートナー)ページの実装 (#170)

* feat: partner page

* SAMPLE json / images

* fix: `desc` to `description`

* fix: simplify prop type name

* fix: `desc` to `description`

* fix: extract params from context

* feat: header with link (#172)

* chore: Remove CommunityBoothSection from PageTop (#174)

* chore: Temporarily change links of Header to the links to HTML pages build by Sessionize (#173)

* chore: Remove `next/link` temporary for forwarding to HTML pages build by Sessionize

* chore: Temporarily change links of Header to the links to HTML pages build by Sessionize

* fix(HeaderMenu): Use `next/link` when href is `/`

* Proposal feat: hide home label from header (#175)

* feat: hide home label from header

* fix header menu

* comment out unused import

* fix: remove community booth section (#177)

* feat: community booth section (#67)

* fix: remove community booth section

* chore: add eslint rule (#178)

* feat: community booth section (#67)

* fix: remove community booth section

* chore: add eslint rules

* chore: Close sponsors application (#180)

* chore: Remove the button for application to sponsors due to be already closed

* chore: Fix arrangement of Gophers due to remove the button

* chore: Change description to "Sponsors application has been closed.~"

---------

Co-authored-by: sivchari <[email protected]>
Co-authored-by: maito1201 <[email protected]>
Co-authored-by: Shinji Nakamatsu <[email protected]>
@taigakiyokawa taigakiyokawa deleted the feat/GOCON2023-318 branch May 1, 2023 09:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants