Skip to content

Commit f75a64d

Browse files
MaySoMusicianMaySoMusician
authored
Merge pull request #638 from codeforjapan/development
Release 1.2.0
2 parents bbc08e1 + 2ecb181 commit f75a64d

File tree

11 files changed

+141
-67
lines changed

11 files changed

+141
-67
lines changed

‎nuxt-i18n.config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const defaultLocale = 'ja'
22

33
const options = {
44
strategy: 'prefix_except_default',
5+
seo: false,
56
detectBrowserLanguage: false,
67
defaultLocale,
78
vueI18n: {

‎nuxt.config.js‎

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -14,63 +14,16 @@ export default {
1414
htmlAttrs: {
1515
prefix: 'og: http://ogp.me/ns#',
1616
},
17-
title: 'おうちで時間割',
1817
meta: [
1918
{ charset: 'utf-8' },
2019
{ name: 'viewport', content: 'width=device-width, initial-scale=1' },
21-
{
22-
hid: 'keyword',
23-
name: 'keyword',
24-
content: 'CodeforJapan, おうちで時間割, デジタル, 学び, 今後の学習',
25-
},
2620
{
2721
hid: 'author',
2822
name: 'author',
2923
content: 'Code for Japan',
3024
},
31-
{
32-
hid: 'og:site_name',
33-
property: 'og:site_name',
34-
content: 'おうちで時間割',
35-
},
36-
{
37-
hid: 'og:url',
38-
property: 'og:url',
39-
content: `https://app.studyathome.jp/`,
40-
},
41-
{
42-
hid: 'og:title',
43-
property: 'og:title',
44-
content: 'おうちで時間割',
45-
},
46-
{
47-
hid: 'og:description',
48-
property: 'og:description',
49-
content:
50-
'子どもの学びにデジタルの活用を - 臨時休校期間と今後の学習に向けて 簡単に楽しく学べる環境を今だから、みんなでつくろう。',
51-
},
52-
{
53-
hid: 'apple-mobile-web-app-title',
54-
name: 'apple-mobile-web-app-title',
55-
content: 'おうちで時間割',
56-
},
57-
{
58-
hid: 'description',
59-
name: 'description',
60-
content:
61-
'子どもの学びにデジタルの活用を - 臨時休校期間と今後の学習に向けて 簡単に楽しく学べる環境を今だから、みんなでつくろう。',
62-
},
6325
{ hid: 'og:type', property: 'og:type', content: 'website' },
64-
{
65-
hid: 'og:image',
66-
property: 'og:image',
67-
content: 'https://app.studyathome.jp/ogp.png',
68-
},
69-
{
70-
hid: 'twitter:image',
71-
name: 'twitter:image',
72-
content: 'https://app.studyathome.jp/ogp.png',
73-
},
26+
{ name: 'twitter:card', content: 'summary_large_image' },
7427
],
7528
link: [
7629
{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },

‎src/assets/locales/en.json‎

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,19 @@
88
"login": "Sign In",
99
"logout": "Sign Out",
1010
"ok": "OK",
11-
"save": "Save"
11+
"save": "Save",
12+
"change": "Modify",
13+
"verify": "Verification"
1214
},
1315
"error": {
1416
"default": "An error occurred, please try again later."
1517
}
1618
},
19+
"calender": {
20+
"prev_week": "Previous week",
21+
"next_week": "Next week",
22+
"to_today": "Move to today"
23+
},
1724
"footer": {
1825
"about": "About StayAtHome",
1926
"contact": "Contact Us",
@@ -40,7 +47,8 @@
4047
"password": "Password",
4148
"password_rules": "Password Must be At Least 6 Characters",
4249
"password_not_acceptable": "The Password Does Not Meet the Password Requirements",
43-
"password_not_same": "Inconsistent Passwords"
50+
"password_not_same": "Inconsistent Passwords",
51+
"verification_code":"Verification code"
4452
}
4553
},
4654
"agree_terms": {
@@ -69,15 +77,15 @@
6977
"date": "Date Setting",
7078
"time": "Time Setting",
7179
"subject_label_color": "Label Color",
72-
"video_keyword": "(Optional function) Video Search",
80+
"video_keyword": "Optional feature: Video search of {source}",
7381
"video_url": "Reference Video URL",
7482
"video_thumbnail": "Video Thumbnail/Caption Display",
7583
"textbook_page": "Textbook Page",
7684
"material_title": "Learning Material Title",
7785
"material_url": "Learning Material URL"
7886
},
7987
"placeholder": {
80-
"video_keyword": "EX) Science"
88+
"video_keyword": "Keyword"
8189
},
8290
"required": "*Items Marked with Are Required",
8391
"search_videos": {
@@ -134,7 +142,9 @@
134142
"label": "To the Teacher Who Made the Timetable",
135143
"buttons": {
136144
"signup": "Register As A User",
137-
"login": "Log In"
145+
"login": "Log In",
146+
"registerLessons": "Create Timetable",
147+
"logout": "Sign Out"
138148
}
139149
}
140150
},
@@ -145,10 +155,28 @@
145155
"no_classes": "There Are No Editable Courses. Please Register Your Course."
146156
},
147157
"user_edit_user_data": {
148-
"title": "Change User Information",
158+
"title": "Change User Information"
159+
},
160+
"user_edit_user_name": {
161+
"title": "Change name (display name)",
162+
"labels": {
163+
"current_nickname": "Current name (display name)",
164+
"new_nickname": "Name to be used (display name)"
165+
}
166+
},
167+
"user_edit_user_email": {
168+
"title": "Change email address",
149169
"labels": {
150-
"new_password": "Change Password",
151-
"new_password_confirm": "Change Password (for confirmation)"
170+
"current_email": "Current email address",
171+
"new_email": "Email address to be used"
172+
}
173+
},
174+
"user_edit_user_password": {
175+
"title": "Change password",
176+
"labels": {
177+
"current_password": "Please enter your current password",
178+
"new_password": "New password",
179+
"new_password_confirm": "Password (for confirmation)"
152180
}
153181
},
154182
"user_login": {
@@ -192,6 +220,12 @@
192220
"go_back_to_top": "Back to Top",
193221
"message": "A Confirmation Email Has Been Sent to the Email Address You Entered. Please Authenticate from the URL Described in the Email."
194222
}
223+
},
224+
"user_verify": {
225+
"title": "Confirm email address"
226+
},
227+
"user_verify_new_email": {
228+
"title": "Confirm changing email address"
195229
}
196230
}
197231
}

‎src/assets/locales/ja.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"title": "おうちで時間割",
3+
"description": "子どもの学びにデジタルの活用を - 臨時休校期間と今後の学習に向けて 簡単に楽しく学べる環境を今だから、みんなでつくろう。",
24
"common": {
35
"general": {
46
"buttons": {

‎src/assets/locales/zh_TW.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{
2+
"title": "在家學習時間表",
3+
"description": "「在家學習時間表」是你的數位學習好夥伴！我們創造了線上學習環境，讓你在家也可以輕鬆的上線學習，不管是老師或學生，歡迎一起來發掘更多上課的樂趣！",
24
"common": {
35
"general": {
46
"buttons": {
@@ -77,7 +79,7 @@
7779
"date": "設定日期",
7880
"time": "設定時間",
7981
"subject_label_color": "標籤顏色",
80-
"video_keyword": "可選功能：搜尋參考影片",
82+
"video_keyword": "可選功能：{source}的影片搜尋",
8183
"video_url": "參考影片 URL",
8284
"video_thumbnail": "顯示影片縮圖",
8385
"textbook_page": "教科書頁",

‎src/layouts/default.vue‎

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,73 @@ export default Vue.extend({
3737
loading: true,
3838
}
3939
},
40+
head() {
41+
const ogpImage = () => {
42+
switch (this.$i18n.locale) {
43+
case 'zh-tw':
44+
return `https://app.studyathome.jp/ogp-${this.$i18n.locale}.png`
45+
default:
46+
return 'https://app.studyathome.jp/ogp.png'
47+
}
48+
}
49+
return {
50+
title: this.$tc('title'),
51+
meta: [
52+
{
53+
hid: 'description',
54+
name: 'description',
55+
content: this.$tc('description'),
56+
},
57+
{
58+
hid: 'apple-mobile-web-app-title',
59+
name: 'apple-mobile-web-app-title',
60+
content: this.$tc('title'),
61+
},
62+
{
63+
hid: 'og:title',
64+
property: 'og:title',
65+
content: this.$tc('title'),
66+
},
67+
{
68+
hid: 'og:description',
69+
property: 'og:description',
70+
content: this.$tc('description'),
71+
},
72+
{
73+
hid: 'og:site_name',
74+
property: 'og:site_name',
75+
content: this.$tc('title'),
76+
},
77+
{
78+
hid: 'og:image',
79+
property: 'og:image',
80+
content: ogpImage(),
81+
},
82+
{
83+
hid: 'og:image:width',
84+
property: 'og:image:width',
85+
content: '1200',
86+
},
87+
{
88+
hid: 'og:image:height',
89+
property: 'og:image:height',
90+
content: '630',
91+
},
92+
{
93+
hid: 'twitter:image',
94+
name: 'twitter:image',
95+
content: ogpImage(),
96+
},
97+
{
98+
hid: 'og:url',
99+
property: 'og:url',
100+
content: `https://app.studyathome.jp${this.$route.path}`,
101+
},
102+
],
103+
}
104+
},
40105
mounted(): void {
41-
this.loading = false
106+
;(this as any).loading = false
42107
},
43108
})
44109
</script>

‎src/pages/terms.vue‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
<li>
2121
本サービスでは、HTML5及びJavaScript、CSS3、SVGを使用するものとします。なお、以下の推奨ブラウザをご利用の場合、ブラウザの設定でこれら機能を有効にしておくことで、最善のレイアウトで本サイトを閲覧することができます。
2222
<ul>
23-
<li>Windows Google Chrome、Firefox （各ブラウザ最新版）</li>
24-
<li>Mac OS Google Chrome、Safari、Firefox （各ブラウザ最新版）</li>
25-
<li>iOS（iPhone、iPad） Mobile Safari（OSバージョン 8.4以降）</li>
26-
<li>Android Chrome Browser（OSバージョン 4.2.2以降）</li>
23+
<li>Windows Google Chrome、Firefox、Opera （各ブラウザ最新版）</li>
24+
<li>macOS Google Chrome、Safari、Firefox （各ブラウザ最新版）</li>
25+
<li>iOS（iPhone、iPad） Safari（OSバージョン 12.0以降）</li>
26+
<li>iPadOS Safari（OSバージョン 13.0以降）</li>
27+
<li>Android Chrome（OSバージョン 6.0以降）</li>
2728
</ul>
2829
</li>
2930
</ol>
@@ -43,7 +44,7 @@
4344
「弊団体」とは、一般社団法人コード・フォー・ジャパンを意味します。
4445
</li>
4546
<li>
46-
「弊団体ウェブサイト」とは、そのドメインが「code4japan.org」である、弊団体が運営するウェブサイト（理由の如何を問わず、弊団体のウェブサイトのドメインまたは内容が変更された場合は、当該変更後のウェブサイトを含みます。）を意味します。
47+
「弊団体ウェブサイト」とは、そのドメインが「code4japan.org」もしくは「studyathome.jp」である、弊団体が運営するウェブサイト（理由の如何を問わず、弊団体のウェブサイトのドメインまたは内容が変更された場合は、当該変更後のウェブサイトを含みます。）を意味します。
4748
</li>
4849
<li>
4950
「登録ユーザー」とは、第3条（登録）に基づいて本サービスの利用者としての登録がなされたユーザーを意味します。

‎src/pages/user/registerClass.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ export default Vue.extend({
8080
.registerClass({
8181
schoolName: this.schoolName,
8282
className: this.className,
83+
locale: this.$i18n.locale,
8384
})
8485
.then(() => {
8586
this.loading = false

‎src/static/ogp-zh-tw.png‎

26.7 KB
Loading

‎src/static/ogp.png‎

-11.5 KB
Loading

0 commit comments

Comments
 (0)